linux/arch/arm/mach-imx
Linus Torvalds ee1a8d402e ARM SoC device tree changes
These changes from 30 individual branches for the most part update device
 tree files, but there are also a few source code changes that have crept
 in this time, usually in order to atomically move over a driver from
 using hardcoded data to DT probing.
 
 A number of platforms change their DT files to use the C preprocessor,
 which is causing a bit of churn, but that is hopefully only this once.
 
 There are a few conflicts with the other branches unfortunately:
 
 * in exynos5440.dtsi and kirkwood-6281.dtsi, device nodes are added
   from multiple branches. Need to be careful to have the right
   set of closing braces as git gets this one wrong.
 
 * In kirkwood.dtsi, one 'ranges' line got split into two lines, while
   another line got added. Order of the lines does not matter.
 
 * in sama5d3.dtsi, some cleanup was merged the wrong way, causing
   a bogus conflict. We want the 'dmas' and 'dma-names' properties
   to get added here.
 
 * Two lines got removed independently in arch/arm/mach-mxs/mach-mxs.c
 
 * Contents get added independently in arch/arm/mach-omap2/cclock33xx_data.c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAUdLnpGCrR//JCVInAQI50RAAsXbH1SGvjKJemXhRkFloPDYpCbgdDUFr
 ChUbjNV1xsY/jaNCfMa5/Qo7lgz/Ot7BpJef9fZn7ret+dc7nchqe/4iIkAokAUh
 E4ao9D1dP5aAA0ihdbSQHCZtR/0SUR81h6BoOVuo/1mvEiBaFbWAeYe8/6LJd9II
 OU1w9bDmjfZWYFUXs+j2VF76ueZQ+kz69XDKZUGtkqN76m1AL8lGDurj5jxvyllF
 VJns8d9q2nr2q9PferfajK6rkOIPaTpwKblxZHUgobCyOitZaiZM0NgF733TsNM6
 HXmhDhkcn7T81+SiHVfigJ/nxo9UgU4zNJCODF3WZIwGIj3FbxvCOpdCYi2NhCO8
 oLcgDk57tpoKpB3gvAmYVQHP9FIepFa/WAWyPIADA7PkpYrwgc4v+cLEHXpd8SRv
 viLLIa5QuNdMeaK+Md9OKmKZFd7uFD9jiMtmdm6IpEVDDjMgoteb2XSoEtNebmtY
 MfbW4okn118a2dFKKaPTKcXVW/a5FRp2JGfB0A58RQHaJWj3JsY1bFn/xWPEpTOA
 IWB/HHMln0LYTL2AXN9HcaL1jnGI1Wq5eWBurX+cXQ/ij1A6jfoRKYglx7AQqOHj
 iWcGYtKLLJCgiWFnLSwcljZhfoYr0/z7rhns6yo7/vhN0riy+M84OgN4HbAmUzc1
 Bgy9PnJTNo8=
 =8PtJ
 -----END PGP SIGNATURE-----

Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC device tree changes from Arnd Bergmann:
 "These changes from 30 individual branches for the most part update
  device tree files, but there are also a few source code changes that
  have crept in this time, usually in order to atomically move over a
  driver from using hardcoded data to DT probing.

  A number of platforms change their DT files to use the C preprocessor,
  which is causing a bit of churn, but that is hopefully only this once"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (372 commits)
  ARM: at91: dt: rm9200ek: add spi support
  ARM: at91: dt: rm9200: add spi support
  ARM: at91/DT: at91sam9n12: add SPI DMA client infos
  ARM: at91/DT: sama5d3: add SPI DMA client infos
  ARM: at91/DT: fix SPI compatibility string
  ARM: Kirkwood: Fix the internal register ranges translation
  ARM: dts: bcm281xx: change comment to C89 style
  ARM: mmc: bcm281xx SDHCI driver (dt mods)
  ARM: nomadik: add the new clocks to the device tree
  clk: nomadik: implement the Nomadik clocks properly
  ARM: dts: omap5-uevm: Provide USB Host PHY clock frequency
  ARM: dts: omap4-panda: Fix DVI EDID reads
  ARM: dts: omap4-panda: Add USB Host support
  arm: mvebu: enable mini-PCIe connectors on Armada 370 RD
  ARM: shmobile: irqpin: add a DT property to enable masking on parent
  ARM: dts: AM43x EPOS EVM support
  ARM: dts: OMAP5: Add bandgap DT entry
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to am335x EVM
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to EVMsk
  ARM: dts: AM33XX: Add pinmux configuration for CPSW to beaglebone
  ...
