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

d01e4afd · Linus Torvalds <[email protected]> · 2012-12-12 11:51:39 -08:00

Pull ARM SoC cleanups on various subarchitectures from Olof Johansson:
 "Cleanup patches for various ARM platforms and some of their associated
  drivers.  There's also a branch in here that enables Freescale i.MX to
  be part of the multiplatform support -- the first "big" SoC that is
  moved over (more multiplatform work comes in a separate branch later
  during the merge window)."

Conflicts fixed as per Olof, including a silent semantic one in
arch/arm/mach-omap2/board-generic.c (omap_prcm_restart() was renamed to
omap3xxx_restart(), and a new user of the old name was added).

* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (189 commits)
  ARM: omap: fix typo on timer cleanup
  ARM: EXYNOS: Remove unused regs-mem.h file
  ARM: EXYNOS: Remove unused non-dt support for dwmci controller
  ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
  ARM: OMAP3: cm-t3517: use GPTIMER for system clock
  ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
  ARM: SAMSUNG: use devm_ functions for ADC driver
  ARM: EXYNOS: no duplicate mask/unmask in eint0_15
  ARM: S3C24XX: SPI clock channel setup is fixed for S3C2443
  ARM: EXYNOS: Remove i2c0 resource information and setting of device names
  ARM: Kirkwood: checkpatch cleanups
  ARM: Kirkwood: Fix sparse warnings.
  ARM: Kirkwood: Remove unused includes
  ARM: kirkwood: cleanup lsxl board includes
  ARM: integrator: use BUG_ON where possible
  ARM: integrator: push down SC dependencies
  ARM: integrator: delete static UART1 mapping
  ARM: integrator: delete SC mapping on the CP
  ARM: integrator: remove static CP syscon mapping
  ARM: integrator: remove static AP syscon mapping
  ...

Commit: d01e4afdbb65e030fd6f1f96c30a558e2eb0f279
Parents: 8287361a · 794b175f

Merge commit. Changes below are compared with the first parent: 8287361a.

Changes

496 files changed · +4718 −4091

