diff options
| -rw-r--r-- | Documentation/arm64/memory.txt | 12 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt | 4 | ||||
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/Kconfig | 19 | ||||
| -rw-r--r-- | arch/arm/Kconfig.debug | 8 | ||||
| -rw-r--r-- | arch/arm/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/boot/compressed/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/boot/compressed/head-vt8500.S | 46 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx27.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx51.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx53.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6q.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-harmony.dts | 63 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-paz00.dts | 59 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-seaboard.dts | 59 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-tamonten.dtsi | 63 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-ventana.dts | 59 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20-whistler.dts | 119 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra30-cardhu.dtsi | 47 | ||||
| -rw-r--r-- | arch/arm/boot/dts/zynq-ep107.dts | 19 | ||||
| -rw-r--r-- | arch/arm/configs/imx_v4_v5_defconfig | 4 | ||||
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/dma-mapping.h | 7 | ||||
| -rw-r--r-- | arch/arm/include/asm/io.h | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/sched_clock.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/vfpmacros.h | 12 | ||||
| -rw-r--r-- | arch/arm/include/debug/imx.S (renamed from arch/arm/plat-mxc/include/mach/debug-macro.S) | 33 | ||||
| -rw-r--r-- | arch/arm/include/uapi/asm/hwcap.h | 3 | ||||
| -rw-r--r-- | arch/arm/kernel/sched_clock.c | 18 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9g45.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/atmel-mci.h | 7 | ||||
| -rw-r--r-- | arch/arm/mach-bcm2835/Makefile.boot | 4 | ||||
| -rw-r--r-- | arch/arm/mach-bcm2835/bcm2835.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/board-dm646x-evm.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/common.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/usb.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-imx/3ds_debugboard.c (renamed from arch/arm/plat-mxc/3ds_debugboard.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/3ds_debugboard.h (renamed from arch/arm/plat-mxc/include/mach/3ds_debugboard.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 90 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 22 | ||||
| -rw-r--r-- | arch/arm/mach-imx/avic.c (renamed from arch/arm/plat-mxc/avic.c) | 5 | ||||
| -rw-r--r-- | arch/arm/mach-imx/board-mx31lilly.h (renamed from arch/arm/plat-mxc/include/mach/board-mx31lilly.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-imx/board-mx31lite.h (renamed from arch/arm/plat-mxc/include/mach/board-mx31lite.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-imx/board-mx31moboard.h (renamed from arch/arm/plat-mxc/include/mach/board-mx31moboard.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-imx/board-pcm038.h (renamed from arch/arm/plat-mxc/include/mach/board-pcm038.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clk-imx1.c | 17 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clk-imx21.c | 18 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clk-imx25.c | 26 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clk-imx27.c | 40 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clk-imx31.c | 21 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clk-imx35.c | 13 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clk-imx51-imx53.c | 15 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clk-imx6q.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/clk-pllv1.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/common.h (renamed from arch/arm/plat-mxc/include/mach/common.h) | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/cpu-imx25.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-imx/cpu-imx27.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/cpu-imx31.c | 7 | ||||
| -rw-r--r-- | arch/arm/mach-imx/cpu-imx35.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-imx/cpu-imx5.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/cpu.c (renamed from arch/arm/plat-mxc/cpu.c) | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/cpu_op-mx51.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/cpufreq.c (renamed from arch/arm/plat-mxc/cpufreq.c) | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/cpuidle.c (renamed from arch/arm/plat-mxc/cpuidle.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-imx/cpuidle.h (renamed from arch/arm/plat-mxc/include/mach/cpuidle.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices-imx1.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices-imx21.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices-imx25.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices-imx27.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices-imx31.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices-imx35.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices-imx50.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices-imx51.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/Kconfig (renamed from arch/arm/plat-mxc/devices/Kconfig) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/Makefile (renamed from arch/arm/plat-mxc/devices/Makefile) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/devices-common.h (renamed from arch/arm/plat-mxc/include/mach/devices-common.h) | 9 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/devices.c (renamed from arch/arm/plat-mxc/devices.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-ahci-imx.c (renamed from arch/arm/plat-mxc/devices/platform-ahci-imx.c) | 5 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-fec.c (renamed from arch/arm/plat-mxc/devices/platform-fec.c) | 5 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-flexcan.c (renamed from arch/arm/plat-mxc/devices/platform-flexcan.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c (renamed from arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c) | 5 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-gpio-mxc.c (renamed from arch/arm/plat-mxc/devices/platform-gpio-mxc.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-gpio_keys.c (renamed from arch/arm/plat-mxc/devices/platform-gpio_keys.c) | 5 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-imx-dma.c (renamed from arch/arm/plat-mxc/devices/platform-imx-dma.c) | 23 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-imx-fb.c (renamed from arch/arm/plat-mxc/devices/platform-imx-fb.c) | 16 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-imx-i2c.c (renamed from arch/arm/plat-mxc/devices/platform-imx-i2c.c) | 32 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-imx-keypad.c (renamed from arch/arm/plat-mxc/devices/platform-imx-keypad.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-imx-ssi.c (renamed from arch/arm/plat-mxc/devices/platform-imx-ssi.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-imx-uart.c (renamed from arch/arm/plat-mxc/devices/platform-imx-uart.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-imx2-wdt.c (renamed from arch/arm/plat-mxc/devices/platform-imx2-wdt.c) | 5 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-imx21-hcd.c (renamed from arch/arm/plat-mxc/devices/platform-imx21-hcd.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-imx27-coda.c (renamed from arch/arm/plat-mxc/devices/platform-imx27-coda.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-imx_udc.c (renamed from arch/arm/plat-mxc/devices/platform-imx_udc.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-imxdi_rtc.c (renamed from arch/arm/plat-mxc/devices/platform-imxdi_rtc.c) | 5 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-ipu-core.c (renamed from arch/arm/plat-mxc/devices/platform-ipu-core.c) | 5 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-mx1-camera.c (renamed from arch/arm/plat-mxc/devices/platform-mx1-camera.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-mx2-camera.c (renamed from arch/arm/plat-mxc/devices/platform-mx2-camera.c) | 16 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-mxc-ehci.c (renamed from arch/arm/plat-mxc/devices/platform-mxc-ehci.c) | 5 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-mxc-mmc.c (renamed from arch/arm/plat-mxc/devices/platform-mxc-mmc.c) | 20 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-mxc_nand.c (renamed from arch/arm/plat-mxc/devices/platform-mxc_nand.c) | 25 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-mxc_pwm.c (renamed from arch/arm/plat-mxc/devices/platform-mxc_pwm.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-mxc_rnga.c (renamed from arch/arm/plat-mxc/devices/platform-mxc_rnga.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-mxc_rtc.c (renamed from arch/arm/plat-mxc/devices/platform-mxc_rtc.c) | 13 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-mxc_w1.c (renamed from arch/arm/plat-mxc/devices/platform-mxc_w1.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-pata_imx.c (renamed from arch/arm/plat-mxc/devices/platform-pata_imx.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c (renamed from arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c) | 5 | ||||
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-spi_imx.c (renamed from arch/arm/plat-mxc/devices/platform-spi_imx.c) | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/ehci-imx25.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/ehci-imx27.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/ehci-imx31.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/ehci-imx35.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/ehci-imx5.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/epit.c (renamed from arch/arm/plat-mxc/epit.c) | 6 | ||||
| -rw-r--r-- | arch/arm/mach-imx/eukrea-baseboards.h (renamed from arch/arm/plat-mxc/include/mach/eukrea-baseboards.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 7 | ||||
| -rw-r--r-- | arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 7 | ||||
| -rw-r--r-- | arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c | 7 | ||||
| -rw-r--r-- | arch/arm/mach-imx/hardware.h (renamed from arch/arm/plat-mxc/include/mach/hardware.h) | 26 | ||||
| -rw-r--r-- | arch/arm/mach-imx/hotplug.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/iim.h (renamed from arch/arm/plat-mxc/include/mach/iim.h) | 0 | ||||
| -rw-r--r-- |