2013-07-02 14:23:01 -07:00
..
devices Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-05-03 09:13:19 -07:00
3ds_debugboard.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
3ds_debugboard.h ARM: imx: include board headers in the same folder 2012-10-15 09:18:14 +08:00
anatop.c ARM: imx: do not use regmap_read for ANADIG_DIGPROG 2013-04-12 19:28:13 +08:00
avic.c ARM: arm-soc cleanup for 3.10 2013-05-02 09:03:55 -07:00
board-mx31lilly.h ARM: imx: include board headers in the same folder 2012-10-15 09:18:14 +08:00
board-mx31lite.h ARM: imx: include board headers in the same folder 2012-10-15 09:18:14 +08:00
board-mx31moboard.h ARM: imx: include board headers in the same folder 2012-10-15 09:18:14 +08:00
board-pcm038.h ARM: imx: include board headers in the same folder 2012-10-15 09:18:14 +08:00
clk-busy.c ARM: arm-soc non-critical fixes for 3.10 2013-05-02 08:56:55 -07:00
clk-gate2.c ARM: mach-imx: clk-gate2: Include "clk.h" 2013-04-01 16:17:50 +08:00
clk-imx1.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
clk-imx6q.c ARM: clk-imx6qdl: Add clko1 configuration for imx6qdl-sabresd 2013-06-17 15:45:16 +08:00
clk-imx6sl.c ARM: imx6: use common of_clk_init() call to initialize clocks 2013-06-17 15:45:14 +08:00
clk-imx21.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
clk-imx25.c ARM: i.MX25: clk: parent per5_clk to AHB clock 2013-02-05 10:54:35 +01:00
clk-imx27.c ARM: imx27 DT init cpufreq-cpu0 device 2013-04-09 22:52:56 +08:00
clk-imx31.c Linux 3.8-rc6 2013-02-04 22:56:41 -08:00
clk-imx35.c ARM: imx35 Bugfix admux clock 2013-04-09 19:46:30 +08:00
clk-imx51-imx53.c ARM: imx: move imx53-qsb audio codec clk lookup into DT 2013-06-17 16:04:15 +08:00
clk-pfd.c
clk-pllv1.c ARM: mach-imx: clk-pllv1: Staticize clk_pllv1_ops 2013-04-01 16:17:49 +08:00
clk-pllv2.c ARM: mach-imx: clk-pllv2: Staticize clk_pllv2_ops 2013-04-01 16:17:50 +08:00
clk-pllv3.c ARM: imx: remove MLB PLL from pllv3 2013-06-17 15:45:12 +08:00
clk-vf610.c ARM: imx: add VF610 clock support 2013-06-17 15:45:15 +08:00
clk.c ARM: imx: clk: No need to initialize phandle struct 2013-06-17 15:45:15 +08:00
clk.h ARM: imx: remove MLB PLL from pllv3 2013-06-17 15:45:12 +08:00
common.h ARM: imx6: use common of_clk_init() call to initialize clocks 2013-06-17 15:45:14 +08:00
cpu-imx5.c ARM: mach-imx: cpu-imx5: Include "common.h" 2013-04-01 16:17:49 +08:00
cpu-imx25.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
cpu-imx27.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
cpu-imx31.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
cpu-imx35.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
cpu.c ARM: mach-imx: cpu: Include "common.h" 2013-04-01 16:17:48 +08:00
cpuidle-imx5.c ARM: imx: cpuidle: use init/exit common routine 2013-04-23 13:45:23 +02:00
cpuidle-imx6q.c ARM: imx: cpuidle: use init/exit common routine 2013-04-23 13:45:23 +02:00
cpuidle.h ARM: imx: cpuidle: use init/exit common routine 2013-04-23 13:45:23 +02:00
crm-regs-imx5.h ARM i.MX53: Fix PLL4 base address 2012-06-04 15:23:57 +02:00
crmregs-imx3.h
devices-imx1.h ARM: imx: move platform device code into mach-imx 2012-10-15 09:18:15 +08:00
devices-imx21.h ARM: imx: move platform device code into mach-imx 2012-10-15 09:18:15 +08:00
devices-imx25.h ARM: imx: move platform device code into mach-imx 2012-10-15 09:18:15 +08:00
devices-imx27.h ARM : i.MX27 : split code for allocation of ressources of camera and eMMA 2012-11-16 16:21:48 +01:00
devices-imx31.h ARM: imx: move platform device code into mach-imx 2012-10-15 09:18:15 +08:00
devices-imx35.h ARM: imx: move platform device code into mach-imx 2012-10-15 09:18:15 +08:00
devices-imx51.h ARM: imx: move platform device code into mach-imx 2012-10-15 09:18:15 +08:00
ehci-imx5.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
ehci-imx25.c Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-11-30 09:27:57 -08:00
ehci-imx27.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
ehci-imx31.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
ehci-imx35.c Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-11-30 09:27:57 -08:00
epit.c ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
eukrea_mbimx27-baseboard.c ARM: cpuimx27 and mbimx27: prepend CONFIG_ to Kconfig macro 2013-04-03 16:50:54 +08:00
eukrea_mbimxsd25-baseboard.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
eukrea_mbimxsd35-baseboard.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
eukrea_mbimxsd51-baseboard.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
eukrea-baseboards.h ARM: imx: include board headers in the same folder 2012-10-15 09:18:14 +08:00
gpc.c ARM: arm-soc platform updates for 3.10, part 3 2013-05-07 11:02:18 -07:00
hardware.h ARM: imx: include <asm/io.h> in hardware.h 2013-06-17 15:45:10 +08:00
headsmp.S ARM: imx: replicate the diagnostic register of boot cpu into secondary cores 2013-05-12 21:39:18 +08:00
hotplug.c ARM: imx: compile fix for hotplug.c 2013-05-09 13:05:22 -07:00
iim.h ARM: imx: include iim.h rather than mach/iim.h 2012-10-15 10:03:10 +08:00
imx25-dt.c ARM: imx: create mxc_arch_reset_init_dt() for DT boot 2013-06-17 15:45:10 +08:00
imx27-dt.c ARM: imx: create mxc_arch_reset_init_dt() for DT boot 2013-06-17 15:45:10 +08:00
imx31-dt.c ARM: imx: create mxc_arch_reset_init_dt() for DT boot 2013-06-17 15:45:10 +08:00
imx51-dt.c ARM: imx: create mxc_arch_reset_init_dt() for DT boot 2013-06-17 15:45:10 +08:00
iomux-imx31.c ARM: mach-imx: iomux-imx31: Staticize mxc_pin_alloc_map 2013-04-01 16:17:48 +08:00
iomux-mx1.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-mx2x.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-mx3.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-mx21.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-mx25.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-mx27.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-mx35.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-mx51.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-v1.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
iomux-v1.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-v3.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
iomux-v3.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
irq-common.c ARM: imx: irq-common: Include header to avoid sparse warning 2013-06-17 15:45:14 +08:00
irq-common.h ARM: imx: remove header file mach/irqs.h 2012-10-15 10:05:43 +08:00
Kconfig ARM: imx: select syscon for IMX6SL 2013-06-24 16:14:40 +02:00
mach-apf9328.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-armadillo5x0.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-bug.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-cpuimx27.c ARM: cpuimx27 and mbimx27: prepend CONFIG_ to Kconfig macro 2013-04-03 16:50:54 +08:00
mach-cpuimx35.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-cpuimx51sd.c ARM: imx: Remove cpufreq driver 2013-04-01 16:17:34 +08:00
mach-eukrea_cpuimx25.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-imx6q.c ARM: clk-imx6qdl: Add clko1 configuration for imx6qdl-sabresd 2013-06-17 15:45:16 +08:00
mach-imx6sl.c ARM: imx6: use common of_clk_init() call to initialize clocks 2013-06-17 15:45:14 +08:00
mach-imx27_visstrim_m10.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-imx27ipcam.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-imx27lite.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-imx53.c ARM: imx: move imx53-qsb audio codec clk lookup into DT 2013-06-17 16:04:15 +08:00
mach-kzm_arm11_01.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx1ads.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx21ads.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx25_3ds.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx27_3ds.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx27ads.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx31_3ds.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx31ads.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx31lilly.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx31lite.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx31moboard.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx35_3ds.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx51_babbage.c ARM: imx: Remove cpufreq driver 2013-04-01 16:17:34 +08:00
mach-mxt_td60.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-pca100.c ARM: imx: Remove mxc specific ulpi access ops 2013-06-17 15:45:16 +08:00
mach-pcm037_eet.c ARM: imx: include common.h rather than mach/common.h 2012-10-15 10:03:10 +08:00
mach-pcm037.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-pcm038.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-pcm043.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-qong.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-scb9328.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-vf610.c ARM: imx: add initial support for VF610 2013-06-17 15:45:16 +08:00
mach-vpr200.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
Makefile ARM: imx: Remove mxc specific ulpi access ops 2013-06-17 15:45:16 +08:00
mm-imx1.c ARM: imx: move clk_prepare() out from mxc_restart() 2013-06-17 15:45:10 +08:00
mm-imx3.c ARM: imx: move clk_prepare() out from mxc_restart() 2013-06-17 15:45:10 +08:00
mm-imx5.c ARM: imx: move clk_prepare() out from mxc_restart() 2013-06-17 15:45:10 +08:00
mm-imx21.c ARM: imx: move clk_prepare() out from mxc_restart() 2013-06-17 15:45:10 +08:00
mm-imx25.c ARM: imx: move clk_prepare() out from mxc_restart() 2013-06-17 15:45:10 +08:00
mm-imx27.c ARM: imx: move clk_prepare() out from mxc_restart() 2013-06-17 15:45:10 +08:00
mmdc.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
mx1-camera-fiq-ksym.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
mx1-camera-fiq.S
mx1.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx2x.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx3x.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx21.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx25.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx27.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx31.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx31lilly-db.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx31lite-db.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx31moboard-devboard.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx31moboard-marxbot.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx31moboard-smartbot.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx35.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx51.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx53.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mxc.h ARM: imx: add initial imx6dl support 2013-04-12 19:28:15 +08:00
pcm037.h
pcm970-baseboard.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
platsmp.c ARM: imx: replicate the diagnostic register of boot cpu into secondary cores 2013-05-12 21:39:18 +08:00
pm-imx3.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
pm-imx5.c ARM: imx: cpuidle: use init/exit common routine 2013-04-23 13:45:23 +02:00
pm-imx6q.c ARM: imx: enable anatop suspend/resume 2013-04-12 19:01:42 +08:00
pm-imx27.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
src.c ARM: arm-soc platform updates for 3.10, part 3 2013-05-07 11:02:18 -07:00
ssi-fiq-ksym.c ARM: imx: merge plat-mxc into mach-imx 2012-10-15 10:02:19 +08:00
ssi-fiq.S ARM: imx: merge plat-mxc into mach-imx 2012-10-15 10:02:19 +08:00
system.c ARM: imx: create mxc_arch_reset_init_dt() for DT boot 2013-06-17 15:45:10 +08:00
time.c imx6q cpuidle support for 3.9 2013-02-04 22:24:20 -08:00
tzic.c ARM: mach-imx: tzic: Staticize *tzic_base 2013-04-01 16:17:51 +08:00
ulpi.h ARM: imx: Remove mxc specific ulpi access ops 2013-06-17 15:45:16 +08:00