File	Status	Add	Del	Content
Documentation/devicetree/bindings/arm/arm-boards	modified	+4	−0	View file
Documentation/devicetree/bindings/arm/omap/counter.txt	added	+15	−0	View file
Documentation/devicetree/bindings/arm/omap/timer.txt	added	+31	−0	View file
Documentation/devicetree/bindings/bus/omap-ocp2scp.txt	modified	+18	−0	View file
Documentation/devicetree/bindings/i2c/i2c-imx.txt	modified	+2	−2	View file
Documentation/devicetree/bindings/i2c/trivial-devices.txt	modified	+2	−0	View file
Documentation/devicetree/bindings/usb/am33xx-usb.txt	modified	+21	−0	View file
MAINTAINERS	modified	+0	−1	View file
arch/arm/Kconfig	modified	+2	−16	View file
arch/arm/Kconfig.debug	modified	+8	−0	View file
arch/arm/Makefile	modified	+0	−2	View file
arch/arm/boot/compressed/Makefile	modified	+0	−4	View file
arch/arm/boot/compressed/head-vt8500.S	deleted	+0	−46	View before deletion
arch/arm/boot/dts/Makefile	modified	+4	−2	View file
arch/arm/boot/dts/am335x-bone.dts	modified	+50	−0	View file
arch/arm/boot/dts/am335x-evm.dts	modified	+118	−0	View file
arch/arm/boot/dts/am335x-evmsk.dts	added	+250	−0	View file
arch/arm/boot/dts/am33xx.dtsi	modified	+142	−14	View file
arch/arm/boot/dts/imx27.dtsi	modified	+2	−2	View file
arch/arm/boot/dts/imx51.dtsi	modified	+2	−2	View file
arch/arm/boot/dts/imx53.dtsi	modified	+3	−3	View file
arch/arm/boot/dts/imx6q.dtsi	modified	+3	−3	View file
arch/arm/boot/dts/integratorap.dts	modified	+5	−0	View file
arch/arm/boot/dts/integratorcp.dts	modified	+5	−0	View file
arch/arm/boot/dts/omap2.dtsi	modified	+86	−0	View file
arch/arm/boot/dts/omap2420.dtsi	modified	+14	−2	View file
arch/arm/boot/dts/omap2430.dtsi	modified	+14	−5	View file
arch/arm/boot/dts/omap3-beagle-xm.dts	modified	+0	−6	View file
arch/arm/boot/dts/omap3-beagle.dts	added	+67	−0	View file
arch/arm/boot/dts/omap3.dtsi	modified	+102	−5	View file
arch/arm/boot/dts/omap4-panda-a4.dts	added	+17	−0	View file
arch/arm/boot/dts/omap4-pandaES.dts → arch/arm/boot/dts/omap4-panda-es.dts	renamed	+9	−0	View file
arch/arm/boot/dts/omap4-panda.dts	modified	+22	−0	View file
arch/arm/boot/dts/omap4-sdp-es23plus.dts	added	+17	−0	View file
arch/arm/boot/dts/omap4-sdp.dts	modified	+22	−0	View file
arch/arm/boot/dts/omap4-var_som.dts → arch/arm/boot/dts/omap4-var-som.dts	renamed	+0	−0	View file
arch/arm/boot/dts/omap4.dtsi	modified	+98	−7	View file
arch/arm/boot/dts/omap5-evm.dts	modified	+12	−1	View file
arch/arm/boot/dts/omap5.dtsi	modified	+169	−9	View file
arch/arm/boot/dts/samsung_k3pe0e000b.dtsi	added	+67	−0	View file
arch/arm/boot/dts/tegra20-harmony.dts	modified	+15	−48	View file
arch/arm/boot/dts/tegra20-paz00.dts	modified	+14	−45	View file
arch/arm/boot/dts/tegra20-seaboard.dts	modified	+14	−45	View file
arch/arm/boot/dts/tegra20-tamonten.dtsi	modified	+15	−48	View file
arch/arm/boot/dts/tegra20-ventana.dts	modified	+14	−45	View file
arch/arm/boot/dts/tegra20-whistler.dts	modified	+29	−90	View file
arch/arm/boot/dts/tegra30-cardhu.dtsi	modified	+11	−36	View file
arch/arm/boot/dts/twl4030.dtsi	modified	+27	−0	View file
arch/arm/boot/dts/twl6030.dtsi	modified	+5	−0	View file
arch/arm/boot/dts/zynq-ep107.dts	modified	+15	−4	View file
arch/arm/configs/imx_v4_v5_defconfig	modified	+3	−1	View file
arch/arm/configs/imx_v6_v7_defconfig	modified	+2	−0	View file
arch/arm/include/asm/dma-mapping.h	modified	+0	−7	View file
arch/arm/plat-mxc/include/mach/debug-macro.S → arch/arm/include/debug/imx.S	renamed	+22	−11	View file
arch/arm/mach-at91/at91sam9g45.c	modified	+0	−1	View file
arch/arm/mach-at91/include/mach/atmel-mci.h	modified	+0	−7	View file
arch/arm/mach-bcm2835/Makefile.boot	modified	+1	−3	View file
arch/arm/mach-bcm2835/bcm2835.c	modified	+2	−2	View file
arch/arm/mach-davinci/board-dm646x-evm.c	modified	+1	−1	View file
arch/arm/mach-davinci/common.c	modified	+0	−2	View file
arch/arm/mach-davinci/usb.c	modified	+0	−6	View file
arch/arm/mach-exynos/Kconfig	modified	+0	−5	View file
arch/arm/mach-exynos/Makefile	modified	+0	−1	View file
arch/arm/mach-exynos/clock-exynos4.c	modified	+0	−5	View file
arch/arm/mach-exynos/clock-exynos5.c	modified	+9	−9	View file
arch/arm/mach-exynos/common.c	modified	+8	−50	View file
arch/arm/mach-exynos/dev-audio.c	modified	+1	−1	View file
arch/arm/mach-exynos/dev-dwmci.c	deleted	+0	−75	View before deletion
arch/arm/mach-exynos/dev-ohci.c	modified	+1	−1	View file
arch/arm/mach-exynos/dev-uart.c	modified	+0	−24	View file
arch/arm/mach-exynos/include/mach/dwmci.h	deleted	+0	−20	View before deletion
arch/arm/mach-exynos/include/mach/irqs.h	modified	+0	−5	View file
arch/arm/mach-exynos/include/mach/map.h	modified	+0	−1	View file
arch/arm/mach-exynos/include/mach/regs-mem.h	deleted	+0	−23	View before deletion
arch/arm/mach-exynos/include/mach/regs-pmu.h	modified	+0	−2	View file
arch/arm/mach-exynos/mach-nuri.c	modified	+3	−4	View file
arch/arm/mach-exynos/mach-origen.c	modified	+3	−3	View file
arch/arm/mach-exynos/mach-smdk4x12.c	modified	+1	−1	View file
arch/arm/mach-exynos/mach-smdkv310.c	modified	+3	−3	View file
arch/arm/mach-exynos/mach-universal_c210.c	modified	+2	−3	View file
arch/arm/plat-mxc/3ds_debugboard.c → arch/arm/mach-imx/3ds_debugboard.c	renamed	+1	−1	View file
arch/arm/plat-mxc/include/mach/3ds_debugboard.h → arch/arm/mach-imx/3ds_debugboard.h	renamed	+0	−0	View file
arch/arm/mach-imx/Kconfig	modified	+87	−3	View file
arch/arm/mach-imx/Makefile	modified	+22	−0	View file
arch/arm/plat-mxc/avic.c → arch/arm/mach-imx/avic.c	renamed	+2	−3	View file
arch/arm/plat-mxc/include/mach/board-mx31lilly.h → arch/arm/mach-imx/board-mx31lilly.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/board-mx31lite.h → arch/arm/mach-imx/board-mx31lite.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/board-mx31moboard.h → arch/arm/mach-imx/board-mx31moboard.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/board-pcm038.h → arch/arm/mach-imx/board-pcm038.h	renamed	+0	−0	View file
arch/arm/mach-imx/clk-imx1.c	modified	+9	−8	View file
arch/arm/mach-imx/clk-imx21.c	modified	+9	−9	View file
arch/arm/mach-imx/clk-imx25.c	modified	+13	−13	View file
arch/arm/mach-imx/clk-imx27.c	modified	+20	−20	View file
arch/arm/mach-imx/clk-imx31.c	modified	+10	−11	View file
arch/arm/mach-imx/clk-imx35.c	modified	+6	−7	View file
arch/arm/mach-imx/clk-imx51-imx53.c	modified	+7	−8	View file
arch/arm/mach-imx/clk-imx6q.c	modified	+2	−1	View file
arch/arm/mach-imx/clk-pllv1.c	modified	+2	−2	View file
arch/arm/plat-mxc/include/mach/common.h → arch/arm/mach-imx/common.h	renamed	+1	−0	View file
arch/arm/mach-imx/cpu-imx25.c	modified	+3	−2	View file
arch/arm/mach-imx/cpu-imx27.c	modified	+1	−1	View file
arch/arm/mach-imx/cpu-imx31.c	modified	+4	−3	View file
arch/arm/mach-imx/cpu-imx35.c	modified	+3	−2	View file
arch/arm/mach-imx/cpu-imx5.c	modified	+2	−1	View file
arch/arm/plat-mxc/cpu.c → arch/arm/mach-imx/cpu.c	renamed	+2	−1	View file
arch/arm/mach-imx/cpu_op-mx51.c	modified	+2	−1	View file
arch/arm/plat-mxc/cpufreq.c → arch/arm/mach-imx/cpufreq.c	renamed	+2	−1	View file
arch/arm/plat-mxc/cpuidle.c → arch/arm/mach-imx/cpuidle.c	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/cpuidle.h → arch/arm/mach-imx/cpuidle.h	renamed	+0	−0	View file
arch/arm/mach-imx/devices-imx1.h	modified	+1	−2	View file
arch/arm/mach-imx/devices-imx21.h	modified	+1	−2	View file
arch/arm/mach-imx/devices-imx25.h	modified	+1	−2	View file
arch/arm/mach-imx/devices-imx27.h	modified	+1	−2	View file
arch/arm/mach-imx/devices-imx31.h	modified	+1	−2	View file
arch/arm/mach-imx/devices-imx35.h	modified	+1	−2	View file
arch/arm/mach-imx/devices-imx50.h	modified	+1	−2	View file
arch/arm/mach-imx/devices-imx51.h	modified	+1	−2	View file
arch/arm/plat-mxc/devices/Kconfig → arch/arm/mach-imx/devices/Kconfig	renamed	+0	−0	View file
arch/arm/plat-mxc/devices/Makefile → arch/arm/mach-imx/devices/Makefile	renamed	+2	−0	View file
arch/arm/plat-mxc/include/mach/devices-common.h → arch/arm/mach-imx/devices/devices-common.h	renamed	+8	−1	View file
arch/arm/plat-mxc/devices.c → arch/arm/mach-imx/devices/devices.c	renamed	+1	−3	View file
arch/arm/plat-mxc/devices/platform-ahci-imx.c → arch/arm/mach-imx/devices/platform-ahci-imx.c	renamed	+3	−2	View file
arch/arm/plat-mxc/devices/platform-fec.c → arch/arm/mach-imx/devices/platform-fec.c	renamed	+3	−2	View file
arch/arm/plat-mxc/devices/platform-flexcan.c → arch/arm/mach-imx/devices/platform-flexcan.c	renamed	+2	−2	View file
arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c → arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c	renamed	+3	−2	View file
arch/arm/plat-mxc/devices/platform-gpio-mxc.c → arch/arm/mach-imx/devices/platform-gpio-mxc.c	renamed	+1	−1	View file
arch/arm/plat-mxc/devices/platform-gpio_keys.c → arch/arm/mach-imx/devices/platform-gpio_keys.c	renamed	+3	−2	View file
arch/arm/plat-mxc/devices/platform-imx-dma.c → arch/arm/mach-imx/devices/platform-imx-dma.c	renamed	+20	−3	View file
arch/arm/plat-mxc/devices/platform-imx-fb.c → arch/arm/mach-imx/devices/platform-imx-fb.c	renamed	+9	−7	View file
arch/arm/plat-mxc/devices/platform-imx-i2c.c → arch/arm/mach-imx/devices/platform-imx-i2c.c	renamed	+17	−15	View file
arch/arm/plat-mxc/devices/platform-imx-keypad.c → arch/arm/mach-imx/devices/platform-imx-keypad.c	renamed	+2	−2	View file
arch/arm/plat-mxc/devices/platform-imx-ssi.c → arch/arm/mach-imx/devices/platform-imx-ssi.c	renamed	+2	−2	View file
arch/arm/plat-mxc/devices/platform-imx-uart.c → arch/arm/mach-imx/devices/platform-imx-uart.c	renamed	+2	−2	View file
arch/arm/plat-mxc/devices/platform-imx2-wdt.c → arch/arm/mach-imx/devices/platform-imx2-wdt.c	renamed	+3	−2	View file
arch/arm/plat-mxc/devices/platform-imx21-hcd.c → arch/arm/mach-imx/devices/platform-imx21-hcd.c	renamed	+2	−2	View file
arch/arm/plat-mxc/devices/platform-imx27-coda.c → arch/arm/mach-imx/devices/platform-imx27-coda.c	renamed	+2	−2	View file
arch/arm/plat-mxc/devices/platform-imx_udc.c → arch/arm/mach-imx/devices/platform-imx_udc.c	renamed	+2	−2	View file
arch/arm/plat-mxc/devices/platform-imxdi_rtc.c → arch/arm/mach-imx/devices/platform-imxdi_rtc.c	renamed	+3	−2	View file
arch/arm/plat-mxc/devices/platform-ipu-core.c → arch/arm/mach-imx/devices/platform-ipu-core.c	renamed	+3	−2	View file
arch/arm/plat-mxc/devices/platform-mx1-camera.c → arch/arm/mach-imx/devices/platform-mx1-camera.c	renamed	+2	−2	View file
arch/arm/plat-mxc/devices/platform-mx2-camera.c → arch/arm/mach-imx/devices/platform-mx2-camera.c	renamed	+9	−7	View file
arch/arm/plat-mxc/devices/platform-mxc-ehci.c → arch/arm/mach-imx/devices/platform-mxc-ehci.c	renamed	+3	−2	View file
arch/arm/plat-mxc/devices/platform-mxc-mmc.c → arch/arm/mach-imx/devices/platform-mxc-mmc.c	renamed	+11	−9	View file
arch/arm/plat-mxc/devices/platform-mxc_nand.c → arch/arm/mach-imx/devices/platform-mxc_nand.c	renamed	+14	−11	View file
arch/arm/plat-mxc/devices/platform-mxc_pwm.c → arch/arm/mach-imx/devices/platform-mxc_pwm.c	renamed	+2	−2	View file
arch/arm/plat-mxc/devices/platform-mxc_rnga.c → arch/arm/mach-imx/devices/platform-mxc_rnga.c	renamed	+2	−2	View file
arch/arm/plat-mxc/devices/platform-mxc_rtc.c → arch/arm/mach-imx/devices/platform-mxc_rtc.c	renamed	+7	−6	View file
arch/arm/plat-mxc/devices/platform-mxc_w1.c → arch/arm/mach-imx/devices/platform-mxc_w1.c	renamed	+2	−2	View file
arch/arm/plat-mxc/devices/platform-pata_imx.c → arch/arm/mach-imx/devices/platform-pata_imx.c	renamed	+2	−2	View file
arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c → arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c	renamed	+3	−2	View file
arch/arm/plat-mxc/devices/platform-spi_imx.c → arch/arm/mach-imx/devices/platform-spi_imx.c	renamed	+2	−2	View file
arch/arm/mach-imx/ehci-imx25.c	modified	+2	−2	View file
arch/arm/mach-imx/ehci-imx27.c	modified	+2	−2	View file
arch/arm/mach-imx/ehci-imx31.c	modified	+2	−2	View file
arch/arm/mach-imx/ehci-imx35.c	modified	+2	−2	View file
arch/arm/mach-imx/ehci-imx5.c	modified	+2	−2	View file
arch/arm/plat-mxc/epit.c → arch/arm/mach-imx/epit.c	renamed	+3	−3	View file
arch/arm/plat-mxc/include/mach/eukrea-baseboards.h → arch/arm/mach-imx/eukrea-baseboards.h	renamed	+0	−0	View file
arch/arm/mach-imx/eukrea_mbimx27-baseboard.c	modified	+3	−4	View file
arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c	modified	+4	−4	View file
arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c	modified	+3	−4	View file
arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c	modified	+3	−4	View file
arch/arm/plat-mxc/include/mach/hardware.h → arch/arm/mach-imx/hardware.h	renamed	+13	−13	View file
arch/arm/mach-imx/hotplug.c	modified	+2	−1	View file
arch/arm/plat-mxc/include/mach/iim.h → arch/arm/mach-imx/iim.h	renamed	+0	−0	View file
arch/arm/mach-imx/imx27-dt.c	modified	+6	−5	View file
arch/arm/mach-imx/imx31-dt.c	modified	+3	−2	View file
arch/arm/mach-imx/imx51-dt.c	modified	+5	−4	View file
arch/arm/mach-imx/include/mach/dma-mx1-mx2.h	deleted	+0	−10	View before deletion
arch/arm/mach-imx/iomux-imx31.c	modified	+3	−2	View file
arch/arm/plat-mxc/include/mach/iomux-mx1.h → arch/arm/mach-imx/iomux-mx1.h	renamed	+1	−1	View file
arch/arm/plat-mxc/include/mach/iomux-mx21.h → arch/arm/mach-imx/iomux-mx21.h	renamed	+2	−2	View file
arch/arm/plat-mxc/include/mach/iomux-mx25.h → arch/arm/mach-imx/iomux-mx25.h	renamed	+1	−1	View file
arch/arm/plat-mxc/include/mach/iomux-mx27.h → arch/arm/mach-imx/iomux-mx27.h	renamed	+2	−2	View file
arch/arm/plat-mxc/include/mach/iomux-mx2x.h → arch/arm/mach-imx/iomux-mx2x.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/iomux-mx3.h → arch/arm/mach-imx/iomux-mx3.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/iomux-mx35.h → arch/arm/mach-imx/iomux-mx35.h	renamed	+1	−1	View file
arch/arm/plat-mxc/include/mach/iomux-mx50.h → arch/arm/mach-imx/iomux-mx50.h	renamed	+1	−1	View file
arch/arm/plat-mxc/include/mach/iomux-mx51.h → arch/arm/mach-imx/iomux-mx51.h	renamed	+1	−1	View file
arch/arm/plat-mxc/iomux-v1.c → arch/arm/mach-imx/iomux-v1.c	renamed	+3	−2	View file
arch/arm/plat-mxc/include/mach/iomux-v1.h → arch/arm/mach-imx/iomux-v1.h	renamed	+0	−0	View file
arch/arm/plat-mxc/iomux-v3.c → arch/arm/mach-imx/iomux-v3.c	renamed	+3	−2	View file
arch/arm/plat-mxc/include/mach/iomux-v3.h → arch/arm/mach-imx/iomux-v3.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/iram.h → arch/arm/mach-imx/iram.h	renamed	+0	−0	View file
arch/arm/plat-mxc/iram_alloc.c → arch/arm/mach-imx/iram_alloc.c	renamed	+2	−1	View file
arch/arm/plat-mxc/irq-common.c → arch/arm/mach-imx/irq-common.c	renamed	+0	−0	View file
arch/arm/plat-mxc/irq-common.h → arch/arm/mach-imx/irq-common.h	renamed	+3	−0	View file
arch/arm/mach-imx/lluart.c	modified	+2	−1	View file
arch/arm/mach-imx/mach-apf9328.c	modified	+3	−4	View file
arch/arm/mach-imx/mach-armadillo5x0.c	modified	+4	−5	View file
arch/arm/mach-imx/mach-bug.c	modified	+3	−4	View file
arch/arm/mach-imx/mach-cpuimx27.c	modified	+5	−6	View file
arch/arm/mach-imx/mach-cpuimx35.c	modified	+4	−5	View file
arch/arm/mach-imx/mach-cpuimx51sd.c	modified	+4	−5	View file
arch/arm/mach-imx/mach-eukrea_cpuimx25.c	modified	+5	−5	View file
arch/arm/mach-imx/mach-imx27_visstrim_m10.c	modified	+3	−3	View file
arch/arm/mach-imx/mach-imx27ipcam.c	modified	+3	−3	View file
arch/arm/mach-imx/mach-imx27lite.c	modified	+3	−3	View file
arch/arm/mach-imx/mach-imx53.c	modified	+6	−5	View file
arch/arm/mach-imx/mach-imx6q.c	modified	+3	−3	View file
arch/arm/mach-imx/mach-kzm_arm11_01.c	modified	+3	−4	View file
arch/arm/mach-imx/mach-mx1ads.c	modified	+3	−4	View file
arch/arm/mach-imx/mach-mx21ads.c	modified	+3	−3	View file
arch/arm/mach-imx/mach-mx25_3ds.c	modified	+4	−4	View file
arch/arm/mach-imx/mach-mx27_3ds.c	modified	+5	−5	View file
arch/arm/mach-imx/mach-mx27ads.c	modified	+3	−3	View file
arch/arm/mach-imx/mach-mx31_3ds.c	modified	+6	−6	View file
arch/arm/mach-imx/mach-mx31ads.c	modified	+3	−2	View file
arch/arm/mach-imx/mach-mx31lilly.c	modified	+5	−6	View file
arch/arm/mach-imx/mach-mx31lite.c	modified	+5	−6	View file
arch/arm/mach-imx/mach-mx31moboard.c	modified	+7	−7	View file
arch/arm/mach-imx/mach-mx35_3ds.c	modified	+4	−4	View file
arch/arm/mach-imx/mach-mx50_rdp.c	modified	+3	−4	View file
arch/arm/mach-imx/mach-mx51_3ds.c	modified	+4	−5	View file
arch/arm/mach-imx/mach-mx51_babbage.c	modified	+3	−4	View file
arch/arm/mach-imx/mach-mxt_td60.c	modified	+3	−3	View file
arch/arm/mach-imx/mach-pca100.c	modified	+4	−4	View file
arch/arm/mach-imx/mach-pcm037.c	modified	+4	−4	View file
arch/arm/mach-imx/mach-pcm037_eet.c	modified	+2	−3	View file
arch/arm/mach-imx/mach-pcm038.c	modified	+6	−7	View file
arch/arm/mach-imx/mach-pcm043.c	modified	+4	−5	View file
arch/arm/mach-imx/mach-qong.c	modified	+3	−3	View file
arch/arm/mach-imx/mach-scb9328.c	modified	+3	−4	View file
arch/arm/mach-imx/mach-vpr200.c	modified	+3	−4	View file
arch/arm/mach-imx/mm-imx1.c	modified	+6	−3	View file
arch/arm/mach-imx/mm-imx21.c	modified	+9	−5	View file
arch/arm/mach-imx/mm-imx25.c	modified	+7	−5	View file
arch/arm/mach-imx/mm-imx27.c	modified	+9	−5	View file
arch/arm/mach-imx/mm-imx3.c	modified	+8	−5	View file
arch/arm/mach-imx/mm-imx5.c	modified	+8	−4	View file
arch/arm/plat-mxc/include/mach/mx1.h → arch/arm/mach-imx/mx1.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/mx21.h → arch/arm/mach-imx/mx21.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/mx25.h → arch/arm/mach-imx/mx25.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/mx27.h → arch/arm/mach-imx/mx27.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/mx2x.h → arch/arm/mach-imx/mx2x.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/mx31.h → arch/arm/mach-imx/mx31.h	renamed	+0	−0	View file
arch/arm/mach-imx/mx31lilly-db.c	modified	+4	−5	View file
arch/arm/mach-imx/mx31lite-db.c	modified	+4	−5	View file
arch/arm/mach-imx/mx31moboard-devboard.c	modified	+4	−5	View file
arch/arm/mach-imx/mx31moboard-marxbot.c	modified	+4	−5	View file
arch/arm/mach-imx/mx31moboard-smartbot.c	modified	+5	−6	View file
arch/arm/plat-mxc/include/mach/mx35.h → arch/arm/mach-imx/mx35.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/mx3x.h → arch/arm/mach-imx/mx3x.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/mx50.h → arch/arm/mach-imx/mx50.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/mx51.h → arch/arm/mach-imx/mx51.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/mx53.h → arch/arm/mach-imx/mx53.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/mx6q.h → arch/arm/mach-imx/mx6q.h	renamed	+0	−0	View file
arch/arm/plat-mxc/include/mach/mxc.h → arch/arm/mach-imx/mxc.h	renamed	+0	−0	View file
arch/arm/mach-imx/pcm970-baseboard.c	modified	+3	−4	View file
arch/arm/mach-imx/platsmp.c	modified	+3	−2	View file
arch/arm/mach-imx/pm-imx27.c	modified	+2	−1	View file
arch/arm/mach-imx/pm-imx3.c	modified	+4	−3	View file
arch/arm/mach-imx/pm-imx5.c	modified	+4	−3	View file
arch/arm/mach-imx/pm-imx6q.c	modified	+3	−2	View file
arch/arm/plat-mxc/ssi-fiq-ksym.c → arch/arm/mach-imx/ssi-fiq-ksym.c	renamed	+0	−0	View file
arch/arm/plat-mxc/ssi-fiq.S → arch/arm/mach-imx/ssi-fiq.S	renamed	+0	−0	View file
arch/arm/plat-mxc/system.c → arch/arm/mach-imx/system.c	renamed	+3	−2	View file
arch/arm/plat-mxc/time.c → arch/arm/mach-imx/time.c	renamed	+3	−2	View file
arch/arm/plat-mxc/tzic.c → arch/arm/mach-imx/tzic.c	renamed	+2	−4	View file
arch/arm/plat-mxc/ulpi.c → arch/arm/mach-imx/ulpi.c	renamed	+1	−1	View file
arch/arm/plat-mxc/include/mach/ulpi.h → arch/arm/mach-imx/ulpi.h	renamed	+0	−0	View file
arch/arm/mach-integrator/Kconfig	modified	+2	−0	View file
arch/arm/mach-integrator/common.h	modified	+7	−1	View file
arch/arm/mach-integrator/core.c	modified	+95	−46	View file
arch/arm/mach-integrator/include/mach/platform.h	modified	+0	−1	View file
arch/arm/mach-integrator/integrator_ap.c	modified	+132	−26	View file
arch/arm/mach-integrator/integrator_cp.c	modified	+87	−28	View file
arch/arm/mach-integrator/pci_v3.c	modified	+17	−15	View file
arch/arm/mach-kirkwood/board-dockstar.c	modified	+0	−13	View file
arch/arm/mach-kirkwood/board-dreamplug.c	modified	+0	−15	View file
arch/arm/mach-kirkwood/board-dt.c	modified	+2	−2	View file
arch/arm/mach-kirkwood/board-goflexnet.c	modified	+0	−13	View file
arch/arm/mach-kirkwood/board-ib62x0.c	modified	+0	−6	View file
arch/arm/mach-kirkwood/board-iconnect.c	modified	+0	−8	View file
arch/arm/mach-kirkwood/board-iomega_ix2_200.c	modified	+0	−2	View file
arch/arm/mach-kirkwood/board-lsxl.c	modified	+0	−8	View file
arch/arm/mach-kirkwood/board-ts219.c	modified	+0	−3	View file
arch/arm/mach-kirkwood/common.c	modified	+5	−6	View file
arch/arm/mach-kirkwood/common.h	modified	+2	−1	View file
arch/arm/mach-kirkwood/cpuidle.c	modified	+1	−1	View file
arch/arm/mach-kirkwood/dockstar-setup.c	modified	+1	−1	View file
arch/arm/mach-kirkwood/irq.c	modified	+1	−0	View file
arch/arm/mach-kirkwood/lacie_v2-common.c	modified	+1	−0	View file
arch/arm/mach-kirkwood/mpp.c	modified	+2	−2	View file
arch/arm/mach-kirkwood/netspace_v2-setup.c	modified	+2	−2	View file
arch/arm/mach-kirkwood/openrd-setup.c	modified	+5	−9	View file
arch/arm/mach-kirkwood/pcie.c	modified	+8	−23	View file
arch/arm/mach-kirkwood/sheevaplug-setup.c	modified	+1	−1	View file
arch/arm/mach-kirkwood/t5325-setup.c	modified	+3	−3	View file
arch/arm/mach-kirkwood/ts41x-setup.c	modified	+1	−2	View file
arch/arm/mach-kirkwood/tsx1x-common.c	modified	+4	−3	View file
arch/arm/mach-omap1/common.h	modified	+1	−1	View file
arch/arm/mach-omap1/devices.c	modified	+18	−3	View file
arch/arm/mach-omap1/reset.c	modified	+4	−5	View file
arch/arm/mach-omap1/timer.c	modified	+1	−0	View file
arch/arm/mach-omap1/timer32k.c	modified	+0	−1	View file
arch/arm/mach-omap2/Makefile	modified	+8	−2	View file
arch/arm/mach-omap2/am33xx.h	modified	+1	−0	View file
arch/arm/mach-omap2/board-2430sdp.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-3430sdp.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-3630sdp.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-4430sdp.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-am3517crane.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-am3517evm.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-apollon.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-cm-t35.c	modified	+9	−9	View file
arch/arm/mach-omap2/board-cm-t3517.c	modified	+2	−2	View file
arch/arm/mach-omap2/board-devkit8000.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-generic.c	modified	+22	−5	View file
arch/arm/mach-omap2/board-h4.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-igep0020.c	modified	+2	−2	View file
arch/arm/mach-omap2/board-ldp.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-n8x0.c	modified	+3	−3	View file
arch/arm/mach-omap2/board-omap3beagle.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-omap3evm.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-omap3logic.c	modified	+2	−2	View file
arch/arm/mach-omap2/board-omap3pandora.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-omap3stalker.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-omap3touchbook.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-omap4panda.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-overo.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-rm680.c	modified	+2	−2	View file
arch/arm/mach-omap2/board-rx51.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-ti8168evm.c	modified	+2	−2	View file
arch/arm/mach-omap2/board-zoom.c	modified	+2	−2	View file
arch/arm/mach-omap2/clkt2xxx_apll.c	modified	+14	−43	View file
arch/arm/mach-omap2/clkt2xxx_dpllcore.c	modified	+30	−6	View file
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c	modified	+60	−10	View file
arch/arm/mach-omap2/clkt_iclk.c	modified	+0	−1	View file
arch/arm/mach-omap2/clock.c	modified	+53	−4	View file
arch/arm/mach-omap2/clock.h	modified	+0	−28	View file
arch/arm/mach-omap2/clock2420_data.c	modified	+6	−20	View file
arch/arm/mach-omap2/clock2430_data.c	modified	+6	−20	View file
arch/arm/mach-omap2/clock2xxx.c	modified	+0	−16	View file
arch/arm/mach-omap2/clock2xxx.h	modified	+5	−4	View file
arch/arm/mach-omap2/cm-regbits-24xx.h	modified	+2	−0	View file
arch/arm/mach-omap2/cm.h	modified	+18	−2	View file
arch/arm/mach-omap2/cm2xxx.c	modified	+127	−1	View file
arch/arm/mach-omap2/cm2xxx.h	modified	+4	−0	View file
arch/arm/mach-omap2/cm2xxx_3xxx.h	modified	+6	−2	View file
arch/arm/mach-omap2/cm3xxx.c	modified	+66	−0	View file
arch/arm/mach-omap2/cm3xxx.h	modified	+5	−0	View file
arch/arm/mach-omap2/cm_common.c	modified	+70	−1	View file
arch/arm/mach-omap2/cminst44xx.h	modified	+2	−0	View file
arch/arm/mach-omap2/common.c	modified	+0	−183	View file
arch/arm/mach-omap2/common.h	modified	+35	−99	View file
arch/arm/mach-omap2/control.c	modified	+4	−6	View file
arch/arm/mach-omap2/control.h	modified	+2	−0	View file
arch/arm/mach-omap2/cpuidle34xx.c	modified	+0	−1	View file
arch/arm/mach-omap2/devices.c	modified	+0	−26	View file
arch/arm/mach-omap2/display.c	modified	+1	−1	View file
arch/arm/mach-omap2/hdq1w.c	modified	+1	−3	View file
arch/arm/mach-omap2/i2c.c	modified	+2	−4	View file
arch/arm/mach-omap2/id.c	modified	+11	−21	View file
arch/arm/mach-omap2/io.c	modified	+71	−14	View file
arch/arm/mach-omap2/mcbsp.c	modified	+1	−1	View file
arch/arm/mach-omap2/msdi.c	modified	+1	−3	View file
arch/arm/mach-omap2/omap2-restart.c	added	+65	−0	View file
arch/arm/mach-omap2/omap3-restart.c	added	+36	−0	View file
arch/arm/mach-omap2/omap4-common.c	modified	+19	−0	View file
arch/arm/mach-omap2/omap_hwmod.c	modified	+3	−5	View file
arch/arm/mach-omap2/omap_hwmod_2420_data.c	modified	+0	−1	View file
arch/arm/mach-omap2/omap_hwmod_2430_data.c	modified	+0	−1	View file
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c	modified	+14	−1	View file
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c	modified	+20	−21	View file
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	modified	+5	−1	View file
arch/arm/mach-omap2/pm-debug.c	modified	+0	−1	View file
arch/arm/mach-omap2/pm34xx.c	modified	+0	−1	View file
arch/arm/mach-omap2/powerdomain.c	modified	+0	−2	View file
arch/arm/mach-omap2/prcm-common.h	modified	+0	−22	View file
arch/arm/mach-omap2/prcm.c	deleted	+0	−189	View before deletion
arch/arm/mach-omap2/prcm_mpu44xx.c	modified	+17	−0	View file
arch/arm/mach-omap2/prcm_mpu44xx.h	modified	+8	−1	View file
arch/arm/mach-omap2/prm.h	modified	+23	−1	View file
arch/arm/mach-omap2/prm2xxx.c	modified	+14	−1	View file
arch/arm/mach-omap2/prm2xxx.h	modified	+2	−0	View file
arch/arm/mach-omap2/prm2xxx_3xxx.h	modified	+0	−7	View file
arch/arm/mach-omap2/prm3xxx.c	modified	+15	−1	View file
arch/arm/mach-omap2/prm3xxx.h	modified	+2	−0	View file
arch/arm/mach-omap2/prm44xx.c	modified	+0	−1	View file
arch/arm/mach-omap2/prm_common.c	modified	+15	−2	View file
arch/arm/mach-omap2/prminst44xx.h	modified	+2	−0	View file
arch/arm/mach-omap2/sdrc.c	modified	+3	−5	View file
arch/arm/mach-omap2/sdrc.h	modified	+2	−0	View file
arch/arm/mach-omap2/soc.h	modified	+2	−6	View file
arch/arm/mach-omap2/ti81xx.h	modified	+9	−0	View file
arch/arm/mach-omap2/timer.c	modified	+265	−117	View file
arch/arm/mach-omap2/wd_timer.c	modified	+36	−4	View file
arch/arm/mach-pxa/Kconfig	modified	+0	−34	View file
arch/arm/mach-pxa/Makefile	modified	+0	−3	View file
arch/arm/mach-pxa/clock.h	modified	+1	−1	View file
arch/arm/mach-pxa/devices.c	modified	+4	−4	View file
arch/arm/mach-pxa/include/mach/hardware.h	modified	+0	−28	View file
arch/arm/mach-pxa/include/mach/irqs.h	modified	+0	−1	View file
arch/arm/mach-pxa/include/mach/pxa3xx.h	modified	+0	−1	View file
arch/arm/mach-pxa/include/mach/pxa95x.h	deleted	+0	−7	View before deletion
arch/arm/mach-pxa/pxa3xx-ulpi.c	modified	+1	−12	View file
arch/arm/mach-pxa/pxa95x.c	deleted	+0	−295	View before deletion
arch/arm/mach-pxa/saarb.c	deleted	+0	−115	View before deletion
arch/arm/mach-pxa/tavorevb3.c	deleted	+0	−136	View before deletion
arch/arm/mach-s3c24xx/clock-s3c2443.c	modified	+0	−6	View file
arch/arm/mach-s3c64xx/clock.c	modified	+1	−19	View file
arch/arm/mach-s3c64xx/common.c	modified	+0	−1	View file
arch/arm/mach-s5p64x0/common.c	modified	+0	−2	View file
arch/arm/mach-s5pv210/common.c	modified	+0	−2	View file
arch/arm/mach-s5pv210/mach-goni.c	modified	+0	−1	View file
arch/arm/mach-shmobile/setup-r8a7740.c	modified	+0	−6	View file
arch/arm/mach-shmobile/setup-sh7372.c	modified	+0	−6	View file
arch/arm/mach-tegra/apbio.c	modified	+1	−4	View file
arch/arm/mach-tegra/board-dt-tegra20.c	modified	+1	−3	View file
arch/arm/mach-tegra/board-dt-tegra30.c	modified	+1	−2	View file
arch/arm/mach-tegra/clock.c	modified	+0	−2	View file
arch/arm/mach-tegra/common.c	modified	+1	−1	View file
arch/arm/mach-tegra/cpu-tegra.c	modified	+0	−3	View file
arch/arm/mach-tegra/cpuidle.c	modified	+0	−2	View file
arch/arm/mach-tegra/flowctrl.c	modified	+1	−2	View file
arch/arm/mach-tegra/fuse.c	modified	+1	−2	View file
arch/arm/mach-tegra/headsmp.S	modified	+1	−2	View file
arch/arm/mach-tegra/include/mach/debug-macro.S	modified	+2	−2	View file
arch/arm/mach-tegra/include/mach/dma.h	deleted	+0	−54	View before deletion
arch/arm/mach-tegra/include/mach/powergate.h	modified	+2	−0	View file
arch/arm/mach-tegra/include/mach/uncompress.h	modified	+2	−2	View file
arch/arm/mach-tegra/io.c	modified	+1	−1	View file
arch/arm/mach-tegra/include/mach/iomap.h → arch/arm/mach-tegra/iomap.h	renamed	+0	−2	View file
arch/arm/mach-tegra/include/mach/irammap.h → arch/arm/mach-tegra/irammap.h	renamed	+0	−0	View file
arch/arm/mach-tegra/irq.c	modified	+1	−2	View file
arch/arm/mach-tegra/pcie.c	modified	+1	−1	View file
arch/arm/mach-tegra/platsmp.c	modified	+1	−2	View file
arch/arm/mach-tegra/pmc.c	modified	+1	−1	View file
arch/arm/mach-tegra/powergate.c	modified	+1	−1	View file
arch/arm/mach-tegra/reset.c	modified	+2	−3	View file
arch/arm/mach-tegra/sleep-t20.S	modified	+0	−2	View file
arch/arm/mach-tegra/sleep-t30.S	modified	+0	−2	View file
arch/arm/mach-tegra/sleep.S	modified	+1	−1	View file
arch/arm/mach-tegra/sleep.h	modified	+1	−1	View file
arch/arm/mach-tegra/tegra20_clocks.c	modified	+1	−2	View file
arch/arm/mach-tegra/tegra20_clocks_data.c	modified	+0	−2	View file
arch/arm/mach-tegra/tegra2_emc.c	modified	+0	−2	View file
arch/arm/mach-tegra/tegra30_clocks.c	modified	+1	−2	View file
arch/arm/mach-tegra/timer.c	modified	+1	−1	View file
arch/arm/mach-u300/core.c	modified	+0	−2	View file
arch/arm/mach-vt8500/include/mach/hardware.h	deleted	+0	−12	View before deletion
arch/arm/mach-vt8500/include/mach/i8042.h	deleted	+0	−18	View before deletion
arch/arm/mach-vt8500/include/mach/restart.h	deleted	+0	−17	View before deletion
arch/arm/mach-vt8500/timer.c	modified	+1	−1	View file
arch/arm/mach-vt8500/vt8500.c	modified	+0	−2	View file
arch/arm/mach-zynq/common.c	modified	+10	−13	View file
arch/arm/mach-zynq/include/mach/clkdev.h	deleted	+0	−32	View before deletion
arch/arm/mach-zynq/include/mach/zynq_soc.h	modified	+15	−16	View file
arch/arm/plat-mxc/Kconfig	deleted	+0	−89	View before deletion
arch/arm/plat-mxc/Makefile	deleted	+0	−24	View before deletion
arch/arm/plat-mxc/include/mach/irqs.h	deleted	+0	−21	View before deletion
arch/arm/plat-mxc/include/mach/timex.h	deleted	+0	−22	View before deletion
arch/arm/plat-mxc/include/mach/uncompress.h	deleted	+0	−132	View before deletion
arch/arm/plat-omap/Kconfig	modified	+6	−0	View file
arch/arm/plat-omap/debug-leds.c	modified	+1	−1	View file
arch/arm/plat-omap/dmtimer.c	modified	+164	−54	View file
arch/arm/plat-omap/include/plat/dmtimer.h	modified	+70	−73	View file
arch/arm/plat-omap/include/plat/prcm.h	deleted	+0	−37	View before deletion
arch/arm/plat-pxa/Makefile	modified	+0	−1	View file
arch/arm/plat-pxa/include/plat/mfp.h	modified	+2	−2	View file
arch/arm/plat-samsung/adc.c	modified	+13	−35	View file
arch/arm/plat-samsung/devs.c	modified	+0	−4	View file
arch/arm/plat-samsung/include/plat/devs.h	modified	+0	−1	View file
drivers/amba/tegra-ahb.c	modified	+1	−0	View file
drivers/clk/clk-bcm2835.c	modified	+1	−1	View file
drivers/crypto/tegra-aes.c	modified	+0	−2	View file
drivers/dma/imx-dma.c	modified	+80	−57	View file
drivers/dma/imx-sdma.c	modified	+0	−1	View file
drivers/dma/ipu/ipu_idmac.c	modified	+1	−2	View file
drivers/dma/ipu/ipu_irq.c	modified	+1	−2	View file
drivers/gpio/gpio-pxa.c	modified	+1	−1	View file
drivers/i2c/busses/i2c-imx.c	modified	+35	−5	View file
drivers/iommu/tegra-smmu.c	modified	+1	−3	View file
drivers/media/platform/soc_camera/mx2_camera.c	modified	+71	−24	View file
drivers/media/platform/soc_camera/mx3_camera.c	modified	+1	−1	View file
drivers/mmc/host/mxcmmc.c	modified	+29	−2	View file
drivers/mtd/nand/mxc_nand.c	modified	+60	−36	View file
drivers/rtc/rtc-mxc.c	modified	+31	−3	View file
drivers/staging/nvec/nvec.c	modified	+0	−1	View file
drivers/staging/tidspbridge/core/ue_deh.c	modified	+0	−1	View file
drivers/usb/host/ehci-mxc.c	modified	+0	−1	View file
drivers/video/imxfb.c	modified	+32	−6	View file
drivers/video/mx3fb.c	modified	+1	−2	View file
drivers/watchdog/imx2_wdt.c	modified	+0	−1	View file
drivers/watchdog/omap_wdt.c	modified	+12	−14	View file
arch/arm/plat-mxc/include/mach/ipu.h → include/linux/dma/ipu-dma.h	renamed	+3	−3	View file
include/linux/platform_data/asoc-imx-ssi.h	modified	+2	−0	View file
include/linux/platform_data/dma-imx.h	modified	+3	−1	View file
include/linux/platform_data/dmtimer-omap.h	added	+31	−0	View file
include/linux/platform_data/omap-wd-timer.h	added	+38	−0	View file
arch/arm/mach-tegra/include/mach/tegra-ahb.h → include/linux/tegra-ahb.h	renamed	+3	−3	View file
sound/soc/fsl/imx-pcm-fiq.c	modified	+0	−1	View file
sound/soc/fsl/imx-ssi.c	modified	+0	−1	View file
sound/soc/tegra/tegra30_ahub.c	modified	+0	−1	View file
sound/soc/tegra/tegra_pcm.h	modified	+0	−2	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/devicetree/bindings/arm/arm-boards

View file

diff --git a/Documentation/devicetree/bindings/arm/arm-boards b/Documentation/devicetree/bindings/arm/arm-boards
index fc81a7d..db5858e 100644
--- a/Documentation/devicetree/bindings/arm/arm-boards
+++ b/Documentation/devicetree/bindings/arm/arm-boards
@@ -9,6 +9,10 @@ Required properties (in root node):
 
 FPGA type interrupt controllers, see the versatile-fpga-irq binding doc.
 
+In the root node the Integrator/CP must have a /cpcon node pointing
+to the CP control registers, and the Integrator/AP must have a
+/syscon node pointing to the Integrator/AP system controller.
+
 
 ARM Versatile Application and Platform Baseboards
 -------------------------------------------------

Documentation/devicetree/bindings/arm/omap/counter.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/omap/counter.txt b/Documentation/devicetree/bindings/arm/omap/counter.txt
new file mode 100644
index 0000000..5bd8aa0
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/omap/counter.txt
@@ -0,0 +1,15 @@
+OMAP Counter-32K bindings
+
+Required properties:
+- compatible:	Must be "ti,omap-counter32k" for OMAP controllers
+- reg:		Contains timer register address range (base address and length)
+- ti,hwmods:	Name of the hwmod associated to the counter, which is typically
+		"counter_32k"
+
+Example:
+
+counter32k: counter@4a304000 {
+	compatible = "ti,omap-counter32k";
+	reg = <0x4a304000 0x20>;
+	ti,hwmods = "counter_32k";
+};

Documentation/devicetree/bindings/arm/omap/timer.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/omap/timer.txt b/Documentation/devicetree/bindings/arm/omap/timer.txt
new file mode 100644
index 0000000..8732d4d
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/omap/timer.txt
@@ -0,0 +1,31 @@
+OMAP Timer bindings
+
+Required properties:
+- compatible:		Must be "ti,omap2-timer" for OMAP2+ controllers.
+- reg:			Contains timer register address range (base address and
+			length).
+- interrupts: 		Contains the interrupt information for the timer. The
+			format is being dependent on which interrupt controller
+			the OMAP device uses.
+- ti,hwmods:		Name of the hwmod associated to the timer, "timer<X>",
+			where <X> is the instance number of the timer from the
+			HW spec.
+
+Optional properties:
+- ti,timer-alwon:	Indicates the timer is in an alway-on power domain.
+- ti,timer-dsp:		Indicates the timer can interrupt the on-chip DSP in
+			addition to the ARM CPU.
+- ti,timer-pwm: 	Indicates the timer can generate a PWM output.
+- ti,timer-secure: 	Indicates the timer is reserved on a secure OMAP device
+			and therefore cannot be used by the kernel.
+
+Example:
+
+timer12: timer@48304000 {
+	compatible = "ti,omap2-timer";
+	reg = <0x48304000 0x400>;
+	interrupts = <95>;
+	ti,hwmods = "timer12"
+	ti,timer-alwon;
+	ti,timer-secure;
+};

Documentation/devicetree/bindings/bus/omap-ocp2scp.txt

View file

diff --git a/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt b/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
index d2fe064..63dd805 100644
--- a/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
+++ b/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
@@ -2,9 +2,27 @@
 
 properties:
 - compatible : Should be "ti,omap-ocp2scp"
+- reg : Address and length of the register set for the device
 - #address-cells, #size-cells : Must be present if the device has sub-nodes
 - ranges : the child address space are mapped 1:1 onto the parent address space
 - ti,hwmods : must be "ocp2scp_usb_phy"
 
 Sub-nodes:
 All the devices connected to ocp2scp are described using sub-node to ocp2scp
+
+ocp2scp@4a0ad000 {
+	compatible = "ti,omap-ocp2scp";
+	reg = <0x4a0ad000 0x1f>;
+	#address-cells = <1>;
+	#size-cells = <1>;
+	ranges;
+	ti,hwmods = "ocp2scp_usb_phy";
+
+	subnode1 {
+	...
+	};
+
+	subnode2 {
+	...
+	};
+};

Documentation/devicetree/bindings/i2c/i2c-imx.txt

View file

diff --git a/Documentation/devicetree/bindings/i2c/i2c-imx.txt b/Documentation/devicetree/bindings/i2c/i2c-imx.txt
index f3cf43b..3614242 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-imx.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-imx.txt
@@ -12,13 +12,13 @@ Optional properties:
 Examples:
 
 i2c@83fc4000 { /* I2C2 on i.MX51 */
-	compatible = "fsl,imx51-i2c", "fsl,imx1-i2c";
+	compatible = "fsl,imx51-i2c", "fsl,imx21-i2c";
 	reg = <0x83fc4000 0x4000>;
 	interrupts = <63>;
 };
 
 i2c@70038000 { /* HS-I2C on i.MX51 */
-	compatible = "fsl,imx51-i2c", "fsl,imx1-i2c";
+	compatible = "fsl,imx51-i2c", "fsl,imx21-i2c";
 	reg = <0x70038000 0x4000>;
 	interrupts = <64>;
 	clock-frequency = <400000>;

Documentation/devicetree/bindings/i2c/trivial-devices.txt

View file

diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
index 2f5322b..446859f 100644
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -55,5 +55,7 @@ st-micro,24c256		i2c serial eeprom  (24cxx)
 stm,m41t00		Serial Access TIMEKEEPER
 stm,m41t62		Serial real-time clock (RTC) with alarm
 stm,m41t80		M41T80 - SERIAL ACCESS RTC WITH ALARMS
+taos,tsl2550		Ambient Light Sensor with SMBUS/Two Wire Serial Interface
 ti,tsc2003		I2C Touch-Screen Controller
 ti,tmp102		Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface
+ti,tmp275		Digital Temperature Sensor

Documentation/devicetree/bindings/usb/am33xx-usb.txt

View file

diff --git a/Documentation/devicetree/bindings/usb/am33xx-usb.txt b/Documentation/devicetree/bindings/usb/am33xx-usb.txt
index a922505..ea840f7 100644
--- a/Documentation/devicetree/bindings/usb/am33xx-usb.txt
+++ b/Documentation/devicetree/bindings/usb/am33xx-usb.txt
@@ -1,5 +1,7 @@
 AM33XX MUSB GLUE
  - compatible : Should be "ti,musb-am33xx"
+ - reg : offset and length of register sets, first usbss, then for musb instances
+ - interrupts : usbss, musb instance interrupts in order
  - ti,hwmods : must be "usb_otg_hs"
  - multipoint : Should be "1" indicating the musb controller supports
    multipoint. This is a MUSB configuration-specific setting.
@@ -12,3 +14,22 @@ AM33XX MUSB GLUE
    represents PERIPHERAL.
  - power : Should be "250". This signifies the controller can supply upto
    500mA when operating in host mode.
+
+Example:
+
+usb@47400000  {
+	compatible = "ti,musb-am33xx";
+	reg = <0x47400000 0x1000	/* usbss */
+	       0x47401000 0x800		/* musb instance 0 */
+	       0x47401800 0x800>;	/* musb instance 1 */
+	interrupts = <17		/* usbss */
+		      18		/* musb instance 0 */
+		      19>;		/* musb instance 1 */
+	multipoint = <1>;
+	num-eps = <16>;
+	ram-bits = <12>;
+	port0-mode = <3>;
+	port1-mode = <3>;
+	power = <250>;
+	ti,hwmods = "usb_otg_hs";
+};

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 8959cec..e624aa2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -797,7 +797,6 @@ L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
 T:	git git://git.pengutronix.de/git/imx/linux-2.6.git
 F:	arch/arm/mach-imx/
-F:	arch/arm/plat-mxc/
 F:	arch/arm/configs/imx*_defconfig
 
 ARM/FREESCALE IMX6

arch/arm/Kconfig

View file

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f24e076..03e0460 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -438,19 +438,6 @@ config ARCH_FOOTBRIDGE
 	  Support for systems based on the DC21285 companion chip
 	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
 
-config ARCH_MXC
-	bool "Freescale MXC/iMX-based"
-	select ARCH_REQUIRE_GPIOLIB
-	select CLKDEV_LOOKUP
-	select CLKSRC_MMIO
-	select GENERIC_CLOCKEVENTS
-	select GENERIC_IRQ_CHIP
-	select MULTI_IRQ_HANDLER
-	select SPARSE_IRQ
-	select USE_OF
-	help
-	  Support for Freescale MXC/iMX-based family of processors
-
 config ARCH_MXS
 	bool "Freescale MXS-based"
 	select ARCH_REQUIRE_GPIOLIB
@@ -966,7 +953,6 @@ config ARCH_ZYNQ
 	bool "Xilinx Zynq ARM Cortex A9 Platform"
 	select ARM_AMBA
 	select ARM_GIC
-	select CLKDEV_LOOKUP
 	select CPU_V7
 	select GENERIC_CLOCKEVENTS
 	select ICST
@@ -1065,7 +1051,7 @@ source "arch/arm/mach-msm/Kconfig"
 
 source "arch/arm/mach-mv78xx0/Kconfig"
 
-source "arch/arm/plat-mxc/Kconfig"
+source "arch/arm/mach-imx/Kconfig"
 
 source "arch/arm/mach-mxs/Kconfig"
 
@@ -1175,7 +1161,7 @@ config ARM_NR_BANKS
 config IWMMXT
 	bool "Enable iWMMXt support"
 	depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4
-	default y if PXA27x || PXA3xx || PXA95x || ARCH_MMP
+	default y if PXA27x || PXA3xx || ARCH_MMP
 	help
 	  Enable support for iWMMXt context switching at run time if
 	  running on a CPU that supports it.

arch/arm/Kconfig.debug

View file

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index b0f3857..5566520 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -412,6 +412,14 @@ endchoice
 config DEBUG_LL_INCLUDE
 	string
 	default "debug/icedcc.S" if DEBUG_ICEDCC
+	default "debug/imx.S" if DEBUG_IMX1_UART || \
+				 DEBUG_IMX25_UART || \
+				 DEBUG_IMX21_IMX27_UART || \
+				 DEBUG_IMX31_IMX35_UART || \
+				 DEBUG_IMX51_UART || \
+				 DEBUG_IMX50_IMX53_UART ||\
+				 DEBUG_IMX6Q_UART2 || \
+				 DEBUG_IMX6Q_UART4
 	default "debug/highbank.S" if DEBUG_HIGHBANK_UART
 	default "debug/mvebu.S" if DEBUG_MVEBU_UART
 	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART

arch/arm/Makefile

View file

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 45096a1..20d295a 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -197,10 +197,8 @@ machine-$(CONFIG_ARCH_ZYNQ)		+= zynq
 
 # Platform directory name.  This list is sorted alphanumerically
 # by CONFIG_* macro name.
-plat-$(CONFIG_ARCH_MXC)		+= mxc
 plat-$(CONFIG_ARCH_OMAP)	+= omap
 plat-$(CONFIG_ARCH_S3C64XX)	+= samsung
-plat-$(CONFIG_ARCH_ZYNQ)	+= versatile
 plat-$(CONFIG_PLAT_IOP)		+= iop
 plat-$(CONFIG_PLAT_NOMADIK)	+= nomadik
 plat-$(CONFIG_PLAT_ORION)	+= orion

arch/arm/boot/compressed/Makefile

View file

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index a517153..537208f 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -54,10 +54,6 @@ ifeq ($(CONFIG_ARCH_SA1100),y)
 OBJS		+= head-sa1100.o
 endif
 
-ifeq ($(CONFIG_ARCH_VT8500),y)
-OBJS		+= head-vt8500.o
-endif
-
 ifeq ($(CONFIG_CPU_XSCALE),y)
 OBJS		+= head-xscale.o
 endif

arch/arm/boot/compressed/head-vt8500.S

View before deletion

diff --git a/arch/arm/boot/compressed/head-vt8500.S b/arch/arm/boot/compressed/head-vt8500.S
deleted file mode 100644
index 1dc1e21..0000000
--- a/arch/arm/boot/compressed/head-vt8500.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * linux/arch/arm/boot/compressed/head-vt8500.S
- *
- * Copyright (C) 2010 Alexey Charkov <[email protected]>
- *
- * VIA VT8500 specific tweaks. This is merged into head.S by the linker.
- *
- */
-
-#include <linux/linkage.h>
-#include <asm/mach-types.h>
-
-		.section        ".start", "ax"
-
-__VT8500_start:
-	@ Compare the SCC ID register against a list of known values
-	ldr	r1, .SCCID
-	ldr	r3, [r1]
-
-	@ VT8500 override
-	ldr	r4, .VT8500SCC
-	cmp	r3, r4
-	ldreq	r7, .ID_BV07
-	beq	.Lendvt8500
-
-	@ WM8505 override
-	ldr	r4, .WM8505SCC
-	cmp	r3, r4
-	ldreq	r7, .ID_8505
-	beq	.Lendvt8500
-
-	@ Otherwise, leave the bootloader's machine id untouched
-
-.SCCID:
-	.word	0xd8120000
-.VT8500SCC:
-	.word	0x34000102
-.WM8505SCC:
-	.word	0x34260103
-
-.ID_BV07:
-	.word	MACH_TYPE_BV07
-.ID_8505:
-	.word	MACH_TYPE_WM8505_7IN_NETBOOK
-
-.Lendvt8500:

arch/arm/boot/dts/Makefile

View file

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 2624937..5e98094 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -79,15 +79,17 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
 	imx28-m28evk.dtb \
 	imx28-tx28.dtb
 dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
+	omap3-beagle.dtb \
 	omap3-beagle-xm.dtb \
 	omap3-evm.dtb \
 	omap3-tobi.dtb \
 	omap4-panda.dtb \
-	omap4-pandaES.dtb \
-	omap4-var_som.dtb \
+	omap4-panda-es.dtb \
+	omap4-var-som.dtb \
 	omap4-sdp.dtb \
 	omap5-evm.dtb \
 	am335x-evm.dtb \
+	am335x-evmsk.dtb \
 	am335x-bone.dtb
 dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
 dtb-$(CONFIG_ARCH_U8500) += snowball.dtb

arch/arm/boot/dts/am335x-bone.dts

View file

diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index c634f87..2c33888 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -13,11 +13,31 @@
 	model = "TI AM335x BeagleBone";
 	compatible = "ti,am335x-bone", "ti,am33xx";
 
+	cpus {
+		cpu@0 {
+			cpu0-supply = <&dcdc2_reg>;
+		};
+	};
+
 	memory {
 		device_type = "memory";
 		reg = <0x80000000 0x10000000>; /* 256 MB */
 	};
 
+	am33xx_pinmux: pinmux@44e10800 {
+		pinctrl-names = "default";
+		pinctrl-0 = <&user_leds_s0>;
+
+		user_leds_s0: user_leds_s0 {
+			pinctrl-single,pins = <
+				0x54 0x7	/* gpmc_a5.gpio1_21, OUTPUT | MODE7 */
+				0x58 0x17	/* gpmc_a6.gpio1_22, OUTPUT_PULLUP | MODE7 */
+				0x5c 0x7	/* gpmc_a7.gpio1_23, OUTPUT | MODE7 */
+				0x60 0x17	/* gpmc_a8.gpio1_24, OUTPUT_PULLUP | MODE7 */
+			>;
+		};
+	};
+
 	ocp {
 		uart1: serial@44e09000 {
 			status = "okay";
@@ -33,6 +53,36 @@
 
 		};
 	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led@2 {
+			label = "beaglebone:green:heartbeat";
+			gpios = <&gpio2 21 0>;
+			linux,default-trigger = "heartbeat";
+			default-state = "off";
+		};
+
+		led@3 {
+			label = "beaglebone:green:mmc0";
+			gpios = <&gpio2 22 0>;
+			linux,default-trigger = "mmc0";
+			default-state = "off";
+		};
+
+		led@4 {
+			label = "beaglebone:green:usr2";
+			gpios = <&gpio2 23 0>;
+			default-state = "off";
+		};
+
+		led@5 {
+			label = "beaglebone:green:usr3";
+			gpios = <&gpio2 24 0>;
+			default-state = "off";
+		};
+	};
 };
 
 /include/ "tps65217.dtsi"

arch/arm/boot/dts/am335x-evm.dts

View file

diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 185d632..9f65f17 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -13,11 +13,39 @@
 	model = "TI AM335x EVM";
 	compatible = "ti,am335x-evm", "ti,am33xx";
 
+	cpus {
+		cpu@0 {
+			cpu0-supply = <&vdd1_reg>;
+		};
+	};
+
 	memory {
 		device_type = "memory";
 		reg = <0x80000000 0x10000000>; /* 256 MB */
 	};
 
+	am33xx_pinmux: pinmux@44e10800 {
+		pinctrl-names = "default";
+		pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0>;
+
+		matrix_keypad_s0: matrix_keypad_s0 {
+			pinctrl-single,pins = <
+				0x54 0x7	/* gpmc_a5.gpio1_21, OUTPUT | MODE7 */
+				0x58 0x7	/* gpmc_a6.gpio1_22, OUTPUT | MODE7 */
+				0x64 0x27	/* gpmc_a9.gpio1_25, INPUT | MODE7 */
+				0x68 0x27	/* gpmc_a10.gpio1_26, INPUT | MODE7 */
+				0x6c 0x27	/* gpmc_a11.gpio1_27, INPUT | MODE7 */
+			>;
+		};
+
+		volume_keys_s0: volume_keys_s0 {
+			pinctrl-single,pins = <
+				0x150 0x27	/* spi0_sclk.gpio0_2, INPUT | MODE7 */
+				0x154 0x27	/* spi0_d0.gpio0_3, INPUT | MODE7 */
+			>;
+		};
+	};
+
 	ocp {
 		uart1: serial@44e09000 {
 			status = "okay";
@@ -31,6 +59,49 @@
 				reg = <0x2d>;
 			};
 		};
+
+		i2c2: i2c@4802a000 {
+			status = "okay";
+			clock-frequency = <100000>;
+
+			lis331dlh: lis331dlh@18 {
+				compatible = "st,lis331dlh", "st,lis3lv02d";
+				reg = <0x18>;
+				Vdd-supply = <&lis3_reg>;
+				Vdd_IO-supply = <&lis3_reg>;
+
+				st,click-single-x;
+				st,click-single-y;
+				st,click-single-z;
+				st,click-thresh-x = <10>;
+				st,click-thresh-y = <10>;
+				st,click-thresh-z = <10>;
+				st,irq1-click;
+				st,irq2-click;
+				st,wakeup-x-lo;
+				st,wakeup-x-hi;
+				st,wakeup-y-lo;
+				st,wakeup-y-hi;
+				st,wakeup-z-lo;
+				st,wakeup-z-hi;
+				st,min-limit-x = <120>;
+				st,min-limit-y = <120>;
+				st,min-limit-z = <140>;
+				st,max-limit-x = <550>;
+				st,max-limit-y = <550>;
+				st,max-limit-z = <750>;
+			};
+
+			tsl2550: tsl2550@39 {
+				compatible = "taos,tsl2550";
+				reg = <0x39>;
+			};
+
+			tmp275: tmp275@48 {
+				compatible = "ti,tmp275";
+				reg = <0x48>;
+			};
+		};
 	};
 
 	vbat: fixedregulator@0 {
@@ -40,6 +111,53 @@
 		regulator-max-microvolt = <5000000>;
 		regulator-boot-on;
 	};
+
+	lis3_reg: fixedregulator@1 {
+		compatible = "regulator-fixed";
+		regulator-name = "lis3_reg";
+		regulator-boot-on;
+	};
+
+	matrix_keypad: matrix_keypad@0 {
+		compatible = "gpio-matrix-keypad";
+		debounce-delay-ms = <5>;
+		col-scan-delay-us = <2>;
+
+		row-gpios = <&gpio2 25 0	/* Bank1, pin25 */
+			     &gpio2 26 0	/* Bank1, pin26 */
+			     &gpio2 27 0>;	/* Bank1, pin27 */
+
+		col-gpios = <&gpio2 21 0	/* Bank1, pin21 */
+			     &gpio2 22 0>;	/* Bank1, pin22 */
+
+		linux,keymap = <0x0000008b	/* MENU */
+				0x0100009e	/* BACK */
+				0x02000069	/* LEFT */
+				0x0001006a	/* RIGHT */
+				0x0101001c	/* ENTER */
+				0x0201006c>;	/* DOWN */
+	};
+
+	gpio_keys: volume_keys@0 {
+		compatible = "gpio-keys";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		autorepeat;
+
+		switch@9 {
+			label = "volume-up";
+			linux,code = <115>;
+			gpios = <&gpio1 2 1>;
+			gpio-key,wakeup;
+		};
+
+		switch@10 {
+			label = "volume-down";
+			linux,code = <114>;
+			gpios = <&gpio1 3 1>;
+			gpio-key,wakeup;
+		};
+	};
 };
 
 /include/ "tps65910.dtsi"

arch/arm/boot/dts/am335x-evmsk.dts

View file

diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
new file mode 100644
index 0000000..f5a6162
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -0,0 +1,250 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/*
+ * AM335x Starter Kit
+ * http://www.ti.com/tool/tmdssk3358
+ */
+
+/dts-v1/;