From 0a71a01c53b4b4bc5ec31a5135dd266dfac7c72d Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Tue, 20 Nov 2012 23:07:15 -0800 Subject: [PATCH] --- yaml --- r: 339816 b: refs/heads/master c: d4819dc969d0544edd0d0b819a741f10059adcaa h: refs/heads/master v: v3 --- [refs] | 2 +- .../devicetree/bindings/i2c/fsl-imx-i2c.txt | 4 +- trunk/MAINTAINERS | 1 - trunk/arch/arm/Kconfig | 19 +- trunk/arch/arm/Kconfig.debug | 8 + trunk/arch/arm/Makefile | 2 - trunk/arch/arm/boot/compressed/Makefile | 4 - trunk/arch/arm/boot/compressed/head-vt8500.S | 46 -- trunk/arch/arm/boot/dts/imx27.dtsi | 4 +- trunk/arch/arm/boot/dts/imx51.dtsi | 4 +- trunk/arch/arm/boot/dts/imx53.dtsi | 6 +- trunk/arch/arm/boot/dts/imx6q.dtsi | 6 +- trunk/arch/arm/boot/dts/zynq-ep107.dts | 19 +- trunk/arch/arm/configs/imx_v4_v5_defconfig | 4 +- trunk/arch/arm/configs/imx_v6_v7_defconfig | 2 + trunk/arch/arm/include/asm/dma-mapping.h | 7 - .../debug-macro.S => include/debug/imx.S} | 33 +- trunk/arch/arm/mach-at91/at91sam9g45.c | 1 - .../arch/arm/mach-davinci/board-dm646x-evm.c | 2 +- trunk/arch/arm/mach-davinci/common.c | 2 - trunk/arch/arm/mach-davinci/usb.c | 6 - .../{plat-mxc => mach-imx}/3ds_debugboard.c | 2 +- .../mach => mach-imx}/3ds_debugboard.h | 0 trunk/arch/arm/mach-imx/Kconfig | 90 ++- trunk/arch/arm/mach-imx/Makefile | 22 + trunk/arch/arm/{plat-mxc => mach-imx}/avic.c | 5 +- .../mach => mach-imx}/board-mx31lilly.h | 0 .../mach => mach-imx}/board-mx31lite.h | 0 .../mach => mach-imx}/board-mx31moboard.h | 0 .../include/mach => mach-imx}/board-pcm038.h | 0 trunk/arch/arm/mach-imx/clk-imx1.c | 17 +- trunk/arch/arm/mach-imx/clk-imx21.c | 18 +- trunk/arch/arm/mach-imx/clk-imx25.c | 26 +- trunk/arch/arm/mach-imx/clk-imx27.c | 40 +- trunk/arch/arm/mach-imx/clk-imx31.c | 21 +- trunk/arch/arm/mach-imx/clk-imx35.c | 13 +- trunk/arch/arm/mach-imx/clk-imx51-imx53.c | 15 +- trunk/arch/arm/mach-imx/clk-imx6q.c | 3 +- trunk/arch/arm/mach-imx/clk-pllv1.c | 4 +- .../include/mach => mach-imx}/common.h | 1 + trunk/arch/arm/mach-imx/cpu-imx25.c | 5 +- trunk/arch/arm/mach-imx/cpu-imx27.c | 2 +- trunk/arch/arm/mach-imx/cpu-imx31.c | 7 +- trunk/arch/arm/mach-imx/cpu-imx35.c | 5 +- trunk/arch/arm/mach-imx/cpu-imx5.c | 3 +- trunk/arch/arm/{plat-mxc => mach-imx}/cpu.c | 3 +- trunk/arch/arm/mach-imx/cpu_op-mx51.c | 3 +- .../arch/arm/{plat-mxc => mach-imx}/cpufreq.c | 3 +- .../arch/arm/{plat-mxc => mach-imx}/cpuidle.c | 0 .../include/mach => mach-imx}/cpuidle.h | 0 trunk/arch/arm/mach-imx/devices-imx1.h | 3 +- trunk/arch/arm/mach-imx/devices-imx21.h | 3 +- trunk/arch/arm/mach-imx/devices-imx25.h | 3 +- trunk/arch/arm/mach-imx/devices-imx27.h | 3 +- trunk/arch/arm/mach-imx/devices-imx31.h | 3 +- trunk/arch/arm/mach-imx/devices-imx35.h | 3 +- trunk/arch/arm/mach-imx/devices-imx50.h | 3 +- trunk/arch/arm/mach-imx/devices-imx51.h | 3 +- .../{plat-mxc => mach-imx}/devices/Kconfig | 0 .../{plat-mxc => mach-imx}/devices/Makefile | 2 + .../devices}/devices-common.h | 9 +- .../{plat-mxc => mach-imx/devices}/devices.c | 4 +- .../devices/platform-ahci-imx.c | 5 +- .../devices/platform-fec.c | 5 +- .../devices/platform-flexcan.c | 4 +- .../devices/platform-fsl-usb2-udc.c | 5 +- .../devices/platform-gpio-mxc.c | 2 +- .../devices/platform-gpio_keys.c | 5 +- .../devices/platform-imx-dma.c | 23 +- .../devices/platform-imx-fb.c | 16 +- .../devices/platform-imx-i2c.c | 32 +- .../devices/platform-imx-keypad.c | 4 +- .../devices/platform-imx-ssi.c | 4 +- .../devices/platform-imx-uart.c | 4 +- .../devices/platform-imx2-wdt.c | 5 +- .../devices/platform-imx21-hcd.c | 4 +- .../devices/platform-imx27-coda.c | 4 +- .../devices/platform-imx_udc.c | 4 +- .../devices/platform-imxdi_rtc.c | 5 +- .../devices/platform-ipu-core.c | 5 +- .../devices/platform-mx1-camera.c | 4 +- .../devices/platform-mx2-camera.c | 16 +- .../devices/platform-mxc-ehci.c | 5 +- .../devices/platform-mxc-mmc.c | 20 +- .../devices/platform-mxc_nand.c | 25 +- .../devices/platform-mxc_pwm.c | 4 +- .../devices/platform-mxc_rnga.c | 4 +- .../devices/platform-mxc_rtc.c | 13 +- .../devices/platform-mxc_w1.c | 4 +- .../devices/platform-pata_imx.c | 4 +- .../devices/platform-sdhci-esdhc-imx.c | 5 +- .../devices/platform-spi_imx.c | 4 +- trunk/arch/arm/mach-imx/ehci-imx25.c | 4 +- trunk/arch/arm/mach-imx/ehci-imx27.c | 4 +- trunk/arch/arm/mach-imx/ehci-imx31.c | 4 +- trunk/arch/arm/mach-imx/ehci-imx35.c | 4 +- trunk/arch/arm/mach-imx/ehci-imx5.c | 4 +- trunk/arch/arm/{plat-mxc => mach-imx}/epit.c | 6 +- .../mach => mach-imx}/eukrea-baseboards.h | 0 .../arm/mach-imx/eukrea_mbimx27-baseboard.c | 7 +- .../arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 8 +- .../arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 7 +- .../arm/mach-imx/eukrea_mbimxsd51-baseboard.c | 7 +- .../include/mach => mach-imx}/hardware.h | 26 +- trunk/arch/arm/mach-imx/hotplug.c | 3 +- .../{plat-mxc/include/mach => mach-imx}/iim.h | 0 trunk/arch/arm/mach-imx/imx27-dt.c | 11 +- trunk/arch/arm/mach-imx/imx31-dt.c | 5 +- trunk/arch/arm/mach-imx/imx51-dt.c | 9 +- .../arm/mach-imx/include/mach/dma-mx1-mx2.h | 10 - trunk/arch/arm/mach-imx/iomux-imx31.c | 5 +- .../include/mach => mach-imx}/iomux-mx1.h | 2 +- .../include/mach => mach-imx}/iomux-mx21.h | 4 +- .../include/mach => mach-imx}/iomux-mx25.h | 2 +- .../include/mach => mach-imx}/iomux-mx27.h | 4 +- .../include/mach => mach-imx}/iomux-mx2x.h | 0 .../include/mach => mach-imx}/iomux-mx3.h | 0 .../include/mach => mach-imx}/iomux-mx35.h | 2 +- .../include/mach => mach-imx}/iomux-mx50.h | 2 +- .../include/mach => mach-imx}/iomux-mx51.h | 2 +- .../arm/{plat-mxc => mach-imx}/iomux-v1.c | 5 +- .../include/mach => mach-imx}/iomux-v1.h | 0 .../arm/{plat-mxc => mach-imx}/iomux-v3.c | 5 +- .../include/mach => mach-imx}/iomux-v3.h | 0 .../include/mach => mach-imx}/iram.h | 0 .../arm/{plat-mxc => mach-imx}/iram_alloc.c | 3 +- .../arm/{plat-mxc => mach-imx}/irq-common.c | 0 .../arm/{plat-mxc => mach-imx}/irq-common.h | 3 + trunk/arch/arm/mach-imx/lluart.c | 3 +- trunk/arch/arm/mach-imx/mach-apf9328.c | 7 +- trunk/arch/arm/mach-imx/mach-armadillo5x0.c | 9 +- trunk/arch/arm/mach-imx/mach-bug.c | 7 +- trunk/arch/arm/mach-imx/mach-cpuimx27.c | 11 +- trunk/arch/arm/mach-imx/mach-cpuimx35.c | 9 +- trunk/arch/arm/mach-imx/mach-cpuimx51sd.c | 9 +- .../arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 10 +- .../arm/mach-imx/mach-imx27_visstrim_m10.c | 6 +- trunk/arch/arm/mach-imx/mach-imx27ipcam.c | 6 +- trunk/arch/arm/mach-imx/mach-imx27lite.c | 6 +- trunk/arch/arm/mach-imx/mach-imx53.c | 11 +- trunk/arch/arm/mach-imx/mach-imx6q.c | 6 +- trunk/arch/arm/mach-imx/mach-kzm_arm11_01.c | 7 +- trunk/arch/arm/mach-imx/mach-mx1ads.c | 7 +- trunk/arch/arm/mach-imx/mach-mx21ads.c | 6 +- trunk/arch/arm/mach-imx/mach-mx25_3ds.c | 8 +- trunk/arch/arm/mach-imx/mach-mx27_3ds.c | 10 +- trunk/arch/arm/mach-imx/mach-mx27ads.c | 6 +- trunk/arch/arm/mach-imx/mach-mx31_3ds.c | 12 +- trunk/arch/arm/mach-imx/mach-mx31ads.c | 5 +- trunk/arch/arm/mach-imx/mach-mx31lilly.c | 11 +- trunk/arch/arm/mach-imx/mach-mx31lite.c | 11 +- trunk/arch/arm/mach-imx/mach-mx31moboard.c | 14 +- trunk/arch/arm/mach-imx/mach-mx35_3ds.c | 8 +- trunk/arch/arm/mach-imx/mach-mx50_rdp.c | 7 +- trunk/arch/arm/mach-imx/mach-mx51_3ds.c | 9 +- trunk/arch/arm/mach-imx/mach-mx51_babbage.c | 7 +- trunk/arch/arm/mach-imx/mach-mxt_td60.c | 6 +- trunk/arch/arm/mach-imx/mach-pca100.c | 8 +- trunk/arch/arm/mach-imx/mach-pcm037.c | 8 +- trunk/arch/arm/mach-imx/mach-pcm037_eet.c | 5 +- trunk/arch/arm/mach-imx/mach-pcm038.c | 13 +- trunk/arch/arm/mach-imx/mach-pcm043.c | 9 +- trunk/arch/arm/mach-imx/mach-qong.c | 6 +- trunk/arch/arm/mach-imx/mach-scb9328.c | 7 +- trunk/arch/arm/mach-imx/mach-vpr200.c | 7 +- trunk/arch/arm/mach-imx/mm-imx1.c | 9 +- trunk/arch/arm/mach-imx/mm-imx21.c | 14 +- trunk/arch/arm/mach-imx/mm-imx25.c | 12 +- trunk/arch/arm/mach-imx/mm-imx27.c | 14 +- trunk/arch/arm/mach-imx/mm-imx3.c | 13 +- trunk/arch/arm/mach-imx/mm-imx5.c | 12 +- .../{plat-mxc/include/mach => mach-imx}/mx1.h | 0 .../include/mach => mach-imx}/mx21.h | 0 .../include/mach => mach-imx}/mx25.h | 0 .../include/mach => mach-imx}/mx27.h | 0 .../include/mach => mach-imx}/mx2x.h | 0 .../include/mach => mach-imx}/mx31.h | 0 trunk/arch/arm/mach-imx/mx31lilly-db.c | 9 +- trunk/arch/arm/mach-imx/mx31lite-db.c | 9 +- .../arch/arm/mach-imx/mx31moboard-devboard.c | 9 +- trunk/arch/arm/mach-imx/mx31moboard-marxbot.c | 9 +- .../arch/arm/mach-imx/mx31moboard-smartbot.c | 11 +- .../include/mach => mach-imx}/mx35.h | 0 .../include/mach => mach-imx}/mx3x.h | 0 .../include/mach => mach-imx}/mx50.h | 0 .../include/mach => mach-imx}/mx51.h | 0 .../include/mach => mach-imx}/mx53.h | 0 .../include/mach => mach-imx}/mx6q.h | 0 .../{plat-mxc/include/mach => mach-imx}/mxc.h | 0 trunk/arch/arm/mach-imx/pcm970-baseboard.c | 7 +- trunk/arch/arm/mach-imx/platsmp.c | 5 +- trunk/arch/arm/mach-imx/pm-imx27.c | 3 +- trunk/arch/arm/mach-imx/pm-imx3.c | 7 +- trunk/arch/arm/mach-imx/pm-imx5.c | 7 +- trunk/arch/arm/mach-imx/pm-imx6q.c | 5 +- .../arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c | 0 .../arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S | 0 .../arch/arm/{plat-mxc => mach-imx}/system.c | 5 +- trunk/arch/arm/{plat-mxc => mach-imx}/time.c | 5 +- trunk/arch/arm/{plat-mxc => mach-imx}/tzic.c | 6 +- trunk/arch/arm/{plat-mxc => mach-imx}/ulpi.c | 2 +- .../include/mach => mach-imx}/ulpi.h | 0 trunk/arch/arm/mach-omap1/Makefile | 3 +- trunk/arch/arm/mach-omap1/board-ams-delta.c | 1 - trunk/arch/arm/mach-omap1/board-fsample.c | 9 +- trunk/arch/arm/mach-omap1/board-generic.c | 1 - trunk/arch/arm/mach-omap1/board-h2-mmc.c | 5 +- trunk/arch/arm/mach-omap1/board-h2.c | 6 +- trunk/arch/arm/mach-omap1/board-h3-mmc.c | 3 +- trunk/arch/arm/mach-omap1/board-h3.c | 5 +- trunk/arch/arm/mach-omap1/board-htcherald.c | 3 +- trunk/arch/arm/mach-omap1/board-innovator.c | 30 +- trunk/arch/arm/mach-omap1/board-nokia770.c | 5 +- trunk/arch/arm/mach-omap1/board-osk.c | 3 +- trunk/arch/arm/mach-omap1/board-palmte.c | 6 +- trunk/arch/arm/mach-omap1/board-palmtt.c | 8 +- trunk/arch/arm/mach-omap1/board-palmz71.c | 6 +- trunk/arch/arm/mach-omap1/board-perseus2.c | 9 +- trunk/arch/arm/mach-omap1/board-sx1-mmc.c | 3 +- trunk/arch/arm/mach-omap1/board-sx1.c | 6 +- trunk/arch/arm/mach-omap1/board-voiceblue.c | 3 +- trunk/arch/arm/mach-omap1/clock.c | 507 +++++++++++- trunk/arch/arm/mach-omap1/clock.h | 178 ++++- trunk/arch/arm/mach-omap1/clock_data.c | 16 +- trunk/arch/arm/mach-omap1/common.h | 7 +- trunk/arch/arm/mach-omap1/devices.c | 35 +- trunk/arch/arm/mach-omap1/dma.c | 9 +- trunk/arch/arm/mach-omap1/dma.h | 83 ++ trunk/arch/arm/mach-omap1/flash.c | 2 +- trunk/arch/arm/mach-omap1/fpga.c | 4 +- trunk/arch/arm/mach-omap1/fpga.h | 52 ++ trunk/arch/arm/mach-omap1/gpio15xx.c | 2 + trunk/arch/arm/mach-omap1/gpio16xx.c | 2 + trunk/arch/arm/mach-omap1/gpio7xx.c | 2 + trunk/arch/arm/mach-omap1/i2c.c | 64 +- trunk/arch/arm/mach-omap1/id.c | 2 +- .../arm/mach-omap1/include/mach/debug-macro.S | 2 +- .../arm/mach-omap1/include/mach/entry-macro.S | 2 - trunk/arch/arm/mach-omap1/include/mach/gpio.h | 3 - .../arm/mach-omap1/include/mach/hardware.h | 9 +- .../arch/arm/mach-omap1/include/mach/memory.h | 2 +- .../arm/mach-omap1/include/mach/omap1510.h | 113 +++ .../arch/arm/mach-omap1/include/mach/serial.h | 53 ++ trunk/arch/arm/mach-omap1/include/mach/soc.h | 229 ++++++ .../plat => mach-omap1/include/mach}/tc.h | 0 .../arm/mach-omap1/include/mach/uncompress.h | 121 ++- trunk/arch/arm/mach-omap1/io.c | 5 +- trunk/arch/arm/mach-omap1/iomap.h | 3 - trunk/arch/arm/mach-omap1/irq.c | 2 +- trunk/arch/arm/mach-omap1/lcd_dma.c | 4 +- trunk/arch/arm/mach-omap1/mcbsp.c | 5 +- trunk/arch/arm/mach-omap1/mmc.h | 18 + trunk/arch/arm/mach-omap1/opp_data.c | 2 +- trunk/arch/arm/mach-omap1/pm.c | 10 +- trunk/arch/arm/mach-omap1/pm_bus.c | 3 +- trunk/arch/arm/mach-omap1/reset.c | 41 +- trunk/arch/arm/mach-omap1/serial.c | 1 - trunk/arch/arm/mach-omap1/sleep.S | 2 + trunk/arch/arm/mach-omap1/soc.h | 4 + trunk/arch/arm/mach-omap1/sram-init.c | 76 ++ trunk/arch/arm/mach-omap1/sram.h | 7 + trunk/arch/arm/mach-omap1/timer32k.c | 1 + trunk/arch/arm/mach-omap1/usb.c | 6 +- trunk/arch/arm/mach-omap2/Makefile | 122 +-- trunk/arch/arm/mach-omap2/am33xx.h | 1 + trunk/arch/arm/mach-omap2/am35xx-emac.c | 2 +- trunk/arch/arm/mach-omap2/board-2430sdp.c | 6 +- trunk/arch/arm/mach-omap2/board-3430sdp.c | 8 +- trunk/arch/arm/mach-omap2/board-3630sdp.c | 5 +- trunk/arch/arm/mach-omap2/board-4430sdp.c | 6 +- trunk/arch/arm/mach-omap2/board-am3517crane.c | 3 +- trunk/arch/arm/mach-omap2/board-am3517evm.c | 4 +- trunk/arch/arm/mach-omap2/board-apollon.c | 6 +- trunk/arch/arm/mach-omap2/board-cm-t35.c | 28 +- trunk/arch/arm/mach-omap2/board-cm-t3517.c | 8 +- trunk/arch/arm/mach-omap2/board-devkit8000.c | 13 +- trunk/arch/arm/mach-omap2/board-flash.c | 52 +- trunk/arch/arm/mach-omap2/board-flash.h | 8 +- trunk/arch/arm/mach-omap2/board-generic.c | 10 +- trunk/arch/arm/mach-omap2/board-h4.c | 10 +- trunk/arch/arm/mach-omap2/board-igep0020.c | 13 +- trunk/arch/arm/mach-omap2/board-ldp.c | 11 +- trunk/arch/arm/mach-omap2/board-n8x0.c | 11 +- trunk/arch/arm/mach-omap2/board-omap3beagle.c | 18 +- trunk/arch/arm/mach-omap2/board-omap3evm.c | 13 +- trunk/arch/arm/mach-omap2/board-omap3logic.c | 11 +- .../arch/arm/mach-omap2/board-omap3pandora.c | 6 +- .../arch/arm/mach-omap2/board-omap3stalker.c | 5 +- .../arm/mach-omap2/board-omap3touchbook.c | 13 +- trunk/arch/arm/mach-omap2/board-omap4panda.c | 8 +- trunk/arch/arm/mach-omap2/board-overo.c | 14 +- trunk/arch/arm/mach-omap2/board-rm680.c | 13 +- .../arm/mach-omap2/board-rx51-peripherals.c | 7 +- trunk/arch/arm/mach-omap2/board-rx51.c | 10 +- trunk/arch/arm/mach-omap2/board-ti8168evm.c | 7 +- .../arm/mach-omap2/board-zoom-debugboard.c | 4 +- .../arch/arm/mach-omap2/board-zoom-display.c | 3 +- .../arm/mach-omap2/board-zoom-peripherals.c | 3 +- trunk/arch/arm/mach-omap2/board-zoom.c | 12 +- .../{include/mach => }/board-zoom.h | 0 trunk/arch/arm/mach-omap2/clkt2xxx_apll.c | 60 +- trunk/arch/arm/mach-omap2/clkt2xxx_dpll.c | 4 +- trunk/arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 42 +- trunk/arch/arm/mach-omap2/clkt2xxx_osc.c | 2 - trunk/arch/arm/mach-omap2/clkt2xxx_sys.c | 2 - .../arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 76 +- trunk/arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 5 +- trunk/arch/arm/mach-omap2/clkt_clksel.c | 2 - trunk/arch/arm/mach-omap2/clkt_dpll.c | 2 - trunk/arch/arm/mach-omap2/clkt_iclk.c | 2 - trunk/arch/arm/mach-omap2/clock.c | 578 +++++++++++++- trunk/arch/arm/mach-omap2/clock.h | 345 +++++++- trunk/arch/arm/mach-omap2/clock2420_data.c | 32 +- trunk/arch/arm/mach-omap2/clock2430.c | 4 +- trunk/arch/arm/mach-omap2/clock2430_data.c | 32 +- trunk/arch/arm/mach-omap2/clock2xxx.c | 18 - trunk/arch/arm/mach-omap2/clock2xxx.h | 9 +- trunk/arch/arm/mach-omap2/clock33xx_data.c | 5 +- trunk/arch/arm/mach-omap2/clock34xx.c | 4 +- trunk/arch/arm/mach-omap2/clock3517.c | 4 +- trunk/arch/arm/mach-omap2/clock36xx.c | 2 - trunk/arch/arm/mach-omap2/clock3xxx.c | 2 - trunk/arch/arm/mach-omap2/clock3xxx_data.c | 6 +- trunk/arch/arm/mach-omap2/clock44xx_data.c | 4 - trunk/arch/arm/mach-omap2/clockdomain.c | 3 +- trunk/arch/arm/mach-omap2/clockdomain.h | 5 +- .../arm/mach-omap2/clockdomain2xxx_3xxx.c | 339 -------- trunk/arch/arm/mach-omap2/clockdomain33xx.c | 74 -- trunk/arch/arm/mach-omap2/clockdomain44xx.c | 151 ---- .../arm/mach-omap2/clockdomains2420_data.c | 1 + .../arm/mach-omap2/clockdomains2430_data.c | 1 + .../arm/mach-omap2/clockdomains3xxx_data.c | 1 + trunk/arch/arm/mach-omap2/cm-regbits-24xx.h | 2 + trunk/arch/arm/mach-omap2/cm.h | 30 +- trunk/arch/arm/mach-omap2/cm2xxx.c | 381 +++++++++ trunk/arch/arm/mach-omap2/cm2xxx.h | 70 ++ trunk/arch/arm/mach-omap2/cm2xxx_3xxx.h | 125 +-- trunk/arch/arm/mach-omap2/cm33xx.c | 58 +- .../mach-omap2/{cm2xxx_3xxx.c => cm3xxx.c} | 371 ++++++--- trunk/arch/arm/mach-omap2/cm3xxx.h | 91 +++ trunk/arch/arm/mach-omap2/cm_common.c | 140 ++++ trunk/arch/arm/mach-omap2/cminst44xx.c | 142 +++- trunk/arch/arm/mach-omap2/cminst44xx.h | 2 + .../arm/mach-omap2/common-board-devices.c | 46 -- .../arm/mach-omap2/common-board-devices.h | 1 - trunk/arch/arm/mach-omap2/common.c | 187 +---- trunk/arch/arm/mach-omap2/common.h | 146 +--- trunk/arch/arm/mach-omap2/control.c | 18 +- trunk/arch/arm/mach-omap2/control.h | 2 + trunk/arch/arm/mach-omap2/cpuidle34xx.c | 1 - trunk/arch/arm/mach-omap2/devices.c | 34 +- trunk/arch/arm/mach-omap2/display.c | 47 +- trunk/arch/arm/mach-omap2/dma.c | 11 +- trunk/arch/arm/mach-omap2/dma.h | 131 +++ trunk/arch/arm/mach-omap2/dpll3xxx.c | 2 - trunk/arch/arm/mach-omap2/dpll44xx.c | 2 - trunk/arch/arm/mach-omap2/drm.c | 4 +- trunk/arch/arm/mach-omap2/dsp.c | 2 +- trunk/arch/arm/mach-omap2/gpio.c | 6 +- trunk/arch/arm/mach-omap2/gpmc-nand.c | 85 +- trunk/arch/arm/mach-omap2/gpmc-nand.h | 27 + trunk/arch/arm/mach-omap2/gpmc-onenand.c | 214 ++--- trunk/arch/arm/mach-omap2/gpmc-onenand.h | 24 + trunk/arch/arm/mach-omap2/gpmc-smc91x.c | 2 +- trunk/arch/arm/mach-omap2/gpmc-smsc911x.c | 2 +- trunk/arch/arm/mach-omap2/gpmc.c | 464 +---------- .../include/plat => mach-omap2}/gpmc.h | 61 +- trunk/arch/arm/mach-omap2/hdq1w.c | 8 +- trunk/arch/arm/mach-omap2/hdq1w.h | 2 +- trunk/arch/arm/mach-omap2/hsmmc.c | 8 +- trunk/arch/arm/mach-omap2/hwspinlock.c | 4 +- trunk/arch/arm/mach-omap2/i2c.c | 73 +- trunk/arch/arm/mach-omap2/i2c.h | 42 + trunk/arch/arm/mach-omap2/id.c | 32 +- .../arm/mach-omap2/include/mach/debug-macro.S | 2 +- trunk/arch/arm/mach-omap2/include/mach/gpio.h | 3 - .../plat => mach-omap2/include/mach}/serial.h | 29 - .../arm/mach-omap2/include/mach/uncompress.h | 175 +++- trunk/arch/arm/mach-omap2/io.c | 110 ++- trunk/arch/arm/mach-omap2/mcbsp.c | 9 +- trunk/arch/arm/mach-omap2/mmc.h | 23 + trunk/arch/arm/mach-omap2/msdi.c | 11 +- trunk/arch/arm/mach-omap2/mux.c | 3 +- .../arch/arm/mach-omap2/omap-mpuss-lowpower.c | 1 + .../{plat-omap => mach-omap2}/omap-pm-noop.c | 5 +- .../include/plat => mach-omap2}/omap-pm.h | 0 trunk/arch/arm/mach-omap2/omap-secure.c | 1 - trunk/arch/arm/mach-omap2/omap-secure.h | 7 + trunk/arch/arm/mach-omap2/omap2-restart.c | 65 ++ trunk/arch/arm/mach-omap2/omap3-restart.c | 36 + trunk/arch/arm/mach-omap2/omap4-common.c | 27 +- .../{plat-omap => mach-omap2}/omap_device.c | 5 +- .../include/plat => mach-omap2}/omap_device.h | 2 +- trunk/arch/arm/mach-omap2/omap_hwmod.c | 63 +- .../include/plat => mach-omap2}/omap_hwmod.h | 1 - .../arm/mach-omap2/omap_hwmod_2420_data.c | 13 +- .../arm/mach-omap2/omap_hwmod_2430_data.c | 12 +- .../omap_hwmod_2xxx_3xxx_interconnect_data.c | 3 +- .../omap_hwmod_2xxx_3xxx_ipblock_data.c | 9 +- .../omap_hwmod_2xxx_interconnect_data.c | 4 +- .../mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 6 +- .../arm/mach-omap2/omap_hwmod_33xx_data.c | 10 +- .../arm/mach-omap2/omap_hwmod_3xxx_data.c | 14 +- .../arm/mach-omap2/omap_hwmod_44xx_data.c | 11 +- .../arm/mach-omap2/omap_hwmod_common_data.c | 2 +- .../arm/mach-omap2/omap_hwmod_common_data.h | 2 +- trunk/arch/arm/mach-omap2/omap_opp_data.h | 2 +- trunk/arch/arm/mach-omap2/omap_phy_internal.c | 4 +- trunk/arch/arm/mach-omap2/omap_twl.c | 1 + trunk/arch/arm/mach-omap2/opp.c | 2 +- trunk/arch/arm/mach-omap2/opp3xxx_data.c | 1 + trunk/arch/arm/mach-omap2/pm-debug.c | 5 +- trunk/arch/arm/mach-omap2/pm.c | 5 +- trunk/arch/arm/mach-omap2/pm24xx.c | 13 +- trunk/arch/arm/mach-omap2/pm34xx.c | 15 +- trunk/arch/arm/mach-omap2/pm44xx.c | 1 + trunk/arch/arm/mach-omap2/pmu.c | 5 +- trunk/arch/arm/mach-omap2/powerdomain.c | 2 - trunk/arch/arm/mach-omap2/powerdomain.h | 2 - .../arm/mach-omap2/powerdomain2xxx_3xxx.c | 242 ------ trunk/arch/arm/mach-omap2/powerdomain33xx.c | 229 ------ trunk/arch/arm/mach-omap2/powerdomain44xx.c | 285 ------- .../arm/mach-omap2/powerdomains2xxx_data.c | 1 + trunk/arch/arm/mach-omap2/prcm-common.h | 22 - trunk/arch/arm/mach-omap2/prcm.c | 188 ----- trunk/arch/arm/mach-omap2/prcm_mpu44xx.c | 17 + trunk/arch/arm/mach-omap2/prcm_mpu44xx.h | 9 +- trunk/arch/arm/mach-omap2/prm-regbits-24xx.h | 6 +- trunk/arch/arm/mach-omap2/prm-regbits-34xx.h | 12 +- trunk/arch/arm/mach-omap2/prm.h | 77 +- trunk/arch/arm/mach-omap2/prm2xxx.c | 139 ++++ trunk/arch/arm/mach-omap2/prm2xxx.h | 134 ++++ trunk/arch/arm/mach-omap2/prm2xxx_3xxx.c | 332 +++----- trunk/arch/arm/mach-omap2/prm2xxx_3xxx.h | 284 ++----- trunk/arch/arm/mach-omap2/prm33xx.c | 204 ++++- trunk/arch/arm/mach-omap2/prm3xxx.c | 417 ++++++++++ trunk/arch/arm/mach-omap2/prm3xxx.h | 162 ++++ trunk/arch/arm/mach-omap2/prm44xx.c | 356 ++++++++- trunk/arch/arm/mach-omap2/prm44xx.h | 2 + trunk/arch/arm/mach-omap2/prm_common.c | 118 +-- trunk/arch/arm/mach-omap2/prminst44xx.h | 2 + .../mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h | 2 +- .../mach-omap2/sdram-micron-mt46h32m32lf-6.h | 2 +- trunk/arch/arm/mach-omap2/sdram-nokia.c | 4 +- .../arm/mach-omap2/sdram-numonyx-m65kxxxxam.h | 2 +- .../sdram-qimonda-hyb18m512160af-6.h | 2 +- trunk/arch/arm/mach-omap2/sdrc.c | 29 +- trunk/arch/arm/mach-omap2/sdrc.h | 148 +++- trunk/arch/arm/mach-omap2/sdrc2xxx.c | 7 +- trunk/arch/arm/mach-omap2/serial.c | 13 +- trunk/arch/arm/mach-omap2/serial.h | 1 + trunk/arch/arm/mach-omap2/sleep34xx.S | 7 +- trunk/arch/arm/mach-omap2/soc.h | 464 ++++++++++- trunk/arch/arm/mach-omap2/sr_device.c | 4 +- trunk/arch/arm/mach-omap2/sram.c | 305 +++++++ trunk/arch/arm/mach-omap2/sram.h | 83 ++ trunk/arch/arm/mach-omap2/sram242x.S | 4 +- trunk/arch/arm/mach-omap2/sram243x.S | 4 +- trunk/arch/arm/mach-omap2/sram34xx.S | 2 +- trunk/arch/arm/mach-omap2/ti81xx.h | 9 + trunk/arch/arm/mach-omap2/timer.c | 9 +- trunk/arch/arm/mach-omap2/twl-common.c | 3 - trunk/arch/arm/mach-omap2/usb-host.c | 6 +- trunk/arch/arm/mach-omap2/usb-musb.c | 8 +- trunk/arch/arm/mach-omap2/usb-tusb6010.c | 3 +- trunk/arch/arm/mach-omap2/usb.h | 82 ++ trunk/arch/arm/mach-omap2/wd_timer.c | 40 +- trunk/arch/arm/mach-omap2/wd_timer.h | 2 +- trunk/arch/arm/mach-pxa/Kconfig | 34 - trunk/arch/arm/mach-pxa/Makefile | 3 - trunk/arch/arm/mach-pxa/clock.h | 2 +- trunk/arch/arm/mach-pxa/devices.c | 8 +- .../arch/arm/mach-pxa/include/mach/hardware.h | 28 - trunk/arch/arm/mach-pxa/include/mach/irqs.h | 1 - trunk/arch/arm/mach-pxa/include/mach/pxa3xx.h | 1 - trunk/arch/arm/mach-pxa/include/mach/pxa95x.h | 7 - trunk/arch/arm/mach-pxa/pxa3xx-ulpi.c | 13 +- trunk/arch/arm/mach-pxa/pxa95x.c | 295 ------- trunk/arch/arm/mach-pxa/saarb.c | 115 --- trunk/arch/arm/mach-pxa/tavorevb3.c | 136 ---- trunk/arch/arm/mach-s3c64xx/common.c | 1 - trunk/arch/arm/mach-s5p64x0/common.c | 2 - trunk/arch/arm/mach-s5pv210/common.c | 2 - trunk/arch/arm/mach-shmobile/setup-r8a7740.c | 6 - trunk/arch/arm/mach-shmobile/setup-sh7372.c | 6 - trunk/arch/arm/mach-u300/core.c | 2 - .../arm/mach-vt8500/include/mach/hardware.h | 12 - .../arch/arm/mach-vt8500/include/mach/i8042.h | 18 - .../arm/mach-vt8500/include/mach/restart.h | 17 - trunk/arch/arm/mach-vt8500/timer.c | 2 +- trunk/arch/arm/mach-vt8500/vt8500.c | 2 - trunk/arch/arm/mach-zynq/common.c | 23 +- .../arch/arm/mach-zynq/include/mach/clkdev.h | 32 - .../arm/mach-zynq/include/mach/zynq_soc.h | 31 +- trunk/arch/arm/plat-mxc/Kconfig | 89 --- trunk/arch/arm/plat-mxc/Makefile | 24 - trunk/arch/arm/plat-mxc/include/mach/irqs.h | 21 - trunk/arch/arm/plat-mxc/include/mach/timex.h | 22 - .../arm/plat-mxc/include/mach/uncompress.h | 132 --- trunk/arch/arm/plat-omap/Makefile | 4 +- trunk/arch/arm/plat-omap/clock.c | 544 ------------- trunk/arch/arm/plat-omap/common.c | 48 -- trunk/arch/arm/plat-omap/counter_32k.c | 3 - trunk/arch/arm/plat-omap/debug-devices.c | 3 +- trunk/arch/arm/plat-omap/debug-leds.c | 25 +- trunk/arch/arm/plat-omap/dma.c | 132 +-- trunk/arch/arm/plat-omap/dmtimer.c | 20 +- trunk/arch/arm/plat-omap/fb.c | 62 +- trunk/arch/arm/plat-omap/i2c.c | 155 +--- .../{plat/dma.h => plat-omap/dma-omap.h} | 201 +---- .../arm/plat-omap/include/plat/clkdev_omap.h | 51 -- trunk/arch/arm/plat-omap/include/plat/clock.h | 309 ------- .../arch/arm/plat-omap/include/plat/common.h | 42 - .../arm/plat-omap/include/plat/counter-32k.h | 1 + trunk/arch/arm/plat-omap/include/plat/cpu.h | 468 +---------- .../include/plat}/debug-devices.h | 7 - .../arm/plat-omap/include/plat/dma-44xx.h | 147 ---- .../arch/arm/plat-omap/include/plat/dmtimer.h | 2 + trunk/arch/arm/plat-omap/include/plat/fpga.h | 193 ----- trunk/arch/arm/plat-omap/include/plat/i2c.h | 30 +- trunk/arch/arm/plat-omap/include/plat/multi.h | 120 --- .../arm/plat-omap/include/plat/omap-secure.h | 14 - trunk/arch/arm/plat-omap/include/plat/prcm.h | 37 - trunk/arch/arm/plat-omap/include/plat/sdrc.h | 164 ---- trunk/arch/arm/plat-omap/include/plat/sram.h | 97 +-- .../arm/plat-omap/include/plat/uncompress.h | 204 ----- trunk/arch/arm/plat-omap/include/plat/usb.h | 179 ----- trunk/arch/arm/plat-omap/sram.c | 366 +-------- trunk/arch/arm/plat-omap/sram.h | 6 - trunk/arch/arm/plat-pxa/Makefile | 1 - trunk/arch/arm/plat-pxa/include/plat/mfp.h | 4 +- trunk/drivers/bluetooth/hci_ldisc.c | 7 +- trunk/drivers/char/hw_random/omap-rng.c | 2 - trunk/drivers/crypto/omap-aes.c | 8 +- trunk/drivers/crypto/omap-sham.c | 10 +- trunk/drivers/dma/imx-dma.c | 137 ++-- trunk/drivers/dma/imx-sdma.c | 1 - trunk/drivers/dma/ipu/ipu_idmac.c | 3 +- trunk/drivers/dma/ipu/ipu_irq.c | 3 +- trunk/drivers/dma/omap-dma.c | 5 +- trunk/drivers/gpio/gpio-pxa.c | 2 +- trunk/drivers/i2c/busses/i2c-imx.c | 40 +- trunk/drivers/media/platform/omap/omap_vout.c | 4 +- .../media/platform/omap/omap_vout_vrfb.c | 6 +- .../media/platform/omap/omap_voutdef.h | 2 +- .../drivers/media/platform/omap3isp/isphist.c | 2 + .../drivers/media/platform/omap3isp/ispstat.h | 2 +- .../media/platform/omap3isp/ispvideo.c | 1 - .../media/platform/soc_camera/mx2_camera.c | 95 ++- .../media/platform/soc_camera/mx3_camera.c | 2 +- .../media/platform/soc_camera/omap1_camera.c | 3 +- trunk/drivers/media/rc/ir-rx51.c | 1 - trunk/drivers/mfd/menelaus.c | 2 +- trunk/drivers/mfd/omap-usb-host.c | 5 +- trunk/drivers/mfd/omap-usb-tll.c | 2 +- trunk/drivers/mfd/omap-usb.h | 2 + trunk/drivers/mmc/host/mxcmmc.c | 31 +- trunk/drivers/mmc/host/omap.c | 35 +- trunk/drivers/mmc/host/omap_hsmmc.c | 4 +- trunk/drivers/mtd/nand/mxc_nand.c | 96 ++- trunk/drivers/mtd/nand/omap2.c | 129 ++- trunk/drivers/mtd/onenand/omap2.c | 47 +- trunk/drivers/pcmcia/omap_cf.c | 2 +- trunk/drivers/rtc/rtc-mxc.c | 34 +- .../tidspbridge/include/dspbridge/host_os.h | 1 - trunk/drivers/tty/n_tty.c | 752 ++++++++++-------- trunk/drivers/tty/pty.c | 30 +- trunk/drivers/tty/serial/8250/8250.c | 9 +- trunk/drivers/tty/serial/8250/8250.h | 36 + trunk/drivers/tty/serial/8250/8250_early.c | 2 +- trunk/drivers/tty/serial/samsung.c | 16 +- trunk/drivers/tty/tty_audit.c | 15 +- trunk/drivers/tty/tty_buffer.c | 228 +++--- trunk/drivers/tty/tty_io.c | 15 +- trunk/drivers/tty/tty_ldisc.c | 15 +- trunk/drivers/tty/tty_port.c | 2 + trunk/drivers/tty/vt/selection.c | 9 +- trunk/drivers/usb/gadget/omap_udc.c | 4 +- trunk/drivers/usb/host/ehci-mxc.c | 1 - trunk/drivers/usb/host/ehci-omap.c | 3 +- trunk/drivers/usb/host/ohci-omap.c | 5 +- trunk/drivers/usb/host/ohci-omap3.c | 1 - trunk/drivers/usb/musb/am35x.c | 3 +- trunk/drivers/usb/musb/musb_dsps.c | 3 +- trunk/drivers/usb/musb/omap2430.h | 2 +- trunk/drivers/usb/musb/tusb6010_omap.c | 9 +- trunk/drivers/video/imxfb.c | 38 +- trunk/drivers/video/mx3fb.c | 3 +- trunk/drivers/video/omap/lcd_inn1510.c | 7 +- trunk/drivers/video/omap/lcdc.c | 2 +- trunk/drivers/video/omap/omapfb_main.c | 2 +- trunk/drivers/video/omap/sossi.c | 2 +- trunk/drivers/video/omap2/dss/core.c | 2 +- trunk/drivers/video/omap2/dss/dispc.c | 43 +- trunk/drivers/video/omap2/dss/dss.c | 39 +- trunk/drivers/video/omap2/dss/dss_features.c | 64 +- trunk/drivers/video/omap2/dss/dss_features.h | 5 +- trunk/drivers/video/omap2/dss/hdmi.c | 3 +- .../drivers/video/omap2/omapfb/omapfb-ioctl.c | 2 +- .../drivers/video/omap2/omapfb/omapfb-main.c | 8 +- .../drivers/video/omap2/omapfb/omapfb-sysfs.c | 2 +- trunk/drivers/video/omap2/vrfb.c | 142 +++- trunk/drivers/watchdog/imx2_wdt.c | 1 - trunk/drivers/watchdog/omap_wdt.c | 26 +- trunk/fs/devpts/inode.c | 61 +- trunk/include/linux/devpts_fs.h | 20 +- .../ipu.h => include/linux/dma/ipu-dma.h} | 6 +- .../plat => include/linux/mfd}/menelaus.h | 2 - .../linux/platform_data/asoc-imx-ssi.h | 2 + trunk/include/linux/platform_data/dma-imx.h | 4 +- trunk/include/linux/platform_data/gpio-omap.h | 1 - .../linux/platform_data/leds-omap.h} | 2 - .../linux/platform_data/mmc-omap.h} | 48 +- .../linux/platform_data/mtd-nand-omap2.h | 46 +- .../linux/platform_data/mtd-onenand-omap2.h | 28 +- .../linux/platform_data/omap-wd-timer.h | 38 + trunk/include/linux/platform_data/usb-omap.h | 80 ++ trunk/include/linux/tty.h | 44 +- trunk/include/linux/tty_flip.h | 2 +- trunk/include/video/omapdss.h | 14 + .../plat/vrfb.h => include/video/omapvrfb.h} | 2 + trunk/kernel/printk.c | 12 +- trunk/sound/soc/fsl/imx-pcm-fiq.c | 1 - trunk/sound/soc/fsl/imx-ssi.c | 1 - trunk/sound/soc/omap/am3517evm.c | 2 - trunk/sound/soc/omap/n810.c | 1 - trunk/sound/soc/omap/omap-pcm.c | 9 +- trunk/sound/soc/omap/osk5912.c | 1 - trunk/sound/soc/omap/sdp3430.c | 2 - 629 files changed, 10970 insertions(+), 10263 deletions(-) delete mode 100644 trunk/arch/arm/boot/compressed/head-vt8500.S rename trunk/arch/arm/{plat-mxc/include/mach/debug-macro.S => include/debug/imx.S} (59%) rename trunk/arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c (99%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/3ds_debugboard.h (100%) rename trunk/arch/arm/{plat-mxc => mach-imx}/avic.c (98%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lilly.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lite.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31moboard.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/board-pcm038.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/common.h (99%) rename trunk/arch/arm/{plat-mxc => mach-imx}/cpu.c (97%) rename trunk/arch/arm/{plat-mxc => mach-imx}/cpufreq.c (99%) rename trunk/arch/arm/{plat-mxc => mach-imx}/cpuidle.c (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/cpuidle.h (100%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/Kconfig (100%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/Makefile (98%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx/devices}/devices-common.h (97%) rename trunk/arch/arm/{plat-mxc => mach-imx/devices}/devices.c (92%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-ahci-imx.c (98%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-fec.c (97%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-flexcan.c (96%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-fsl-usb2-udc.c (96%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio-mxc.c (96%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio_keys.c (94%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-dma.c (63%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-fb.c (79%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-i2c.c (76%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-keypad.c (97%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-ssi.c (98%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-uart.c (98%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-imx2-wdt.c (97%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-imx21-hcd.c (94%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-imx27-coda.c (93%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-imx_udc.c (96%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-imxdi_rtc.c (94%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-ipu-core.c (98%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-mx1-camera.c (94%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-mx2-camera.c (83%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-ehci.c (97%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-mmc.c (76%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_nand.c (74%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_pwm.c (97%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rnga.c (95%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rtc.c (77%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_w1.c (95%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-pata_imx.c (96%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-sdhci-esdhc-imx.c (98%) rename trunk/arch/arm/{plat-mxc => mach-imx}/devices/platform-spi_imx.c (98%) rename trunk/arch/arm/{plat-mxc => mach-imx}/epit.c (99%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/eukrea-baseboards.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/hardware.h (94%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h (100%) delete mode 100644 trunk/arch/arm/mach-imx/include/mach/dma-mx1-mx2.h rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx1.h (99%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx21.h (99%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx25.h (99%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx27.h (99%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx2x.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx3.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx35.h (99%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx50.h (99%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx51.h (99%) rename trunk/arch/arm/{plat-mxc => mach-imx}/iomux-v1.c (98%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v1.h (100%) rename trunk/arch/arm/{plat-mxc => mach-imx}/iomux-v3.c (97%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v3.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/iram.h (100%) rename trunk/arch/arm/{plat-mxc => mach-imx}/iram_alloc.c (98%) rename trunk/arch/arm/{plat-mxc => mach-imx}/irq-common.c (100%) rename trunk/arch/arm/{plat-mxc => mach-imx}/irq-common.h (94%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/mx21.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/mx25.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/mx27.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/mx2x.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/mx31.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/mx35.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/mx3x.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/mx50.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/mx51.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/mx53.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/mx6q.h (100%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h (100%) rename trunk/arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c (100%) rename trunk/arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S (100%) rename trunk/arch/arm/{plat-mxc => mach-imx}/system.c (97%) rename trunk/arch/arm/{plat-mxc => mach-imx}/time.c (99%) rename trunk/arch/arm/{plat-mxc => mach-imx}/tzic.c (98%) rename trunk/arch/arm/{plat-mxc => mach-imx}/ulpi.c (99%) rename trunk/arch/arm/{plat-mxc/include/mach => mach-imx}/ulpi.h (100%) create mode 100644 trunk/arch/arm/mach-omap1/dma.h create mode 100644 trunk/arch/arm/mach-omap1/fpga.h delete mode 100644 trunk/arch/arm/mach-omap1/include/mach/gpio.h create mode 100644 trunk/arch/arm/mach-omap1/include/mach/serial.h create mode 100644 trunk/arch/arm/mach-omap1/include/mach/soc.h rename trunk/arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/tc.h (100%) create mode 100644 trunk/arch/arm/mach-omap1/mmc.h create mode 100644 trunk/arch/arm/mach-omap1/soc.h create mode 100644 trunk/arch/arm/mach-omap1/sram-init.c create mode 100644 trunk/arch/arm/mach-omap1/sram.h rename trunk/arch/arm/mach-omap2/{include/mach => }/board-zoom.h (100%) delete mode 100644 trunk/arch/arm/mach-omap2/clockdomain2xxx_3xxx.c delete mode 100644 trunk/arch/arm/mach-omap2/clockdomain33xx.c delete mode 100644 trunk/arch/arm/mach-omap2/clockdomain44xx.c create mode 100644 trunk/arch/arm/mach-omap2/cm2xxx.c create mode 100644 trunk/arch/arm/mach-omap2/cm2xxx.h rename trunk/arch/arm/mach-omap2/{cm2xxx_3xxx.c => cm3xxx.c} (67%) create mode 100644 trunk/arch/arm/mach-omap2/cm3xxx.h create mode 100644 trunk/arch/arm/mach-omap2/cm_common.c create mode 100644 trunk/arch/arm/mach-omap2/dma.h create mode 100644 trunk/arch/arm/mach-omap2/gpmc-nand.h create mode 100644 trunk/arch/arm/mach-omap2/gpmc-onenand.h rename trunk/arch/arm/{plat-omap/include/plat => mach-omap2}/gpmc.h (67%) create mode 100644 trunk/arch/arm/mach-omap2/i2c.h delete mode 100644 trunk/arch/arm/mach-omap2/include/mach/gpio.h rename trunk/arch/arm/{plat-omap/include/plat => mach-omap2/include/mach}/serial.h (81%) create mode 100644 trunk/arch/arm/mach-omap2/mmc.h rename trunk/arch/arm/{plat-omap => mach-omap2}/omap-pm-noop.c (98%) rename trunk/arch/arm/{plat-omap/include/plat => mach-omap2}/omap-pm.h (100%) create mode 100644 trunk/arch/arm/mach-omap2/omap2-restart.c create mode 100644 trunk/arch/arm/mach-omap2/omap3-restart.c rename trunk/arch/arm/{plat-omap => mach-omap2}/omap_device.c (99%) rename trunk/arch/arm/{plat-omap/include/plat => mach-omap2}/omap_device.h (99%) rename trunk/arch/arm/{plat-omap/include/plat => mach-omap2}/omap_hwmod.h (99%) delete mode 100644 trunk/arch/arm/mach-omap2/powerdomain2xxx_3xxx.c delete mode 100644 trunk/arch/arm/mach-omap2/powerdomain33xx.c delete mode 100644 trunk/arch/arm/mach-omap2/powerdomain44xx.c delete mode 100644 trunk/arch/arm/mach-omap2/prcm.c create mode 100644 trunk/arch/arm/mach-omap2/prm2xxx.c create mode 100644 trunk/arch/arm/mach-omap2/prm2xxx.h create mode 100644 trunk/arch/arm/mach-omap2/prm3xxx.c create mode 100644 trunk/arch/arm/mach-omap2/prm3xxx.h create mode 100644 trunk/arch/arm/mach-omap2/serial.h create mode 100644 trunk/arch/arm/mach-omap2/sram.c create mode 100644 trunk/arch/arm/mach-omap2/sram.h create mode 100644 trunk/arch/arm/mach-omap2/usb.h delete mode 100644 trunk/arch/arm/mach-pxa/include/mach/pxa95x.h delete mode 100644 trunk/arch/arm/mach-pxa/pxa95x.c delete mode 100644 trunk/arch/arm/mach-pxa/saarb.c delete mode 100644 trunk/arch/arm/mach-pxa/tavorevb3.c delete mode 100644 trunk/arch/arm/mach-vt8500/include/mach/hardware.h delete mode 100644 trunk/arch/arm/mach-vt8500/include/mach/i8042.h delete mode 100644 trunk/arch/arm/mach-vt8500/include/mach/restart.h delete mode 100644 trunk/arch/arm/mach-zynq/include/mach/clkdev.h delete mode 100644 trunk/arch/arm/plat-mxc/Kconfig delete mode 100644 trunk/arch/arm/plat-mxc/Makefile delete mode 100644 trunk/arch/arm/plat-mxc/include/mach/irqs.h delete mode 100644 trunk/arch/arm/plat-mxc/include/mach/timex.h delete mode 100644 trunk/arch/arm/plat-mxc/include/mach/uncompress.h delete mode 100644 trunk/arch/arm/plat-omap/clock.c delete mode 100644 trunk/arch/arm/plat-omap/common.c rename trunk/arch/arm/plat-omap/include/{plat/dma.h => plat-omap/dma-omap.h} (60%) delete mode 100644 trunk/arch/arm/plat-omap/include/plat/clkdev_omap.h delete mode 100644 trunk/arch/arm/plat-omap/include/plat/clock.h delete mode 100644 trunk/arch/arm/plat-omap/include/plat/common.h create mode 100644 trunk/arch/arm/plat-omap/include/plat/counter-32k.h rename trunk/arch/arm/{mach-omap2 => plat-omap/include/plat}/debug-devices.h (54%) delete mode 100644 trunk/arch/arm/plat-omap/include/plat/dma-44xx.h delete mode 100644 trunk/arch/arm/plat-omap/include/plat/fpga.h delete mode 100644 trunk/arch/arm/plat-omap/include/plat/multi.h delete mode 100644 trunk/arch/arm/plat-omap/include/plat/omap-secure.h delete mode 100644 trunk/arch/arm/plat-omap/include/plat/prcm.h delete mode 100644 trunk/arch/arm/plat-omap/include/plat/sdrc.h delete mode 100644 trunk/arch/arm/plat-omap/include/plat/uncompress.h delete mode 100644 trunk/arch/arm/plat-omap/include/plat/usb.h delete mode 100644 trunk/arch/arm/plat-omap/sram.h create mode 100644 trunk/drivers/mfd/omap-usb.h rename trunk/{arch/arm/plat-mxc/include/mach/ipu.h => include/linux/dma/ipu-dma.h} (97%) rename trunk/{arch/arm/plat-omap/include/plat => include/linux/mfd}/menelaus.h (96%) rename trunk/{arch/arm/plat-omap/include/plat/led.h => include/linux/platform_data/leds-omap.h} (91%) rename trunk/{arch/arm/plat-omap/include/plat/mmc.h => include/linux/platform_data/mmc-omap.h} (80%) create mode 100644 trunk/include/linux/platform_data/omap-wd-timer.h create mode 100644 trunk/include/linux/platform_data/usb-omap.h rename trunk/{arch/arm/plat-omap/include/plat/vrfb.h => include/video/omapvrfb.h} (95%) diff --git a/[refs] b/[refs] index 476077ce570c..cd9c77377c90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7c9f47239e9bc2fdf30f51cf46249aeb79980d3 +refs/heads/master: d4819dc969d0544edd0d0b819a741f10059adcaa diff --git a/trunk/Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt b/trunk/Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt index f3cf43b66f7e..3614242e7732 100644 --- a/trunk/Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt +++ b/trunk/Documentation/devicetree/bindings/i2c/fsl-imx-i2c.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>; diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 59203e77ce9e..99199e63f349 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -797,7 +797,6 @@ L: linux-arm-kernel@lists.infradead.org (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 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index ade7e924bef5..d45ca1bf1de0 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -433,19 +433,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 @@ -937,7 +924,6 @@ config ARCH_OMAP select CLKSRC_MMIO select GENERIC_CLOCKEVENTS select HAVE_CLK - select NEED_MACH_GPIO_H help Support for TI's OMAP platform (OMAP1/2/3/4). @@ -959,7 +945,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 @@ -1058,7 +1043,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" @@ -1168,7 +1153,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. diff --git a/trunk/arch/arm/Kconfig.debug b/trunk/arch/arm/Kconfig.debug index b0f3857b3a4c..5566520686a5 100644 --- a/trunk/arch/arm/Kconfig.debug +++ b/trunk/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 diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile index 5f914fca911b..97252d86a701 100644 --- a/trunk/arch/arm/Makefile +++ b/trunk/arch/arm/Makefile @@ -196,10 +196,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 diff --git a/trunk/arch/arm/boot/compressed/Makefile b/trunk/arch/arm/boot/compressed/Makefile index a517153a13ea..537208f22e56 100644 --- a/trunk/arch/arm/boot/compressed/Makefile +++ b/trunk/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 diff --git a/trunk/arch/arm/boot/compressed/head-vt8500.S b/trunk/arch/arm/boot/compressed/head-vt8500.S deleted file mode 100644 index 1dc1e21a3be3..000000000000 --- a/trunk/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 - * - * VIA VT8500 specific tweaks. This is merged into head.S by the linker. - * - */ - -#include -#include - - .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: diff --git a/trunk/arch/arm/boot/dts/imx27.dtsi b/trunk/arch/arm/boot/dts/imx27.dtsi index 3e54f1498841..67d672792b0d 100644 --- a/trunk/arch/arm/boot/dts/imx27.dtsi +++ b/trunk/arch/arm/boot/dts/imx27.dtsi @@ -113,7 +113,7 @@ i2c1: i2c@10012000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,imx27-i2c", "fsl,imx1-i2c"; + compatible = "fsl,imx27-i2c", "fsl,imx21-i2c"; reg = <0x10012000 0x1000>; interrupts = <12>; status = "disabled"; @@ -205,7 +205,7 @@ i2c2: i2c@1001d000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,imx27-i2c", "fsl,imx1-i2c"; + compatible = "fsl,imx27-i2c", "fsl,imx21-i2c"; reg = <0x1001d000 0x1000>; interrupts = <1>; status = "disabled"; diff --git a/trunk/arch/arm/boot/dts/imx51.dtsi b/trunk/arch/arm/boot/dts/imx51.dtsi index 75d069fcf897..54aea74769a1 100644 --- a/trunk/arch/arm/boot/dts/imx51.dtsi +++ b/trunk/arch/arm/boot/dts/imx51.dtsi @@ -377,7 +377,7 @@ i2c@83fc4000 { /* I2C2 */ #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,imx51-i2c", "fsl,imx1-i2c"; + compatible = "fsl,imx51-i2c", "fsl,imx21-i2c"; reg = <0x83fc4000 0x4000>; interrupts = <63>; status = "disabled"; @@ -386,7 +386,7 @@ i2c@83fc8000 { /* I2C1 */ #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,imx51-i2c", "fsl,imx1-i2c"; + compatible = "fsl,imx51-i2c", "fsl,imx21-i2c"; reg = <0x83fc8000 0x4000>; interrupts = <62>; status = "disabled"; diff --git a/trunk/arch/arm/boot/dts/imx53.dtsi b/trunk/arch/arm/boot/dts/imx53.dtsi index 76ebb1ad2675..caf09ff73f10 100644 --- a/trunk/arch/arm/boot/dts/imx53.dtsi +++ b/trunk/arch/arm/boot/dts/imx53.dtsi @@ -432,7 +432,7 @@ i2c@53fec000 { /* I2C3 */ #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,imx53-i2c", "fsl,imx1-i2c"; + compatible = "fsl,imx53-i2c", "fsl,imx21-i2c"; reg = <0x53fec000 0x4000>; interrupts = <64>; status = "disabled"; @@ -488,7 +488,7 @@ i2c@63fc4000 { /* I2C2 */ #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,imx53-i2c", "fsl,imx1-i2c"; + compatible = "fsl,imx53-i2c", "fsl,imx21-i2c"; reg = <0x63fc4000 0x4000>; interrupts = <63>; status = "disabled"; @@ -497,7 +497,7 @@ i2c@63fc8000 { /* I2C1 */ #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,imx53-i2c", "fsl,imx1-i2c"; + compatible = "fsl,imx53-i2c", "fsl,imx21-i2c"; reg = <0x63fc8000 0x4000>; interrupts = <62>; status = "disabled"; diff --git a/trunk/arch/arm/boot/dts/imx6q.dtsi b/trunk/arch/arm/boot/dts/imx6q.dtsi index f3990b04fecf..f604a44a5c66 100644 --- a/trunk/arch/arm/boot/dts/imx6q.dtsi +++ b/trunk/arch/arm/boot/dts/imx6q.dtsi @@ -882,7 +882,7 @@ i2c@021a0000 { /* I2C1 */ #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,imx6q-i2c", "fsl,imx1-i2c"; + compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c"; reg = <0x021a0000 0x4000>; interrupts = <0 36 0x04>; clocks = <&clks 125>; @@ -892,7 +892,7 @@ i2c@021a4000 { /* I2C2 */ #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,imx6q-i2c", "fsl,imx1-i2c"; + compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c"; reg = <0x021a4000 0x4000>; interrupts = <0 37 0x04>; clocks = <&clks 126>; @@ -902,7 +902,7 @@ i2c@021a8000 { /* I2C3 */ #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,imx6q-i2c", "fsl,imx1-i2c"; + compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c"; reg = <0x021a8000 0x4000>; interrupts = <0 38 0x04>; clocks = <&clks 127>; diff --git a/trunk/arch/arm/boot/dts/zynq-ep107.dts b/trunk/arch/arm/boot/dts/zynq-ep107.dts index 37ca192fb193..574bc044f572 100644 --- a/trunk/arch/arm/boot/dts/zynq-ep107.dts +++ b/trunk/arch/arm/boot/dts/zynq-ep107.dts @@ -36,16 +36,27 @@ ranges; intc: interrupt-controller@f8f01000 { + compatible = "arm,cortex-a9-gic"; + #interrupt-cells = <3>; + #address-cells = <1>; interrupt-controller; - compatible = "arm,gic"; - reg = <0xF8F01000 0x1000>; - #interrupt-cells = <2>; + reg = <0xF8F01000 0x1000>, + <0xF8F00100 0x100>; + }; + + L2: cache-controller { + compatible = "arm,pl310-cache"; + reg = <0xF8F02000 0x1000>; + arm,data-latency = <2 3 2>; + arm,tag-latency = <2 3 2>; + cache-unified; + cache-level = <2>; }; uart0: uart@e0000000 { compatible = "xlnx,xuartps"; reg = <0xE0000000 0x1000>; - interrupts = <59 0>; + interrupts = <0 27 4>; clock = <50000000>; }; }; diff --git a/trunk/arch/arm/configs/imx_v4_v5_defconfig b/trunk/arch/arm/configs/imx_v4_v5_defconfig index 78ed575feb1a..f71302c3ac33 100644 --- a/trunk/arch/arm/configs/imx_v4_v5_defconfig +++ b/trunk/arch/arm/configs/imx_v4_v5_defconfig @@ -18,7 +18,9 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_MXC=y -CONFIG_ARCH_IMX_V4_V5=y +CONFIG_ARCH_MULTI_V4T=y +CONFIG_ARCH_MULTI_V5=y +# CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_MX1ADS=y CONFIG_MACH_SCB9328=y CONFIG_MACH_APF9328=y diff --git a/trunk/arch/arm/configs/imx_v6_v7_defconfig b/trunk/arch/arm/configs/imx_v6_v7_defconfig index 394ded624e37..44f117aab52c 100644 --- a/trunk/arch/arm/configs/imx_v6_v7_defconfig +++ b/trunk/arch/arm/configs/imx_v6_v7_defconfig @@ -17,6 +17,8 @@ CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_BLK_DEV_BSG is not set CONFIG_ARCH_MXC=y +CONFIG_ARCH_MULTI_V6=y +CONFIG_ARCH_MULTI_V7=y CONFIG_MACH_MX31LILLY=y CONFIG_MACH_MX31LITE=y CONFIG_MACH_PCM037=y diff --git a/trunk/arch/arm/include/asm/dma-mapping.h b/trunk/arch/arm/include/asm/dma-mapping.h index 23004847bb05..8ea02ac3ec1a 100644 --- a/trunk/arch/arm/include/asm/dma-mapping.h +++ b/trunk/arch/arm/include/asm/dma-mapping.h @@ -210,13 +210,6 @@ static inline void dma_free_writecombine(struct device *dev, size_t size, */ extern void __init init_dma_coherent_pool_size(unsigned long size); -/* - * This can be called during boot to increase the size of the consistent - * DMA region above it's default value of 2MB. It must be called before the - * memory allocator is initialised, i.e. before any core_initcall. - */ -static inline void init_consistent_dma_size(unsigned long size) { } - /* * For SA-1111, IXP425, and ADI systems the dma-mapping functions are "magic" * and utilize bounce buffers as needed to work around limited DMA windows. diff --git a/trunk/arch/arm/plat-mxc/include/mach/debug-macro.S b/trunk/arch/arm/include/debug/imx.S similarity index 59% rename from trunk/arch/arm/plat-mxc/include/mach/debug-macro.S rename to trunk/arch/arm/include/debug/imx.S index 761e45f9456f..0b65d792f664 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/debug-macro.S +++ b/trunk/arch/arm/include/debug/imx.S @@ -10,27 +10,38 @@ * published by the Free Software Foundation. * */ -#include - #ifdef CONFIG_DEBUG_IMX1_UART -#define UART_PADDR MX1_UART1_BASE_ADDR +#define UART_PADDR 0x00206000 #elif defined (CONFIG_DEBUG_IMX25_UART) -#define UART_PADDR MX25_UART1_BASE_ADDR +#define UART_PADDR 0x43f90000 #elif defined (CONFIG_DEBUG_IMX21_IMX27_UART) -#define UART_PADDR MX2x_UART1_BASE_ADDR +#define UART_PADDR 0x1000a000 #elif defined (CONFIG_DEBUG_IMX31_IMX35_UART) -#define UART_PADDR MX3x_UART1_BASE_ADDR +#define UART_PADDR 0x43f90000 #elif defined (CONFIG_DEBUG_IMX51_UART) -#define UART_PADDR MX51_UART1_BASE_ADDR +#define UART_PADDR 0x73fbc000 #elif defined (CONFIG_DEBUG_IMX50_IMX53_UART) -#define UART_PADDR MX53_UART1_BASE_ADDR +#define UART_PADDR 0x53fbc000 #elif defined (CONFIG_DEBUG_IMX6Q_UART2) -#define UART_PADDR MX6Q_UART2_BASE_ADDR +#define UART_PADDR 0x021e8000 #elif defined (CONFIG_DEBUG_IMX6Q_UART4) -#define UART_PADDR MX6Q_UART4_BASE_ADDR +#define UART_PADDR 0x021f0000 #endif -#define UART_VADDR IMX_IO_ADDRESS(UART_PADDR) +/* + * FIXME: This is a copy of IMX_IO_P2V in hardware.h, and needs to + * stay sync with that. It's hard to maintain, and should be fixed + * globally for multi-platform build to use a fixed virtual address + * for low-level debug uart port across platforms. + */ +#define IMX_IO_P2V(x) ( \ + (((x) & 0x80000000) >> 7) | \ + (0xf4000000 + \ + (((x) & 0x50000000) >> 6) + \ + (((x) & 0x0b000000) >> 4) + \ + (((x) & 0x000fffff)))) + +#define UART_VADDR IMX_IO_P2V(UART_PADDR) .macro addruart, rp, rv, tmp ldr \rp, =UART_PADDR @ physical diff --git a/trunk/arch/arm/mach-at91/at91sam9g45.c b/trunk/arch/arm/mach-at91/at91sam9g45.c index 84af1b506d92..b7ae124c16e5 100644 --- a/trunk/arch/arm/mach-at91/at91sam9g45.c +++ b/trunk/arch/arm/mach-at91/at91sam9g45.c @@ -343,7 +343,6 @@ static struct at91_gpio_bank at91sam9g45_gpio[] __initdata = { static void __init at91sam9g45_map_io(void) { at91_init_sram(0, AT91SAM9G45_SRAM_BASE, AT91SAM9G45_SRAM_SIZE); - init_consistent_dma_size(SZ_4M); } static void __init at91sam9g45_ioremap_registers(void) diff --git a/trunk/arch/arm/mach-davinci/board-dm646x-evm.c b/trunk/arch/arm/mach-davinci/board-dm646x-evm.c index 1dbf85beed1b..9211e8800c79 100644 --- a/trunk/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/trunk/arch/arm/mach-davinci/board-dm646x-evm.c @@ -194,7 +194,7 @@ static int evm_led_setup(struct i2c_client *client, int gpio, while (ngpio--) { leds->gpio = gpio++; leds++; - }; + } evm_led_dev = platform_device_alloc("leds-gpio", 0); platform_device_add_data(evm_led_dev, &evm_led_data, diff --git a/trunk/arch/arm/mach-davinci/common.c b/trunk/arch/arm/mach-davinci/common.c index 64b0f65a8639..a794f6d9d444 100644 --- a/trunk/arch/arm/mach-davinci/common.c +++ b/trunk/arch/arm/mach-davinci/common.c @@ -87,8 +87,6 @@ void __init davinci_common_init(struct davinci_soc_info *soc_info) iotable_init(davinci_soc_info.io_desc, davinci_soc_info.io_desc_num); - init_consistent_dma_size(14 << 20); - /* * Normally devicemaps_init() would flush caches and tlb after * mdesc->map_io(), but we must also do it here because of the CPU diff --git a/trunk/arch/arm/mach-davinci/usb.c b/trunk/arch/arm/mach-davinci/usb.c index f77b95336e2b..34509ffba221 100644 --- a/trunk/arch/arm/mach-davinci/usb.c +++ b/trunk/arch/arm/mach-davinci/usb.c @@ -42,14 +42,8 @@ static struct musb_hdrc_config musb_config = { }; static struct musb_hdrc_platform_data usb_data = { -#if defined(CONFIG_USB_MUSB_OTG) /* OTG requires a Mini-AB connector */ .mode = MUSB_OTG, -#elif defined(CONFIG_USB_MUSB_PERIPHERAL) - .mode = MUSB_PERIPHERAL, -#elif defined(CONFIG_USB_MUSB_HOST) - .mode = MUSB_HOST, -#endif .clock = "usb", .config = &musb_config, }; diff --git a/trunk/arch/arm/plat-mxc/3ds_debugboard.c b/trunk/arch/arm/mach-imx/3ds_debugboard.c similarity index 99% rename from trunk/arch/arm/plat-mxc/3ds_debugboard.c rename to trunk/arch/arm/mach-imx/3ds_debugboard.c index 5c10ad05df74..134377352966 100644 --- a/trunk/arch/arm/plat-mxc/3ds_debugboard.c +++ b/trunk/arch/arm/mach-imx/3ds_debugboard.c @@ -21,7 +21,7 @@ #include #include -#include +#include "hardware.h" /* LAN9217 ethernet base address */ #define LAN9217_BASE_ADDR(n) (n + 0x0) diff --git a/trunk/arch/arm/plat-mxc/include/mach/3ds_debugboard.h b/trunk/arch/arm/mach-imx/3ds_debugboard.h similarity index 100% rename from trunk/arch/arm/plat-mxc/include/mach/3ds_debugboard.h rename to trunk/arch/arm/mach-imx/3ds_debugboard.h diff --git a/trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-imx/Kconfig index 8d276584650e..f1bf610e2900 100644 --- a/trunk/arch/arm/mach-imx/Kconfig +++ b/trunk/arch/arm/mach-imx/Kconfig @@ -1,3 +1,70 @@ +config ARCH_MXC + bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 + select ARCH_REQUIRE_GPIOLIB + select ARM_PATCH_PHYS_VIRT + select AUTO_ZRELADDR if !ZBOOT_ROM + 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 + +menu "Freescale i.MX support" + depends on ARCH_MXC + +config MXC_IRQ_PRIOR + bool "Use IRQ priority" + help + Select this if you want to use prioritized IRQ handling. + This feature prevents higher priority ISR to be interrupted + by lower priority IRQ even IRQF_DISABLED flag is not set. + This may be useful in embedded applications, where are strong + requirements for timing. + Say N here, unless you have a specialized requirement. + +config MXC_TZIC + bool + +config MXC_AVIC + bool + +config MXC_DEBUG_BOARD + bool "Enable MXC debug board(for 3-stack)" + help + The debug board is an integral part of the MXC 3-stack(PDK) + platforms, it can be attached or removed from the peripheral + board. On debug board, several debug devices(ethernet, UART, + buttons, LEDs and JTAG) are implemented. Between the MCU and + these devices, a CPLD is added as a bridge which performs + data/address de-multiplexing and decode, signal level shift, + interrupt control and various board functions. + +config HAVE_EPIT + bool + +config MXC_USE_EPIT + bool "Use EPIT instead of GPT" + depends on HAVE_EPIT + help + Use EPIT as the system timer on systems that have it. Normally you + don't have a reason to do so as the EPIT has the same features and + uses the same clocks as the GPT. Anyway, on some systems the GPT + may be in use for other purposes. + +config MXC_ULPI + bool + +config ARCH_HAS_RNGA + bool + +config IRAM_ALLOC + bool + select GENERIC_ALLOCATOR + config HAVE_IMX_GPC bool @@ -5,6 +72,12 @@ config HAVE_IMX_MMDC bool config HAVE_IMX_SRC + def_bool y if SMP + +config IMX_HAVE_IOMUX_V1 + bool + +config ARCH_MXC_IOMUX_V3 bool config ARCH_MX1 @@ -104,7 +177,7 @@ config SOC_IMX51 select PINCTRL_IMX51 select SOC_IMX5 -if ARCH_IMX_V4_V5 +if ARCH_MULTI_V4T comment "MX1 platforms:" config MACH_MXLADS @@ -133,6 +206,10 @@ config MACH_APF9328 help Say Yes here if you are using the Armadeus APF9328 development board +endif + +if ARCH_MULTI_V5 + comment "MX21 platforms:" config MACH_MX21ADS @@ -384,7 +461,7 @@ config MACH_IMX27_DT endif -if ARCH_IMX_V6_V7 +if ARCH_MULTI_V6 comment "MX31 platforms:" @@ -649,6 +726,10 @@ config MACH_VPR200 Include support for VPR200 platform. This includes specific configurations for the board and its peripherals. +endif + +if ARCH_MULTI_V7 + comment "i.MX5 platforms:" config MACH_MX50_RDP @@ -756,7 +837,6 @@ config SOC_IMX6Q select HAVE_CAN_FLEXCAN if CAN select HAVE_IMX_GPC select HAVE_IMX_MMDC - select HAVE_IMX_SRC select HAVE_SMP select MFD_SYSCON select PINCTRL @@ -766,3 +846,7 @@ config SOC_IMX6Q This enables support for Freescale i.MX6 Quad processor. endif + +source "arch/arm/mach-imx/devices/Kconfig" + +endmenu diff --git a/trunk/arch/arm/mach-imx/Makefile b/trunk/arch/arm/mach-imx/Makefile index 895754aeb4f3..fe47b71469c9 100644 --- a/trunk/arch/arm/mach-imx/Makefile +++ b/trunk/arch/arm/mach-imx/Makefile @@ -1,3 +1,5 @@ +obj-y := time.o cpu.o system.o irq-common.o + obj-$(CONFIG_SOC_IMX1) += clk-imx1.o mm-imx1.o obj-$(CONFIG_SOC_IMX21) += clk-imx21.o mm-imx21.o @@ -15,6 +17,24 @@ obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o $(i obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \ clk-pfd.o clk-busy.o clk.o +obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o +obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o + +obj-$(CONFIG_MXC_TZIC) += tzic.o +obj-$(CONFIG_MXC_AVIC) += avic.o + +obj-$(CONFIG_IRAM_ALLOC) += iram_alloc.o +obj-$(CONFIG_MXC_ULPI) += ulpi.o +obj-$(CONFIG_MXC_USE_EPIT) += epit.o +obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o +obj-$(CONFIG_CPU_FREQ_IMX) += cpufreq.o +obj-$(CONFIG_CPU_IDLE) += cpuidle.o + +ifdef CONFIG_SND_IMX_SOC +obj-y += ssi-fiq.o +obj-y += ssi-fiq-ksym.o +endif + # Support for CMOS sensor interface obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o @@ -89,3 +109,5 @@ obj-$(CONFIG_MACH_MX50_RDP) += mach-mx50_rdp.o obj-$(CONFIG_MACH_IMX51_DT) += imx51-dt.o obj-$(CONFIG_SOC_IMX53) += mach-imx53.o + +obj-y += devices/ diff --git a/trunk/arch/arm/plat-mxc/avic.c b/trunk/arch/arm/mach-imx/avic.c similarity index 98% rename from trunk/arch/arm/plat-mxc/avic.c rename to trunk/arch/arm/mach-imx/avic.c index cbd55c36def3..0eff23ed92b9 100644 --- a/trunk/arch/arm/plat-mxc/avic.c +++ b/trunk/arch/arm/mach-imx/avic.c @@ -22,12 +22,11 @@ #include #include #include -#include #include #include -#include -#include +#include "common.h" +#include "hardware.h" #include "irq-common.h" #define AVIC_INTCNTL 0x00 /* int control reg */ diff --git a/trunk/arch/arm/plat-mxc/include/mach/board-mx31lilly.h b/trunk/arch/arm/mach-imx/board-mx31lilly.h similarity index 100% rename from trunk/arch/arm/plat-mxc/include/mach/board-mx31lilly.h rename to trunk/arch/arm/mach-imx/board-mx31lilly.h diff --git a/trunk/arch/arm/plat-mxc/include/mach/board-mx31lite.h b/trunk/arch/arm/mach-imx/board-mx31lite.h similarity index 100% rename from trunk/arch/arm/plat-mxc/include/mach/board-mx31lite.h rename to trunk/arch/arm/mach-imx/board-mx31lite.h diff --git a/trunk/arch/arm/plat-mxc/include/mach/board-mx31moboard.h b/trunk/arch/arm/mach-imx/board-mx31moboard.h similarity index 100% rename from trunk/arch/arm/plat-mxc/include/mach/board-mx31moboard.h rename to trunk/arch/arm/mach-imx/board-mx31moboard.h diff --git a/trunk/arch/arm/plat-mxc/include/mach/board-pcm038.h b/trunk/arch/arm/mach-imx/board-pcm038.h similarity index 100% rename from trunk/arch/arm/plat-mxc/include/mach/board-pcm038.h rename to trunk/arch/arm/mach-imx/board-pcm038.h diff --git a/trunk/arch/arm/mach-imx/clk-imx1.c b/trunk/arch/arm/mach-imx/clk-imx1.c index 516ddee1948e..15f9d223cf0b 100644 --- a/trunk/arch/arm/mach-imx/clk-imx1.c +++ b/trunk/arch/arm/mach-imx/clk-imx1.c @@ -22,9 +22,9 @@ #include #include -#include -#include #include "clk.h" +#include "common.h" +#include "hardware.h" /* CCM register addresses */ #define IO_ADDR_CCM(off) (MX1_IO_ADDRESS(MX1_CCM_BASE_ADDR + (off))) @@ -82,7 +82,8 @@ int __init mx1_clocks_init(unsigned long fref) pr_err("imx1 clk %d: register failed with %ld\n", i, PTR_ERR(clk[i])); - clk_register_clkdev(clk[dma_gate], "ahb", "imx-dma"); + clk_register_clkdev(clk[dma_gate], "ahb", "imx1-dma"); + clk_register_clkdev(clk[hclk], "ipg", "imx1-dma"); clk_register_clkdev(clk[csi_gate], NULL, "mx1-camera.0"); clk_register_clkdev(clk[mma_gate], "mma", NULL); clk_register_clkdev(clk[usbd_gate], NULL, "imx_udc.0"); @@ -94,18 +95,18 @@ int __init mx1_clocks_init(unsigned long fref) clk_register_clkdev(clk[hclk], "ipg", "imx1-uart.1"); clk_register_clkdev(clk[per1], "per", "imx1-uart.2"); clk_register_clkdev(clk[hclk], "ipg", "imx1-uart.2"); - clk_register_clkdev(clk[hclk], NULL, "imx-i2c.0"); + clk_register_clkdev(clk[hclk], NULL, "imx1-i2c.0"); clk_register_clkdev(clk[per2], "per", "imx1-cspi.0"); clk_register_clkdev(clk[dummy], "ipg", "imx1-cspi.0"); clk_register_clkdev(clk[per2], "per", "imx1-cspi.1"); clk_register_clkdev(clk[dummy], "ipg", "imx1-cspi.1"); clk_register_clkdev(clk[per2], NULL, "imx-mmc.0"); - clk_register_clkdev(clk[per2], "per", "imx-fb.0"); - clk_register_clkdev(clk[dummy], "ipg", "imx-fb.0"); - clk_register_clkdev(clk[dummy], "ahb", "imx-fb.0"); + clk_register_clkdev(clk[per2], "per", "imx1-fb.0"); + clk_register_clkdev(clk[dummy], "ipg", "imx1-fb.0"); + clk_register_clkdev(clk[dummy], "ahb", "imx1-fb.0"); clk_register_clkdev(clk[hclk], "mshc", NULL); clk_register_clkdev(clk[per3], "ssi", NULL); - clk_register_clkdev(clk[clk32], NULL, "mxc_rtc.0"); + clk_register_clkdev(clk[clk32], NULL, "imx1-rtc.0"); clk_register_clkdev(clk[clko], "clko", NULL); mxc_timer_init(MX1_IO_ADDRESS(MX1_TIM1_BASE_ADDR), MX1_TIM1_INT); diff --git a/trunk/arch/arm/mach-imx/clk-imx21.c b/trunk/arch/arm/mach-imx/clk-imx21.c index cf65148bc519..d7ed66091a2a 100644 --- a/trunk/arch/arm/mach-imx/clk-imx21.c +++ b/trunk/arch/arm/mach-imx/clk-imx21.c @@ -25,9 +25,9 @@ #include #include -#include -#include #include "clk.h" +#include "common.h" +#include "hardware.h" #define IO_ADDR_CCM(off) (MX21_IO_ADDRESS(MX21_CCM_BASE_ADDR + (off))) @@ -156,16 +156,16 @@ int __init mx21_clocks_init(unsigned long lref, unsigned long href) clk_register_clkdev(clk[cspi2_ipg_gate], "ipg", "imx21-cspi.1"); clk_register_clkdev(clk[per2], "per", "imx21-cspi.2"); clk_register_clkdev(clk[cspi3_ipg_gate], "ipg", "imx21-cspi.2"); - clk_register_clkdev(clk[per3], "per", "imx-fb.0"); - clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx-fb.0"); - clk_register_clkdev(clk[lcdc_hclk_gate], "ahb", "imx-fb.0"); + clk_register_clkdev(clk[per3], "per", "imx21-fb.0"); + clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx21-fb.0"); + clk_register_clkdev(clk[lcdc_hclk_gate], "ahb", "imx21-fb.0"); clk_register_clkdev(clk[usb_gate], "per", "imx21-hcd.0"); clk_register_clkdev(clk[usb_hclk_gate], "ahb", "imx21-hcd.0"); - clk_register_clkdev(clk[nfc_gate], NULL, "mxc_nand.0"); - clk_register_clkdev(clk[dma_hclk_gate], "ahb", "imx-dma"); - clk_register_clkdev(clk[dma_gate], "ipg", "imx-dma"); + clk_register_clkdev(clk[nfc_gate], NULL, "imx21-nand.0"); + clk_register_clkdev(clk[dma_hclk_gate], "ahb", "imx21-dma"); + clk_register_clkdev(clk[dma_gate], "ipg", "imx21-dma"); clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0"); - clk_register_clkdev(clk[i2c_gate], NULL, "imx-i2c.0"); + clk_register_clkdev(clk[i2c_gate], NULL, "imx21-i2c.0"); clk_register_clkdev(clk[kpp_gate], NULL, "mxc-keypad"); clk_register_clkdev(clk[owire_gate], NULL, "mxc_w1.0"); clk_register_clkdev(clk[brom_gate], "brom", NULL); diff --git a/trunk/arch/arm/mach-imx/clk-imx25.c b/trunk/arch/arm/mach-imx/clk-imx25.c index 01e2f843bf2e..bc885801cd68 100644 --- a/trunk/arch/arm/mach-imx/clk-imx25.c +++ b/trunk/arch/arm/mach-imx/clk-imx25.c @@ -24,10 +24,10 @@ #include #include -#include -#include -#include #include "clk.h" +#include "common.h" +#include "hardware.h" +#include "mx25.h" #define CRM_BASE MX25_IO_ADDRESS(MX25_CRM_BASE_ADDR) @@ -197,7 +197,7 @@ int __init mx25_clocks_init(void) clk_register_clkdev(clk[ipg], "ipg", "fsl-usb2-udc"); clk_register_clkdev(clk[usbotg_ahb], "ahb", "fsl-usb2-udc"); clk_register_clkdev(clk[usb_div], "per", "fsl-usb2-udc"); - clk_register_clkdev(clk[nfc_ipg_per], NULL, "mxc_nand.0"); + clk_register_clkdev(clk[nfc_ipg_per], NULL, "imx25-nand.0"); /* i.mx25 has the i.mx35 type cspi */ clk_register_clkdev(clk[cspi1_ipg], NULL, "imx35-cspi.0"); clk_register_clkdev(clk[cspi2_ipg], NULL, "imx35-cspi.1"); @@ -212,15 +212,15 @@ int __init mx25_clocks_init(void) clk_register_clkdev(clk[per10], "per", "mxc_pwm.3"); clk_register_clkdev(clk[kpp_ipg], NULL, "imx-keypad"); clk_register_clkdev(clk[tsc_ipg], NULL, "mx25-adc"); - clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx-i2c.0"); - clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx-i2c.1"); - clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx-i2c.2"); + clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx21-i2c.0"); + clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx21-i2c.1"); + clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx21-i2c.2"); clk_register_clkdev(clk[fec_ipg], "ipg", "imx25-fec.0"); clk_register_clkdev(clk[fec_ahb], "ahb", "imx25-fec.0"); clk_register_clkdev(clk[dryice_ipg], NULL, "imxdi_rtc.0"); - clk_register_clkdev(clk[lcdc_ipg_per], "per", "imx-fb.0"); - clk_register_clkdev(clk[lcdc_ipg], "ipg", "imx-fb.0"); - clk_register_clkdev(clk[lcdc_ahb], "ahb", "imx-fb.0"); + clk_register_clkdev(clk[lcdc_ipg_per], "per", "imx21-fb.0"); + clk_register_clkdev(clk[lcdc_ipg], "ipg", "imx21-fb.0"); + clk_register_clkdev(clk[lcdc_ahb], "ahb", "imx21-fb.0"); clk_register_clkdev(clk[wdt_ipg], NULL, "imx2-wdt.0"); clk_register_clkdev(clk[ssi1_ipg], NULL, "imx-ssi.0"); clk_register_clkdev(clk[ssi2_ipg], NULL, "imx-ssi.1"); @@ -230,9 +230,9 @@ int __init mx25_clocks_init(void) clk_register_clkdev(clk[esdhc2_ipg_per], "per", "sdhci-esdhc-imx25.1"); clk_register_clkdev(clk[esdhc2_ipg], "ipg", "sdhci-esdhc-imx25.1"); clk_register_clkdev(clk[esdhc2_ahb], "ahb", "sdhci-esdhc-imx25.1"); - clk_register_clkdev(clk[csi_ipg_per], "per", "mx2-camera.0"); - clk_register_clkdev(clk[csi_ipg], "ipg", "mx2-camera.0"); - clk_register_clkdev(clk[csi_ahb], "ahb", "mx2-camera.0"); + clk_register_clkdev(clk[csi_ipg_per], "per", "imx25-camera.0"); + clk_register_clkdev(clk[csi_ipg], "ipg", "imx25-camera.0"); + clk_register_clkdev(clk[csi_ahb], "ahb", "imx25-camera.0"); clk_register_clkdev(clk[dummy], "audmux", NULL); clk_register_clkdev(clk[can1_ipg], NULL, "flexcan.0"); clk_register_clkdev(clk[can2_ipg], NULL, "flexcan.1"); diff --git a/trunk/arch/arm/mach-imx/clk-imx27.c b/trunk/arch/arm/mach-imx/clk-imx27.c index 366e5d59d886..585ab256c58f 100644 --- a/trunk/arch/arm/mach-imx/clk-imx27.c +++ b/trunk/arch/arm/mach-imx/clk-imx27.c @@ -6,9 +6,9 @@ #include #include -#include -#include #include "clk.h" +#include "common.h" +#include "hardware.h" #define IO_ADDR_CCM(off) (MX27_IO_ADDRESS(MX27_CCM_BASE_ADDR + (off))) @@ -211,19 +211,19 @@ int __init mx27_clocks_init(unsigned long fref) clk_register_clkdev(clk[gpt6_ipg_gate], "ipg", "imx-gpt.5"); clk_register_clkdev(clk[per1_gate], "per", "imx-gpt.5"); clk_register_clkdev(clk[pwm_ipg_gate], NULL, "mxc_pwm.0"); - clk_register_clkdev(clk[per2_gate], "per", "mxc-mmc.0"); - clk_register_clkdev(clk[sdhc1_ipg_gate], "ipg", "mxc-mmc.0"); - clk_register_clkdev(clk[per2_gate], "per", "mxc-mmc.1"); - clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "mxc-mmc.1"); - clk_register_clkdev(clk[per2_gate], "per", "mxc-mmc.2"); - clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "mxc-mmc.2"); + clk_register_clkdev(clk[per2_gate], "per", "imx21-mmc.0"); + clk_register_clkdev(clk[sdhc1_ipg_gate], "ipg", "imx21-mmc.0"); + clk_register_clkdev(clk[per2_gate], "per", "imx21-mmc.1"); + clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "imx21-mmc.1"); + clk_register_clkdev(clk[per2_gate], "per", "imx21-mmc.2"); + clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "imx21-mmc.2"); clk_register_clkdev(clk[cspi1_ipg_gate], NULL, "imx27-cspi.0"); clk_register_clkdev(clk[cspi2_ipg_gate], NULL, "imx27-cspi.1"); clk_register_clkdev(clk[cspi3_ipg_gate], NULL, "imx27-cspi.2"); - clk_register_clkdev(clk[per3_gate], "per", "imx-fb.0"); - clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx-fb.0"); - clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx-fb.0"); - clk_register_clkdev(clk[csi_ahb_gate], "ahb", "mx2-camera.0"); + clk_register_clkdev(clk[per3_gate], "per", "imx21-fb.0"); + clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx21-fb.0"); + clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx21-fb.0"); + clk_register_clkdev(clk[csi_ahb_gate], "ahb", "imx27-camera.0"); clk_register_clkdev(clk[usb_div], "per", "fsl-usb2-udc"); clk_register_clkdev(clk[usb_ipg_gate], "ipg", "fsl-usb2-udc"); clk_register_clkdev(clk[usb_ahb_gate], "ahb", "fsl-usb2-udc"); @@ -238,27 +238,27 @@ int __init mx27_clocks_init(unsigned long fref) clk_register_clkdev(clk[usb_ahb_gate], "ahb", "mxc-ehci.2"); clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "imx-ssi.0"); clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "imx-ssi.1"); - clk_register_clkdev(clk[nfc_baud_gate], NULL, "mxc_nand.0"); + clk_register_clkdev(clk[nfc_baud_gate], NULL, "imx27-nand.0"); clk_register_clkdev(clk[vpu_baud_gate], "per", "coda-imx27.0"); clk_register_clkdev(clk[vpu_ahb_gate], "ahb", "coda-imx27.0"); - clk_register_clkdev(clk[dma_ahb_gate], "ahb", "imx-dma"); - clk_register_clkdev(clk[dma_ipg_gate], "ipg", "imx-dma"); + clk_register_clkdev(clk[dma_ahb_gate], "ahb", "imx27-dma"); + clk_register_clkdev(clk[dma_ipg_gate], "ipg", "imx27-dma"); clk_register_clkdev(clk[fec_ipg_gate], "ipg", "imx27-fec.0"); clk_register_clkdev(clk[fec_ahb_gate], "ahb", "imx27-fec.0"); clk_register_clkdev(clk[wdog_ipg_gate], NULL, "imx2-wdt.0"); - clk_register_clkdev(clk[i2c1_ipg_gate], NULL, "imx-i2c.0"); - clk_register_clkdev(clk[i2c2_ipg_gate], NULL, "imx-i2c.1"); + clk_register_clkdev(clk[i2c1_ipg_gate], NULL, "imx21-i2c.0"); + clk_register_clkdev(clk[i2c2_ipg_gate], NULL, "imx21-i2c.1"); clk_register_clkdev(clk[owire_ipg_gate], NULL, "mxc_w1.0"); clk_register_clkdev(clk[kpp_ipg_gate], NULL, "imx-keypad"); - clk_register_clkdev(clk[emma_ahb_gate], "emma-ahb", "mx2-camera.0"); - clk_register_clkdev(clk[emma_ipg_gate], "emma-ipg", "mx2-camera.0"); + clk_register_clkdev(clk[emma_ahb_gate], "emma-ahb", "imx27-camera.0"); + clk_register_clkdev(clk[emma_ipg_gate], "emma-ipg", "imx27-camera.0"); clk_register_clkdev(clk[emma_ahb_gate], "ahb", "m2m-emmaprp.0"); clk_register_clkdev(clk[emma_ipg_gate], "ipg", "m2m-emmaprp.0"); clk_register_clkdev(clk[iim_ipg_gate], "iim", NULL); clk_register_clkdev(clk[gpio_ipg_gate], "gpio", NULL); clk_register_clkdev(clk[brom_ahb_gate], "brom", NULL); clk_register_clkdev(clk[ata_ahb_gate], "ata", NULL); - clk_register_clkdev(clk[rtc_ipg_gate], NULL, "mxc_rtc"); + clk_register_clkdev(clk[rtc_ipg_gate], NULL, "imx21-rtc"); clk_register_clkdev(clk[scc_ipg_gate], "scc", NULL); clk_register_clkdev(clk[cpu_div], "cpu", NULL); clk_register_clkdev(clk[emi_ahb_gate], "emi_ahb" , NULL); diff --git a/trunk/arch/arm/mach-imx/clk-imx31.c b/trunk/arch/arm/mach-imx/clk-imx31.c index 1253af2d9971..8be64e0a4ace 100644 --- a/trunk/arch/arm/mach-imx/clk-imx31.c +++ b/trunk/arch/arm/mach-imx/clk-imx31.c @@ -22,12 +22,11 @@ #include #include -#include -#include -#include - #include "clk.h" +#include "common.h" #include "crmregs-imx3.h" +#include "hardware.h" +#include "mx31.h" static const char *mcu_main_sel[] = { "spll", "mpll", }; static const char *per_sel[] = { "per_div", "ipg", }; @@ -124,10 +123,10 @@ int __init mx31_clocks_init(unsigned long fref) clk_register_clkdev(clk[cspi3_gate], NULL, "imx31-cspi.2"); clk_register_clkdev(clk[pwm_gate], "pwm", NULL); clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0"); - clk_register_clkdev(clk[rtc_gate], NULL, "mxc_rtc"); + clk_register_clkdev(clk[rtc_gate], NULL, "imx21-rtc"); clk_register_clkdev(clk[epit1_gate], "epit", NULL); clk_register_clkdev(clk[epit2_gate], "epit", NULL); - clk_register_clkdev(clk[nfc], NULL, "mxc_nand.0"); + clk_register_clkdev(clk[nfc], NULL, "imx27-nand.0"); clk_register_clkdev(clk[ipu_gate], NULL, "ipu-core"); clk_register_clkdev(clk[ipu_gate], NULL, "mx3_sdc_fb"); clk_register_clkdev(clk[kpp_gate], NULL, "imx-keypad"); @@ -155,12 +154,12 @@ int __init mx31_clocks_init(unsigned long fref) clk_register_clkdev(clk[ipg], "ipg", "imx21-uart.3"); clk_register_clkdev(clk[uart5_gate], "per", "imx21-uart.4"); clk_register_clkdev(clk[ipg], "ipg", "imx21-uart.4"); - clk_register_clkdev(clk[i2c1_gate], NULL, "imx-i2c.0"); - clk_register_clkdev(clk[i2c2_gate], NULL, "imx-i2c.1"); - clk_register_clkdev(clk[i2c3_gate], NULL, "imx-i2c.2"); + clk_register_clkdev(clk[i2c1_gate], NULL, "imx21-i2c.0"); + clk_register_clkdev(clk[i2c2_gate], NULL, "imx21-i2c.1"); + clk_register_clkdev(clk[i2c3_gate], NULL, "imx21-i2c.2"); clk_register_clkdev(clk[owire_gate], NULL, "mxc_w1.0"); - clk_register_clkdev(clk[sdhc1_gate], NULL, "mxc-mmc.0"); - clk_register_clkdev(clk[sdhc2_gate], NULL, "mxc-mmc.1"); + clk_register_clkdev(clk[sdhc1_gate], NULL, "imx31-mmc.0"); + clk_register_clkdev(clk[sdhc2_gate], NULL, "imx31-mmc.1"); clk_register_clkdev(clk[ssi1_gate], NULL, "imx-ssi.0"); clk_register_clkdev(clk[ssi2_gate], NULL, "imx-ssi.1"); clk_register_clkdev(clk[firi_gate], "firi", NULL); diff --git a/trunk/arch/arm/mach-imx/clk-imx35.c b/trunk/arch/arm/mach-imx/clk-imx35.c index 177259b523cd..66f3d65ea275 100644 --- a/trunk/arch/arm/mach-imx/clk-imx35.c +++ b/trunk/arch/arm/mach-imx/clk-imx35.c @@ -14,11 +14,10 @@ #include #include -#include -#include - #include "crmregs-imx3.h" #include "clk.h" +#include "common.h" +#include "hardware.h" struct arm_ahb_div { unsigned char arm, ahb, sel; @@ -226,9 +225,9 @@ int __init mx35_clocks_init() clk_register_clkdev(clk[fec_gate], NULL, "imx27-fec.0"); clk_register_clkdev(clk[gpt_gate], "per", "imx-gpt.0"); clk_register_clkdev(clk[ipg], "ipg", "imx-gpt.0"); - clk_register_clkdev(clk[i2c1_gate], NULL, "imx-i2c.0"); - clk_register_clkdev(clk[i2c2_gate], NULL, "imx-i2c.1"); - clk_register_clkdev(clk[i2c3_gate], NULL, "imx-i2c.2"); + clk_register_clkdev(clk[i2c1_gate], NULL, "imx21-i2c.0"); + clk_register_clkdev(clk[i2c2_gate], NULL, "imx21-i2c.1"); + clk_register_clkdev(clk[i2c3_gate], NULL, "imx21-i2c.2"); clk_register_clkdev(clk[ipu_gate], NULL, "ipu-core"); clk_register_clkdev(clk[ipu_gate], NULL, "mx3_sdc_fb"); clk_register_clkdev(clk[kpp_gate], NULL, "imx-keypad"); @@ -256,7 +255,7 @@ int __init mx35_clocks_init() clk_register_clkdev(clk[ipg], "ipg", "fsl-usb2-udc"); clk_register_clkdev(clk[usbotg_gate], "ahb", "fsl-usb2-udc"); clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0"); - clk_register_clkdev(clk[nfc_div], NULL, "mxc_nand.0"); + clk_register_clkdev(clk[nfc_div], NULL, "imx25-nand.0"); clk_register_clkdev(clk[csi_gate], NULL, "mx3-camera.0"); clk_prepare_enable(clk[spba_gate]); diff --git a/trunk/arch/arm/mach-imx/clk-imx51-imx53.c b/trunk/arch/arm/mach-imx/clk-imx51-imx53.c index a0bf84803eac..abb71f6b4d60 100644 --- a/trunk/arch/arm/mach-imx/clk-imx51-imx53.c +++ b/trunk/arch/arm/mach-imx/clk-imx51-imx53.c @@ -14,11 +14,10 @@ #include #include -#include -#include - #include "crm-regs-imx5.h" #include "clk.h" +#include "common.h" +#include "hardware.h" /* Low-power Audio Playback Mode clock */ static const char *lp_apm_sel[] = { "osc", }; @@ -258,8 +257,8 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil, clk_register_clkdev(clk[cspi_ipg_gate], NULL, "imx35-cspi.2"); clk_register_clkdev(clk[pwm1_ipg_gate], "pwm", "mxc_pwm.0"); clk_register_clkdev(clk[pwm2_ipg_gate], "pwm", "mxc_pwm.1"); - clk_register_clkdev(clk[i2c1_gate], NULL, "imx-i2c.0"); - clk_register_clkdev(clk[i2c2_gate], NULL, "imx-i2c.1"); + clk_register_clkdev(clk[i2c1_gate], NULL, "imx21-i2c.0"); + clk_register_clkdev(clk[i2c2_gate], NULL, "imx21-i2c.1"); clk_register_clkdev(clk[usboh3_per_gate], "per", "mxc-ehci.0"); clk_register_clkdev(clk[usboh3_gate], "ipg", "mxc-ehci.0"); clk_register_clkdev(clk[usboh3_gate], "ahb", "mxc-ehci.0"); @@ -272,7 +271,7 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil, clk_register_clkdev(clk[usboh3_per_gate], "per", "fsl-usb2-udc"); clk_register_clkdev(clk[usboh3_gate], "ipg", "fsl-usb2-udc"); clk_register_clkdev(clk[usboh3_gate], "ahb", "fsl-usb2-udc"); - clk_register_clkdev(clk[nfc_gate], NULL, "mxc_nand"); + clk_register_clkdev(clk[nfc_gate], NULL, "imx51-nand"); clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "imx-ssi.0"); clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "imx-ssi.1"); clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "imx-ssi.2"); @@ -345,7 +344,7 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, mx5_clocks_common_init(rate_ckil, rate_osc, rate_ckih1, rate_ckih2); - clk_register_clkdev(clk[hsi2c_gate], NULL, "imx-i2c.2"); + clk_register_clkdev(clk[hsi2c_gate], NULL, "imx21-i2c.2"); clk_register_clkdev(clk[mx51_mipi], "mipi_hsp", NULL); clk_register_clkdev(clk[vpu_gate], NULL, "imx51-vpu.0"); clk_register_clkdev(clk[fec_gate], NULL, "imx27-fec.0"); @@ -440,7 +439,7 @@ int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, mx5_clocks_common_init(rate_ckil, rate_osc, rate_ckih1, rate_ckih2); clk_register_clkdev(clk[vpu_gate], NULL, "imx53-vpu.0"); - clk_register_clkdev(clk[i2c3_gate], NULL, "imx-i2c.2"); + clk_register_clkdev(clk[i2c3_gate], NULL, "imx21-i2c.2"); clk_register_clkdev(clk[fec_gate], NULL, "imx25-fec.0"); clk_register_clkdev(clk[ipu_gate], "bus", "imx53-ipu"); clk_register_clkdev(clk[ipu_di0_gate], "di0", "imx53-ipu"); diff --git a/trunk/arch/arm/mach-imx/clk-imx6q.c b/trunk/arch/arm/mach-imx/clk-imx6q.c index 3ec242f3341e..e5a82bb95b52 100644 --- a/trunk/arch/arm/mach-imx/clk-imx6q.c +++ b/trunk/arch/arm/mach-imx/clk-imx6q.c @@ -19,8 +19,9 @@ #include #include #include -#include + #include "clk.h" +#include "common.h" #define CCGR0 0x68 #define CCGR1 0x6c diff --git a/trunk/arch/arm/mach-imx/clk-pllv1.c b/trunk/arch/arm/mach-imx/clk-pllv1.c index 02be73178912..abff350ba24c 100644 --- a/trunk/arch/arm/mach-imx/clk-pllv1.c +++ b/trunk/arch/arm/mach-imx/clk-pllv1.c @@ -4,10 +4,10 @@ #include #include #include -#include -#include #include "clk.h" +#include "common.h" +#include "hardware.h" /** * pll v1 diff --git a/trunk/arch/arm/plat-mxc/include/mach/common.h b/trunk/arch/arm/mach-imx/common.h similarity index 99% rename from trunk/arch/arm/plat-mxc/include/mach/common.h rename to trunk/arch/arm/mach-imx/common.h index ead901814c0d..ef8db6b34841 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/common.h +++ b/trunk/arch/arm/mach-imx/common.h @@ -79,6 +79,7 @@ extern void mxc_arch_reset_init(void __iomem *); extern int mx53_revision(void); extern int mx53_display_revision(void); extern void imx_set_aips(void __iomem *); +extern int mxc_device_init(void); enum mxc_cpu_pwr_mode { WAIT_CLOCKED, /* wfi only */ diff --git a/trunk/arch/arm/mach-imx/cpu-imx25.c b/trunk/arch/arm/mach-imx/cpu-imx25.c index 6914bcbf84e4..96ec64b5ff7d 100644 --- a/trunk/arch/arm/mach-imx/cpu-imx25.c +++ b/trunk/arch/arm/mach-imx/cpu-imx25.c @@ -11,8 +11,9 @@ */ #include #include -#include -#include + +#include "iim.h" +#include "hardware.h" static int mx25_cpu_rev = -1; diff --git a/trunk/arch/arm/mach-imx/cpu-imx27.c b/trunk/arch/arm/mach-imx/cpu-imx27.c index ff38e1505f67..fe8d36f7e30e 100644 --- a/trunk/arch/arm/mach-imx/cpu-imx27.c +++ b/trunk/arch/arm/mach-imx/cpu-imx27.c @@ -24,7 +24,7 @@ #include #include -#include +#include "hardware.h" static int mx27_cpu_rev = -1; static int mx27_cpu_partnumber; diff --git a/trunk/arch/arm/mach-imx/cpu-imx31.c b/trunk/arch/arm/mach-imx/cpu-imx31.c index 3f2345f0cdaf..fde1860a2521 100644 --- a/trunk/arch/arm/mach-imx/cpu-imx31.c +++ b/trunk/arch/arm/mach-imx/cpu-imx31.c @@ -11,9 +11,10 @@ #include #include -#include -#include -#include + +#include "common.h" +#include "hardware.h" +#include "iim.h" static int mx31_cpu_rev = -1; diff --git a/trunk/arch/arm/mach-imx/cpu-imx35.c b/trunk/arch/arm/mach-imx/cpu-imx35.c index 846e46eb8cbf..ec3aaa098c17 100644 --- a/trunk/arch/arm/mach-imx/cpu-imx35.c +++ b/trunk/arch/arm/mach-imx/cpu-imx35.c @@ -10,8 +10,9 @@ */ #include #include -#include -#include + +#include "hardware.h" +#include "iim.h" static int mx35_cpu_rev = -1; diff --git a/trunk/arch/arm/mach-imx/cpu-imx5.c b/trunk/arch/arm/mach-imx/cpu-imx5.c index 8eb15a2fcaf9..d88760014ff9 100644 --- a/trunk/arch/arm/mach-imx/cpu-imx5.c +++ b/trunk/arch/arm/mach-imx/cpu-imx5.c @@ -15,9 +15,10 @@ #include #include #include -#include #include +#include "hardware.h" + static int mx5_cpu_rev = -1; #define IIM_SREV 0x24 diff --git a/trunk/arch/arm/plat-mxc/cpu.c b/trunk/arch/arm/mach-imx/cpu.c similarity index 97% rename from trunk/arch/arm/plat-mxc/cpu.c rename to trunk/arch/arm/mach-imx/cpu.c index 220dd6f93126..03fcbd082593 100644 --- a/trunk/arch/arm/plat-mxc/cpu.c +++ b/trunk/arch/arm/mach-imx/cpu.c @@ -1,7 +1,8 @@ #include #include -#include + +#include "hardware.h" unsigned int __mxc_cpu_type; EXPORT_SYMBOL(__mxc_cpu_type); diff --git a/trunk/arch/arm/mach-imx/cpu_op-mx51.c b/trunk/arch/arm/mach-imx/cpu_op-mx51.c index 7b92cd6da6d3..b9ef692b61a2 100644 --- a/trunk/arch/arm/mach-imx/cpu_op-mx51.c +++ b/trunk/arch/arm/mach-imx/cpu_op-mx51.c @@ -13,9 +13,10 @@ #include #include -#include #include +#include "hardware.h" + static struct cpu_op mx51_cpu_op[] = { { .cpu_rate = 160000000,}, diff --git a/trunk/arch/arm/plat-mxc/cpufreq.c b/trunk/arch/arm/mach-imx/cpufreq.c similarity index 99% rename from trunk/arch/arm/plat-mxc/cpufreq.c rename to trunk/arch/arm/mach-imx/cpufreq.c index b5b6f8083130..36e8b3994470 100644 --- a/trunk/arch/arm/plat-mxc/cpufreq.c +++ b/trunk/arch/arm/mach-imx/cpufreq.c @@ -22,7 +22,8 @@ #include #include #include -#include + +#include "hardware.h" #define CLK32_FREQ 32768 #define NANOSECOND (1000 * 1000 * 1000) diff --git a/trunk/arch/arm/plat-mxc/cpuidle.c b/trunk/arch/arm/mach-imx/cpuidle.c similarity index 100% rename from trunk/arch/arm/plat-mxc/cpuidle.c rename to trunk/arch/arm/mach-imx/cpuidle.c diff --git a/trunk/arch/arm/plat-mxc/include/mach/cpuidle.h b/trunk/arch/arm/mach-imx/cpuidle.h similarity index 100% rename from trunk/arch/arm/plat-mxc/include/mach/cpuidle.h rename to trunk/arch/arm/mach-imx/cpuidle.h diff --git a/trunk/arch/arm/mach-imx/devices-imx1.h b/trunk/arch/arm/mach-imx/devices-imx1.h index 3aad1e70de96..f9b5afc6bcd1 100644 --- a/trunk/arch/arm/mach-imx/devices-imx1.h +++ b/trunk/arch/arm/mach-imx/devices-imx1.h @@ -6,8 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "devices/devices-common.h" extern const struct imx_imx_fb_data imx1_imx_fb_data; #define imx1_add_imx_fb(pdata) \ diff --git a/trunk/arch/arm/mach-imx/devices-imx21.h b/trunk/arch/arm/mach-imx/devices-imx21.h index 93ece55f75df..bd9393280159 100644 --- a/trunk/arch/arm/mach-imx/devices-imx21.h +++ b/trunk/arch/arm/mach-imx/devices-imx21.h @@ -6,8 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "devices/devices-common.h" extern const struct imx_imx21_hcd_data imx21_imx21_hcd_data; #define imx21_add_imx21_hcd(pdata) \ diff --git a/trunk/arch/arm/mach-imx/devices-imx25.h b/trunk/arch/arm/mach-imx/devices-imx25.h index f8e03dd1f116..0d2922bc575c 100644 --- a/trunk/arch/arm/mach-imx/devices-imx25.h +++ b/trunk/arch/arm/mach-imx/devices-imx25.h @@ -6,8 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "devices/devices-common.h" extern const struct imx_fec_data imx25_fec_data; #define imx25_add_fec(pdata) \ diff --git a/trunk/arch/arm/mach-imx/devices-imx27.h b/trunk/arch/arm/mach-imx/devices-imx27.h index 04822932cdd1..8a1ad7972d4c 100644 --- a/trunk/arch/arm/mach-imx/devices-imx27.h +++ b/trunk/arch/arm/mach-imx/devices-imx27.h @@ -6,8 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "devices/devices-common.h" extern const struct imx_fec_data imx27_fec_data; #define imx27_add_fec(pdata) \ diff --git a/trunk/arch/arm/mach-imx/devices-imx31.h b/trunk/arch/arm/mach-imx/devices-imx31.h index 8b2ceb45bb83..e8d1611bbc8e 100644 --- a/trunk/arch/arm/mach-imx/devices-imx31.h +++ b/trunk/arch/arm/mach-imx/devices-imx31.h @@ -6,8 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "devices/devices-common.h" extern const struct imx_fsl_usb2_udc_data imx31_fsl_usb2_udc_data; #define imx31_add_fsl_usb2_udc(pdata) \ diff --git a/trunk/arch/arm/mach-imx/devices-imx35.h b/trunk/arch/arm/mach-imx/devices-imx35.h index c3e9f206ac2b..e2675f1b141c 100644 --- a/trunk/arch/arm/mach-imx/devices-imx35.h +++ b/trunk/arch/arm/mach-imx/devices-imx35.h @@ -6,8 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "devices/devices-common.h" extern const struct imx_fec_data imx35_fec_data; #define imx35_add_fec(pdata) \ diff --git a/trunk/arch/arm/mach-imx/devices-imx50.h b/trunk/arch/arm/mach-imx/devices-imx50.h index 7216667eaafc..2c290391f298 100644 --- a/trunk/arch/arm/mach-imx/devices-imx50.h +++ b/trunk/arch/arm/mach-imx/devices-imx50.h @@ -18,8 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include +#include "devices/devices-common.h" extern const struct imx_imx_uart_1irq_data imx50_imx_uart_data[]; #define imx50_add_imx_uart(id, pdata) \ diff --git a/trunk/arch/arm/mach-imx/devices-imx51.h b/trunk/arch/arm/mach-imx/devices-imx51.h index 9f1718725195..deee5baee88c 100644 --- a/trunk/arch/arm/mach-imx/devices-imx51.h +++ b/trunk/arch/arm/mach-imx/devices-imx51.h @@ -6,8 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "devices/devices-common.h" extern const struct imx_fec_data imx51_fec_data; #define imx51_add_fec(pdata) \ diff --git a/trunk/arch/arm/plat-mxc/devices/Kconfig b/trunk/arch/arm/mach-imx/devices/Kconfig similarity index 100% rename from trunk/arch/arm/plat-mxc/devices/Kconfig rename to trunk/arch/arm/mach-imx/devices/Kconfig diff --git a/trunk/arch/arm/plat-mxc/devices/Makefile b/trunk/arch/arm/mach-imx/devices/Makefile similarity index 98% rename from trunk/arch/arm/plat-mxc/devices/Makefile rename to trunk/arch/arm/mach-imx/devices/Makefile index 76f3195475d0..2abe2a5144d0 100644 --- a/trunk/arch/arm/plat-mxc/devices/Makefile +++ b/trunk/arch/arm/mach-imx/devices/Makefile @@ -1,3 +1,5 @@ +obj-y := devices.o + obj-$(CONFIG_IMX_HAVE_PLATFORM_FEC) += platform-fec.o obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o obj-$(CONFIG_IMX_HAVE_PLATFORM_FSL_USB2_UDC) += platform-fsl-usb2-udc.o diff --git a/trunk/arch/arm/plat-mxc/include/mach/devices-common.h b/trunk/arch/arm/mach-imx/devices/devices-common.h similarity index 97% rename from trunk/arch/arm/plat-mxc/include/mach/devices-common.h rename to trunk/arch/arm/mach-imx/devices/devices-common.h index eaf79d220c9a..e4b790b9e2aa 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/devices-common.h +++ b/trunk/arch/arm/mach-imx/devices/devices-common.h @@ -108,6 +108,7 @@ struct platform_device *__init imx_add_imxdi_rtc( #include struct imx_imx_fb_data { + const char *devid; resource_size_t iobase; resource_size_t iosize; resource_size_t irq; @@ -118,6 +119,7 @@ struct platform_device *__init imx_add_imx_fb( #include struct imx_imx_i2c_data { + const char *devid; int id; resource_size_t iobase; resource_size_t iosize; @@ -219,6 +221,7 @@ struct platform_device *__init imx_add_mx1_camera( #include struct imx_mx2_camera_data { + const char *devid; resource_size_t iobasecsi; resource_size_t iosizecsi; resource_size_t irqcsi; @@ -244,6 +247,7 @@ struct platform_device *__init imx_add_mxc_ehci( #include struct imx_mxc_mmc_data { + const char *devid; int id; resource_size_t iobase; resource_size_t iosize; @@ -256,6 +260,7 @@ struct platform_device *__init imx_add_mxc_mmc( #include struct imx_mxc_nand_data { + const char *devid; /* * id is traditionally 0, but -1 is more appropriate. We use -1 for new * machines but don't change existing devices as the nand device usually @@ -290,6 +295,7 @@ struct platform_device *__init imx_add_mxc_pwm( /* mxc_rtc */ struct imx_mxc_rtc_data { + const char *devid; resource_size_t iobase; resource_size_t irq; }; @@ -326,7 +332,8 @@ struct platform_device *__init imx_add_spi_imx( const struct imx_spi_imx_data *data, const struct spi_imx_master *pdata); -struct platform_device *imx_add_imx_dma(void); +struct platform_device *imx_add_imx_dma(char *name, resource_size_t iobase, + int irq, int irq_err); struct platform_device *imx_add_imx_sdma(char *name, resource_size_t iobase, int irq, struct sdma_platform_data *pdata); diff --git a/trunk/arch/arm/plat-mxc/devices.c b/trunk/arch/arm/mach-imx/devices/devices.c similarity index 92% rename from trunk/arch/arm/plat-mxc/devices.c rename to trunk/arch/arm/mach-imx/devices/devices.c index 4d55a7a26e98..1b37482407f9 100644 --- a/trunk/arch/arm/plat-mxc/devices.c +++ b/trunk/arch/arm/mach-imx/devices/devices.c @@ -21,7 +21,6 @@ #include #include #include -#include struct device mxc_aips_bus = { .init_name = "mxc_aips", @@ -33,7 +32,7 @@ struct device mxc_ahb_bus = { .parent = &platform_bus, }; -static int __init mxc_device_init(void) +int __init mxc_device_init(void) { int ret; @@ -46,4 +45,3 @@ static int __init mxc_device_init(void) done: return ret; } -core_initcall(mxc_device_init); diff --git a/trunk/arch/arm/plat-mxc/devices/platform-ahci-imx.c b/trunk/arch/arm/mach-imx/devices/platform-ahci-imx.c similarity index 98% rename from trunk/arch/arm/plat-mxc/devices/platform-ahci-imx.c rename to trunk/arch/arm/mach-imx/devices/platform-ahci-imx.c index ade4a1c4e2a3..3d87dd9c284a 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-ahci-imx.c +++ b/trunk/arch/arm/mach-imx/devices/platform-ahci-imx.c @@ -24,8 +24,9 @@ #include #include #include -#include -#include + +#include "../hardware.h" +#include "devices-common.h" #define imx_ahci_imx_data_entry_single(soc, _devid) \ { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-fec.c b/trunk/arch/arm/mach-imx/devices/platform-fec.c similarity index 97% rename from trunk/arch/arm/plat-mxc/devices/platform-fec.c rename to trunk/arch/arm/mach-imx/devices/platform-fec.c index 0bae44e890db..2cb188ad9a0a 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-fec.c +++ b/trunk/arch/arm/mach-imx/devices/platform-fec.c @@ -8,8 +8,9 @@ */ #include #include -#include -#include + +#include "../hardware.h" +#include "devices-common.h" #define imx_fec_data_entry_single(soc, _devid) \ { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-flexcan.c b/trunk/arch/arm/mach-imx/devices/platform-flexcan.c similarity index 96% rename from trunk/arch/arm/plat-mxc/devices/platform-flexcan.c rename to trunk/arch/arm/mach-imx/devices/platform-flexcan.c index 4e8497af2eb1..1078bf0a94ef 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-flexcan.c +++ b/trunk/arch/arm/mach-imx/devices/platform-flexcan.c @@ -5,8 +5,8 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "../hardware.h" +#include "devices-common.h" #define imx_flexcan_data_entry_single(soc, _id, _hwid, _size) \ { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c b/trunk/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c similarity index 96% rename from trunk/arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c rename to trunk/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c index 848038f301fd..37e44398197b 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c +++ b/trunk/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c @@ -7,8 +7,9 @@ * Free Software Foundation. */ #include -#include -#include + +#include "../hardware.h" +#include "devices-common.h" #define imx_fsl_usb2_udc_data_entry_single(soc) \ { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-gpio-mxc.c b/trunk/arch/arm/mach-imx/devices/platform-gpio-mxc.c similarity index 96% rename from trunk/arch/arm/plat-mxc/devices/platform-gpio-mxc.c rename to trunk/arch/arm/mach-imx/devices/platform-gpio-mxc.c index a7919a241032..26483fa94b75 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-gpio-mxc.c +++ b/trunk/arch/arm/mach-imx/devices/platform-gpio-mxc.c @@ -6,7 +6,7 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include +#include "devices-common.h" struct platform_device *__init mxc_register_gpio(char *name, int id, resource_size_t iobase, resource_size_t iosize, int irq, int irq_high) diff --git a/trunk/arch/arm/plat-mxc/devices/platform-gpio_keys.c b/trunk/arch/arm/mach-imx/devices/platform-gpio_keys.c similarity index 94% rename from trunk/arch/arm/plat-mxc/devices/platform-gpio_keys.c rename to trunk/arch/arm/mach-imx/devices/platform-gpio_keys.c index 1c53a532ea0e..486282539c76 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-gpio_keys.c +++ b/trunk/arch/arm/mach-imx/devices/platform-gpio_keys.c @@ -16,8 +16,9 @@ * Boston, MA 02110-1301, USA. */ #include -#include -#include + +#include "../hardware.h" +#include "devices-common.h" struct platform_device *__init imx_add_gpio_keys( const struct gpio_keys_platform_data *pdata) diff --git a/trunk/arch/arm/plat-mxc/devices/platform-imx-dma.c b/trunk/arch/arm/mach-imx/devices/platform-imx-dma.c similarity index 63% rename from trunk/arch/arm/plat-mxc/devices/platform-imx-dma.c rename to trunk/arch/arm/mach-imx/devices/platform-imx-dma.c index 7fa7e9c92468..ccdb5dc4ddbd 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-imx-dma.c +++ b/trunk/arch/arm/mach-imx/devices/platform-imx-dma.c @@ -6,12 +6,29 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include +#include "devices-common.h" -struct platform_device __init __maybe_unused *imx_add_imx_dma(void) +struct platform_device __init __maybe_unused *imx_add_imx_dma(char *name, + resource_size_t iobase, int irq, int irq_err) { + struct resource res[] = { + { + .start = iobase, + .end = iobase + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, { + .start = irq, + .end = irq, + .flags = IORESOURCE_IRQ, + }, { + .start = irq_err, + .end = irq_err, + .flags = IORESOURCE_IRQ, + }, + }; + return platform_device_register_resndata(&mxc_ahb_bus, - "imx-dma", -1, NULL, 0, NULL, 0); + name, -1, res, ARRAY_SIZE(res), NULL, 0); } struct platform_device __init __maybe_unused *imx_add_imx_sdma(char *name, diff --git a/trunk/arch/arm/plat-mxc/devices/platform-imx-fb.c b/trunk/arch/arm/mach-imx/devices/platform-imx-fb.c similarity index 79% rename from trunk/arch/arm/plat-mxc/devices/platform-imx-fb.c rename to trunk/arch/arm/mach-imx/devices/platform-imx-fb.c index 2b0b5e0aa998..10b0ed39f07f 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-imx-fb.c +++ b/trunk/arch/arm/mach-imx/devices/platform-imx-fb.c @@ -7,11 +7,13 @@ * Free Software Foundation. */ #include -#include -#include -#define imx_imx_fb_data_entry_single(soc, _size) \ +#include "../hardware.h" +#include "devices-common.h" + +#define imx_imx_fb_data_entry_single(soc, _devid, _size) \ { \ + .devid = _devid, \ .iobase = soc ## _LCDC_BASE_ADDR, \ .iosize = _size, \ .irq = soc ## _INT_LCDC, \ @@ -19,22 +21,22 @@ #ifdef CONFIG_SOC_IMX1 const struct imx_imx_fb_data imx1_imx_fb_data __initconst = - imx_imx_fb_data_entry_single(MX1, SZ_4K); + imx_imx_fb_data_entry_single(MX1, "imx1-fb", SZ_4K); #endif /* ifdef CONFIG_SOC_IMX1 */ #ifdef CONFIG_SOC_IMX21 const struct imx_imx_fb_data imx21_imx_fb_data __initconst = - imx_imx_fb_data_entry_single(MX21, SZ_4K); + imx_imx_fb_data_entry_single(MX21, "imx21-fb", SZ_4K); #endif /* ifdef CONFIG_SOC_IMX21 */ #ifdef CONFIG_SOC_IMX25 const struct imx_imx_fb_data imx25_imx_fb_data __initconst = - imx_imx_fb_data_entry_single(MX25, SZ_16K); + imx_imx_fb_data_entry_single(MX25, "imx21-fb", SZ_16K); #endif /* ifdef CONFIG_SOC_IMX25 */ #ifdef CONFIG_SOC_IMX27 const struct imx_imx_fb_data imx27_imx_fb_data __initconst = - imx_imx_fb_data_entry_single(MX27, SZ_4K); + imx_imx_fb_data_entry_single(MX27, "imx21-fb", SZ_4K); #endif /* ifdef CONFIG_SOC_IMX27 */ struct platform_device *__init imx_add_imx_fb( diff --git a/trunk/arch/arm/plat-mxc/devices/platform-imx-i2c.c b/trunk/arch/arm/mach-imx/devices/platform-imx-i2c.c similarity index 76% rename from trunk/arch/arm/plat-mxc/devices/platform-imx-i2c.c rename to trunk/arch/arm/mach-imx/devices/platform-imx-i2c.c index 19ad580c0be3..8e30e5703cd2 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-imx-i2c.c +++ b/trunk/arch/arm/mach-imx/devices/platform-imx-i2c.c @@ -6,34 +6,35 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "../hardware.h" +#include "devices-common.h" -#define imx_imx_i2c_data_entry_single(soc, _id, _hwid, _size) \ +#define imx_imx_i2c_data_entry_single(soc, _devid, _id, _hwid, _size) \ { \ + .devid = _devid, \ .id = _id, \ .iobase = soc ## _I2C ## _hwid ## _BASE_ADDR, \ .iosize = _size, \ .irq = soc ## _INT_I2C ## _hwid, \ } -#define imx_imx_i2c_data_entry(soc, _id, _hwid, _size) \ - [_id] = imx_imx_i2c_data_entry_single(soc, _id, _hwid, _size) +#define imx_imx_i2c_data_entry(soc, _devid, _id, _hwid, _size) \ + [_id] = imx_imx_i2c_data_entry_single(soc, _devid, _id, _hwid, _size) #ifdef CONFIG_SOC_IMX1 const struct imx_imx_i2c_data imx1_imx_i2c_data __initconst = - imx_imx_i2c_data_entry_single(MX1, 0, , SZ_4K); + imx_imx_i2c_data_entry_single(MX1, "imx1-i2c", 0, , SZ_4K); #endif /* ifdef CONFIG_SOC_IMX1 */ #ifdef CONFIG_SOC_IMX21 const struct imx_imx_i2c_data imx21_imx_i2c_data __initconst = - imx_imx_i2c_data_entry_single(MX21, 0, , SZ_4K); + imx_imx_i2c_data_entry_single(MX21, "imx21-i2c", 0, , SZ_4K); #endif /* ifdef CONFIG_SOC_IMX21 */ #ifdef CONFIG_SOC_IMX25 const struct imx_imx_i2c_data imx25_imx_i2c_data[] __initconst = { #define imx25_imx_i2c_data_entry(_id, _hwid) \ - imx_imx_i2c_data_entry(MX25, _id, _hwid, SZ_16K) + imx_imx_i2c_data_entry(MX25, "imx21-i2c", _id, _hwid, SZ_16K) imx25_imx_i2c_data_entry(0, 1), imx25_imx_i2c_data_entry(1, 2), imx25_imx_i2c_data_entry(2, 3), @@ -43,7 +44,7 @@ const struct imx_imx_i2c_data imx25_imx_i2c_data[] __initconst = { #ifdef CONFIG_SOC_IMX27 const struct imx_imx_i2c_data imx27_imx_i2c_data[] __initconst = { #define imx27_imx_i2c_data_entry(_id, _hwid) \ - imx_imx_i2c_data_entry(MX27, _id, _hwid, SZ_4K) + imx_imx_i2c_data_entry(MX27, "imx21-i2c", _id, _hwid, SZ_4K) imx27_imx_i2c_data_entry(0, 1), imx27_imx_i2c_data_entry(1, 2), }; @@ -52,7 +53,7 @@ const struct imx_imx_i2c_data imx27_imx_i2c_data[] __initconst = { #ifdef CONFIG_SOC_IMX31 const struct imx_imx_i2c_data imx31_imx_i2c_data[] __initconst = { #define imx31_imx_i2c_data_entry(_id, _hwid) \ - imx_imx_i2c_data_entry(MX31, _id, _hwid, SZ_4K) + imx_imx_i2c_data_entry(MX31, "imx21-i2c", _id, _hwid, SZ_4K) imx31_imx_i2c_data_entry(0, 1), imx31_imx_i2c_data_entry(1, 2), imx31_imx_i2c_data_entry(2, 3), @@ -62,7 +63,7 @@ const struct imx_imx_i2c_data imx31_imx_i2c_data[] __initconst = { #ifdef CONFIG_SOC_IMX35 const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst = { #define imx35_imx_i2c_data_entry(_id, _hwid) \ - imx_imx_i2c_data_entry(MX35, _id, _hwid, SZ_4K) + imx_imx_i2c_data_entry(MX35, "imx21-i2c", _id, _hwid, SZ_4K) imx35_imx_i2c_data_entry(0, 1), imx35_imx_i2c_data_entry(1, 2), imx35_imx_i2c_data_entry(2, 3), @@ -72,7 +73,7 @@ const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst = { #ifdef CONFIG_SOC_IMX50 const struct imx_imx_i2c_data imx50_imx_i2c_data[] __initconst = { #define imx50_imx_i2c_data_entry(_id, _hwid) \ - imx_imx_i2c_data_entry(MX50, _id, _hwid, SZ_4K) + imx_imx_i2c_data_entry(MX50, "imx21-i2c", _id, _hwid, SZ_4K) imx50_imx_i2c_data_entry(0, 1), imx50_imx_i2c_data_entry(1, 2), imx50_imx_i2c_data_entry(2, 3), @@ -82,10 +83,11 @@ const struct imx_imx_i2c_data imx50_imx_i2c_data[] __initconst = { #ifdef CONFIG_SOC_IMX51 const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst = { #define imx51_imx_i2c_data_entry(_id, _hwid) \ - imx_imx_i2c_data_entry(MX51, _id, _hwid, SZ_4K) + imx_imx_i2c_data_entry(MX51, "imx21-i2c", _id, _hwid, SZ_4K) imx51_imx_i2c_data_entry(0, 1), imx51_imx_i2c_data_entry(1, 2), { + .devid = "imx21-i2c", .id = 2, .iobase = MX51_HSI2C_DMA_BASE_ADDR, .iosize = SZ_16K, @@ -97,7 +99,7 @@ const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst = { #ifdef CONFIG_SOC_IMX53 const struct imx_imx_i2c_data imx53_imx_i2c_data[] __initconst = { #define imx53_imx_i2c_data_entry(_id, _hwid) \ - imx_imx_i2c_data_entry(MX53, _id, _hwid, SZ_4K) + imx_imx_i2c_data_entry(MX53, "imx21-i2c", _id, _hwid, SZ_4K) imx53_imx_i2c_data_entry(0, 1), imx53_imx_i2c_data_entry(1, 2), imx53_imx_i2c_data_entry(2, 3), @@ -120,7 +122,7 @@ struct platform_device *__init imx_add_imx_i2c( }, }; - return imx_add_platform_device("imx-i2c", data->id, + return imx_add_platform_device(data->devid, data->id, res, ARRAY_SIZE(res), pdata, sizeof(*pdata)); } diff --git a/trunk/arch/arm/plat-mxc/devices/platform-imx-keypad.c b/trunk/arch/arm/mach-imx/devices/platform-imx-keypad.c similarity index 97% rename from trunk/arch/arm/plat-mxc/devices/platform-imx-keypad.c rename to trunk/arch/arm/mach-imx/devices/platform-imx-keypad.c index 479c3e9f771f..8f22a4c98a4c 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-imx-keypad.c +++ b/trunk/arch/arm/mach-imx/devices/platform-imx-keypad.c @@ -6,8 +6,8 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "../hardware.h" +#include "devices-common.h" #define imx_imx_keypad_data_entry_single(soc, _size) \ { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-imx-ssi.c b/trunk/arch/arm/mach-imx/devices/platform-imx-ssi.c similarity index 98% rename from trunk/arch/arm/plat-mxc/devices/platform-imx-ssi.c rename to trunk/arch/arm/mach-imx/devices/platform-imx-ssi.c index 21c6f30e1017..bfcb8f3dfa8d 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-imx-ssi.c +++ b/trunk/arch/arm/mach-imx/devices/platform-imx-ssi.c @@ -6,8 +6,8 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "../hardware.h" +#include "devices-common.h" #define imx_imx_ssi_data_entry(soc, _id, _hwid, _size) \ [_id] = { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-imx-uart.c b/trunk/arch/arm/mach-imx/devices/platform-imx-uart.c similarity index 98% rename from trunk/arch/arm/plat-mxc/devices/platform-imx-uart.c rename to trunk/arch/arm/mach-imx/devices/platform-imx-uart.c index d390f00bd294..67bf866a2cb6 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-imx-uart.c +++ b/trunk/arch/arm/mach-imx/devices/platform-imx-uart.c @@ -6,8 +6,8 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "../hardware.h" +#include "devices-common.h" #define imx_imx_uart_3irq_data_entry(soc, _id, _hwid, _size) \ [_id] = { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-imx2-wdt.c b/trunk/arch/arm/mach-imx/devices/platform-imx2-wdt.c similarity index 97% rename from trunk/arch/arm/plat-mxc/devices/platform-imx2-wdt.c rename to trunk/arch/arm/mach-imx/devices/platform-imx2-wdt.c index 5e07ef2bf1c4..ec75d6413686 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-imx2-wdt.c +++ b/trunk/arch/arm/mach-imx/devices/platform-imx2-wdt.c @@ -7,8 +7,9 @@ * Free Software Foundation. */ #include -#include -#include + +#include "../hardware.h" +#include "devices-common.h" #define imx_imx2_wdt_data_entry_single(soc, _id, _hwid, _size) \ { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-imx21-hcd.c b/trunk/arch/arm/mach-imx/devices/platform-imx21-hcd.c similarity index 94% rename from trunk/arch/arm/plat-mxc/devices/platform-imx21-hcd.c rename to trunk/arch/arm/mach-imx/devices/platform-imx21-hcd.c index 5770a42f33bf..30c81616a9a1 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-imx21-hcd.c +++ b/trunk/arch/arm/mach-imx/devices/platform-imx21-hcd.c @@ -6,8 +6,8 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "../hardware.h" +#include "devices-common.h" #define imx_imx21_hcd_data_entry_single(soc) \ { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-imx27-coda.c b/trunk/arch/arm/mach-imx/devices/platform-imx27-coda.c similarity index 93% rename from trunk/arch/arm/plat-mxc/devices/platform-imx27-coda.c rename to trunk/arch/arm/mach-imx/devices/platform-imx27-coda.c index 8b12aacdf396..25bebc29e546 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-imx27-coda.c +++ b/trunk/arch/arm/mach-imx/devices/platform-imx27-coda.c @@ -7,8 +7,8 @@ * Free Software Foundation. */ -#include -#include +#include "../hardware.h" +#include "devices-common.h" #ifdef CONFIG_SOC_IMX27 const struct imx_imx27_coda_data imx27_coda_data __initconst = { diff --git a/trunk/arch/arm/plat-mxc/devices/platform-imx_udc.c b/trunk/arch/arm/mach-imx/devices/platform-imx_udc.c similarity index 96% rename from trunk/arch/arm/plat-mxc/devices/platform-imx_udc.c rename to trunk/arch/arm/mach-imx/devices/platform-imx_udc.c index 6fd675dfce14..5ced7e4e2c71 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-imx_udc.c +++ b/trunk/arch/arm/mach-imx/devices/platform-imx_udc.c @@ -6,8 +6,8 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "../hardware.h" +#include "devices-common.h" #define imx_imx_udc_data_entry_single(soc, _size) \ { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-imxdi_rtc.c b/trunk/arch/arm/mach-imx/devices/platform-imxdi_rtc.c similarity index 94% rename from trunk/arch/arm/plat-mxc/devices/platform-imxdi_rtc.c rename to trunk/arch/arm/mach-imx/devices/platform-imxdi_rtc.c index 805336fdc252..5bb490d556ea 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-imxdi_rtc.c +++ b/trunk/arch/arm/mach-imx/devices/platform-imxdi_rtc.c @@ -7,8 +7,9 @@ * Free Software Foundation. */ #include -#include -#include + +#include "../hardware.h" +#include "devices-common.h" #define imx_imxdi_rtc_data_entry_single(soc) \ { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-ipu-core.c b/trunk/arch/arm/mach-imx/devices/platform-ipu-core.c similarity index 98% rename from trunk/arch/arm/plat-mxc/devices/platform-ipu-core.c rename to trunk/arch/arm/mach-imx/devices/platform-ipu-core.c index d1e33cc6f12e..fc4dd7cedc11 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-ipu-core.c +++ b/trunk/arch/arm/mach-imx/devices/platform-ipu-core.c @@ -7,8 +7,9 @@ * Free Software Foundation. */ #include -#include -#include + +#include "../hardware.h" +#include "devices-common.h" #define imx_ipu_core_entry_single(soc) \ { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-mx1-camera.c b/trunk/arch/arm/mach-imx/devices/platform-mx1-camera.c similarity index 94% rename from trunk/arch/arm/plat-mxc/devices/platform-mx1-camera.c rename to trunk/arch/arm/mach-imx/devices/platform-mx1-camera.c index edcc581a30a9..2c6788131080 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-mx1-camera.c +++ b/trunk/arch/arm/mach-imx/devices/platform-mx1-camera.c @@ -6,8 +6,8 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "../hardware.h" +#include "devices-common.h" #define imx_mx1_camera_data_entry_single(soc, _size) \ { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-mx2-camera.c b/trunk/arch/arm/mach-imx/devices/platform-mx2-camera.c similarity index 83% rename from trunk/arch/arm/plat-mxc/devices/platform-mx2-camera.c rename to trunk/arch/arm/mach-imx/devices/platform-mx2-camera.c index 11eace953a09..f4910160346b 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-mx2-camera.c +++ b/trunk/arch/arm/mach-imx/devices/platform-mx2-camera.c @@ -6,17 +6,19 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "../hardware.h" +#include "devices-common.h" -#define imx_mx2_camera_data_entry_single(soc) \ +#define imx_mx2_camera_data_entry_single(soc, _devid) \ { \ + .devid = _devid, \ .iobasecsi = soc ## _CSI_BASE_ADDR, \ .iosizecsi = SZ_4K, \ .irqcsi = soc ## _INT_CSI, \ } -#define imx_mx2_camera_data_entry_single_emma(soc) \ +#define imx_mx2_camera_data_entry_single_emma(soc, _devid) \ { \ + .devid = _devid, \ .iobasecsi = soc ## _CSI_BASE_ADDR, \ .iosizecsi = SZ_32, \ .irqcsi = soc ## _INT_CSI, \ @@ -27,12 +29,12 @@ #ifdef CONFIG_SOC_IMX25 const struct imx_mx2_camera_data imx25_mx2_camera_data __initconst = - imx_mx2_camera_data_entry_single(MX25); + imx_mx2_camera_data_entry_single(MX25, "imx25-camera"); #endif /* ifdef CONFIG_SOC_IMX25 */ #ifdef CONFIG_SOC_IMX27 const struct imx_mx2_camera_data imx27_mx2_camera_data __initconst = - imx_mx2_camera_data_entry_single_emma(MX27); + imx_mx2_camera_data_entry_single_emma(MX27, "imx27-camera"); #endif /* ifdef CONFIG_SOC_IMX27 */ struct platform_device *__init imx_add_mx2_camera( @@ -58,7 +60,7 @@ struct platform_device *__init imx_add_mx2_camera( .flags = IORESOURCE_IRQ, }, }; - return imx_add_platform_device_dmamask("mx2-camera", 0, + return imx_add_platform_device_dmamask(data->devid, 0, res, data->iobaseemmaprp ? 4 : 2, pdata, sizeof(*pdata), DMA_BIT_MASK(32)); } diff --git a/trunk/arch/arm/plat-mxc/devices/platform-mxc-ehci.c b/trunk/arch/arm/mach-imx/devices/platform-mxc-ehci.c similarity index 97% rename from trunk/arch/arm/plat-mxc/devices/platform-mxc-ehci.c rename to trunk/arch/arm/mach-imx/devices/platform-mxc-ehci.c index 35851d889aca..5d4bbbfde641 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-mxc-ehci.c +++ b/trunk/arch/arm/mach-imx/devices/platform-mxc-ehci.c @@ -7,8 +7,9 @@ * Free Software Foundation. */ #include -#include -#include + +#include "../hardware.h" +#include "devices-common.h" #define imx_mxc_ehci_data_entry_single(soc, _id, hs) \ { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-mxc-mmc.c b/trunk/arch/arm/mach-imx/devices/platform-mxc-mmc.c similarity index 76% rename from trunk/arch/arm/plat-mxc/devices/platform-mxc-mmc.c rename to trunk/arch/arm/mach-imx/devices/platform-mxc-mmc.c index e7b920b58675..b8203c760c8f 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-mxc-mmc.c +++ b/trunk/arch/arm/mach-imx/devices/platform-mxc-mmc.c @@ -7,24 +7,26 @@ * Free Software Foundation. */ #include -#include -#include -#define imx_mxc_mmc_data_entry_single(soc, _id, _hwid, _size) \ +#include "../hardware.h" +#include "devices-common.h" + +#define imx_mxc_mmc_data_entry_single(soc, _devid, _id, _hwid, _size) \ { \ + .devid = _devid, \ .id = _id, \ .iobase = soc ## _SDHC ## _hwid ## _BASE_ADDR, \ .iosize = _size, \ .irq = soc ## _INT_SDHC ## _hwid, \ .dmareq = soc ## _DMA_REQ_SDHC ## _hwid, \ } -#define imx_mxc_mmc_data_entry(soc, _id, _hwid, _size) \ - [_id] = imx_mxc_mmc_data_entry_single(soc, _id, _hwid, _size) +#define imx_mxc_mmc_data_entry(soc, _devid, _id, _hwid, _size) \ + [_id] = imx_mxc_mmc_data_entry_single(soc, _devid, _id, _hwid, _size) #ifdef CONFIG_SOC_IMX21 const struct imx_mxc_mmc_data imx21_mxc_mmc_data[] __initconst = { #define imx21_mxc_mmc_data_entry(_id, _hwid) \ - imx_mxc_mmc_data_entry(MX21, _id, _hwid, SZ_4K) + imx_mxc_mmc_data_entry(MX21, "imx21-mmc", _id, _hwid, SZ_4K) imx21_mxc_mmc_data_entry(0, 1), imx21_mxc_mmc_data_entry(1, 2), }; @@ -33,7 +35,7 @@ const struct imx_mxc_mmc_data imx21_mxc_mmc_data[] __initconst = { #ifdef CONFIG_SOC_IMX27 const struct imx_mxc_mmc_data imx27_mxc_mmc_data[] __initconst = { #define imx27_mxc_mmc_data_entry(_id, _hwid) \ - imx_mxc_mmc_data_entry(MX27, _id, _hwid, SZ_4K) + imx_mxc_mmc_data_entry(MX27, "imx21-mmc", _id, _hwid, SZ_4K) imx27_mxc_mmc_data_entry(0, 1), imx27_mxc_mmc_data_entry(1, 2), }; @@ -42,7 +44,7 @@ const struct imx_mxc_mmc_data imx27_mxc_mmc_data[] __initconst = { #ifdef CONFIG_SOC_IMX31 const struct imx_mxc_mmc_data imx31_mxc_mmc_data[] __initconst = { #define imx31_mxc_mmc_data_entry(_id, _hwid) \ - imx_mxc_mmc_data_entry(MX31, _id, _hwid, SZ_16K) + imx_mxc_mmc_data_entry(MX31, "imx31-mmc", _id, _hwid, SZ_16K) imx31_mxc_mmc_data_entry(0, 1), imx31_mxc_mmc_data_entry(1, 2), }; @@ -67,7 +69,7 @@ struct platform_device *__init imx_add_mxc_mmc( .flags = IORESOURCE_DMA, }, }; - return imx_add_platform_device_dmamask("mxc-mmc", data->id, + return imx_add_platform_device_dmamask(data->devid, data->id, res, ARRAY_SIZE(res), pdata, sizeof(*pdata), DMA_BIT_MASK(32)); } diff --git a/trunk/arch/arm/plat-mxc/devices/platform-mxc_nand.c b/trunk/arch/arm/mach-imx/devices/platform-mxc_nand.c similarity index 74% rename from trunk/arch/arm/plat-mxc/devices/platform-mxc_nand.c rename to trunk/arch/arm/mach-imx/devices/platform-mxc_nand.c index 95b75cc70515..7af1c53e42b5 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-mxc_nand.c +++ b/trunk/arch/arm/mach-imx/devices/platform-mxc_nand.c @@ -7,18 +7,21 @@ * Free Software Foundation. */ #include -#include -#include -#define imx_mxc_nand_data_entry_single(soc, _size) \ +#include "../hardware.h" +#include "devices-common.h" + +#define imx_mxc_nand_data_entry_single(soc, _devid, _size) \ { \ + .devid = _devid, \ .iobase = soc ## _NFC_BASE_ADDR, \ .iosize = _size, \ .irq = soc ## _INT_NFC \ } -#define imx_mxc_nandv3_data_entry_single(soc, _size) \ +#define imx_mxc_nandv3_data_entry_single(soc, _devid, _size) \ { \ + .devid = _devid, \ .id = -1, \ .iobase = soc ## _NFC_BASE_ADDR, \ .iosize = _size, \ @@ -28,32 +31,32 @@ #ifdef CONFIG_SOC_IMX21 const struct imx_mxc_nand_data imx21_mxc_nand_data __initconst = - imx_mxc_nand_data_entry_single(MX21, SZ_4K); + imx_mxc_nand_data_entry_single(MX21, "imx21-nand", SZ_4K); #endif /* ifdef CONFIG_SOC_IMX21 */ #ifdef CONFIG_SOC_IMX25 const struct imx_mxc_nand_data imx25_mxc_nand_data __initconst = - imx_mxc_nand_data_entry_single(MX25, SZ_8K); + imx_mxc_nand_data_entry_single(MX25, "imx25-nand", SZ_8K); #endif /* ifdef CONFIG_SOC_IMX25 */ #ifdef CONFIG_SOC_IMX27 const struct imx_mxc_nand_data imx27_mxc_nand_data __initconst = - imx_mxc_nand_data_entry_single(MX27, SZ_4K); + imx_mxc_nand_data_entry_single(MX27, "imx27-nand", SZ_4K); #endif /* ifdef CONFIG_SOC_IMX27 */ #ifdef CONFIG_SOC_IMX31 const struct imx_mxc_nand_data imx31_mxc_nand_data __initconst = - imx_mxc_nand_data_entry_single(MX31, SZ_4K); + imx_mxc_nand_data_entry_single(MX31, "imx27-nand", SZ_4K); #endif #ifdef CONFIG_SOC_IMX35 const struct imx_mxc_nand_data imx35_mxc_nand_data __initconst = - imx_mxc_nand_data_entry_single(MX35, SZ_8K); + imx_mxc_nand_data_entry_single(MX35, "imx25-nand", SZ_8K); #endif #ifdef CONFIG_SOC_IMX51 const struct imx_mxc_nand_data imx51_mxc_nand_data __initconst = - imx_mxc_nandv3_data_entry_single(MX51, SZ_16K); + imx_mxc_nandv3_data_entry_single(MX51, "imx51-nand", SZ_16K); #endif struct platform_device *__init imx_add_mxc_nand( @@ -76,7 +79,7 @@ struct platform_device *__init imx_add_mxc_nand( .flags = IORESOURCE_MEM, }, }; - return imx_add_platform_device("mxc_nand", data->id, + return imx_add_platform_device(data->devid, data->id, res, ARRAY_SIZE(res) - !data->axibase, pdata, sizeof(*pdata)); } diff --git a/trunk/arch/arm/plat-mxc/devices/platform-mxc_pwm.c b/trunk/arch/arm/mach-imx/devices/platform-mxc_pwm.c similarity index 97% rename from trunk/arch/arm/plat-mxc/devices/platform-mxc_pwm.c rename to trunk/arch/arm/mach-imx/devices/platform-mxc_pwm.c index b0c4ae298111..dcd289777687 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-mxc_pwm.c +++ b/trunk/arch/arm/mach-imx/devices/platform-mxc_pwm.c @@ -6,8 +6,8 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "../hardware.h" +#include "devices-common.h" #define imx_mxc_pwm_data_entry_single(soc, _id, _hwid, _size) \ { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-mxc_rnga.c b/trunk/arch/arm/mach-imx/devices/platform-mxc_rnga.c similarity index 95% rename from trunk/arch/arm/plat-mxc/devices/platform-mxc_rnga.c rename to trunk/arch/arm/mach-imx/devices/platform-mxc_rnga.c index b4b7612b6e17..c58404badb59 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-mxc_rnga.c +++ b/trunk/arch/arm/mach-imx/devices/platform-mxc_rnga.c @@ -6,8 +6,8 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "../hardware.h" +#include "devices-common.h" struct imx_mxc_rnga_data { resource_size_t iobase; diff --git a/trunk/arch/arm/plat-mxc/devices/platform-mxc_rtc.c b/trunk/arch/arm/mach-imx/devices/platform-mxc_rtc.c similarity index 77% rename from trunk/arch/arm/plat-mxc/devices/platform-mxc_rtc.c rename to trunk/arch/arm/mach-imx/devices/platform-mxc_rtc.c index a5c9ad5721c2..c7fffaadf847 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-mxc_rtc.c +++ b/trunk/arch/arm/mach-imx/devices/platform-mxc_rtc.c @@ -6,23 +6,24 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "../hardware.h" +#include "devices-common.h" -#define imx_mxc_rtc_data_entry_single(soc) \ +#define imx_mxc_rtc_data_entry_single(soc, _devid) \ { \ + .devid = _devid, \ .iobase = soc ## _RTC_BASE_ADDR, \ .irq = soc ## _INT_RTC, \ } #ifdef CONFIG_SOC_IMX31 const struct imx_mxc_rtc_data imx31_mxc_rtc_data __initconst = - imx_mxc_rtc_data_entry_single(MX31); + imx_mxc_rtc_data_entry_single(MX31, "imx21-rtc"); #endif /* ifdef CONFIG_SOC_IMX31 */ #ifdef CONFIG_SOC_IMX35 const struct imx_mxc_rtc_data imx35_mxc_rtc_data __initconst = - imx_mxc_rtc_data_entry_single(MX35); + imx_mxc_rtc_data_entry_single(MX35, "imx21-rtc"); #endif /* ifdef CONFIG_SOC_IMX35 */ struct platform_device *__init imx_add_mxc_rtc( @@ -40,6 +41,6 @@ struct platform_device *__init imx_add_mxc_rtc( }, }; - return imx_add_platform_device("mxc_rtc", -1, + return imx_add_platform_device(data->devid, -1, res, ARRAY_SIZE(res), NULL, 0); } diff --git a/trunk/arch/arm/plat-mxc/devices/platform-mxc_w1.c b/trunk/arch/arm/mach-imx/devices/platform-mxc_w1.c similarity index 95% rename from trunk/arch/arm/plat-mxc/devices/platform-mxc_w1.c rename to trunk/arch/arm/mach-imx/devices/platform-mxc_w1.c index 96fa5ea91fe8..88c18b720d63 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-mxc_w1.c +++ b/trunk/arch/arm/mach-imx/devices/platform-mxc_w1.c @@ -6,8 +6,8 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "../hardware.h" +#include "devices-common.h" #define imx_mxc_w1_data_entry_single(soc) \ { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-pata_imx.c b/trunk/arch/arm/mach-imx/devices/platform-pata_imx.c similarity index 96% rename from trunk/arch/arm/plat-mxc/devices/platform-pata_imx.c rename to trunk/arch/arm/mach-imx/devices/platform-pata_imx.c index 70e2f2a44714..e4ec11c8ce55 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-pata_imx.c +++ b/trunk/arch/arm/mach-imx/devices/platform-pata_imx.c @@ -3,8 +3,8 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "../hardware.h" +#include "devices-common.h" #define imx_pata_imx_data_entry_single(soc, _size) \ { \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c b/trunk/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c similarity index 98% rename from trunk/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c rename to trunk/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c index 3793e475cd95..e66a4e316311 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c +++ b/trunk/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c @@ -6,10 +6,11 @@ * Free Software Foundation. */ -#include -#include #include +#include "../hardware.h" +#include "devices-common.h" + #define imx_sdhci_esdhc_imx_data_entry_single(soc, _devid, _id, hwid) \ { \ .devid = _devid, \ diff --git a/trunk/arch/arm/plat-mxc/devices/platform-spi_imx.c b/trunk/arch/arm/mach-imx/devices/platform-spi_imx.c similarity index 98% rename from trunk/arch/arm/plat-mxc/devices/platform-spi_imx.c rename to trunk/arch/arm/mach-imx/devices/platform-spi_imx.c index 9c50c14c8f92..8880bcb11e05 100644 --- a/trunk/arch/arm/plat-mxc/devices/platform-spi_imx.c +++ b/trunk/arch/arm/mach-imx/devices/platform-spi_imx.c @@ -6,8 +6,8 @@ * the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include -#include +#include "../hardware.h" +#include "devices-common.h" #define imx_spi_imx_data_entry_single(soc, type, _devid, _id, hwid, _size) \ { \ diff --git a/trunk/arch/arm/mach-imx/ehci-imx25.c b/trunk/arch/arm/mach-imx/ehci-imx25.c index 412c583a24b0..27e40d17de99 100644 --- a/trunk/arch/arm/mach-imx/ehci-imx25.c +++ b/trunk/arch/arm/mach-imx/ehci-imx25.c @@ -15,10 +15,10 @@ #include #include - -#include #include +#include "hardware.h" + #define USBCTRL_OTGBASE_OFFSET 0x600 #define MX25_OTG_SIC_SHIFT 29 diff --git a/trunk/arch/arm/mach-imx/ehci-imx27.c b/trunk/arch/arm/mach-imx/ehci-imx27.c index cd6e1f81508d..448d9115539d 100644 --- a/trunk/arch/arm/mach-imx/ehci-imx27.c +++ b/trunk/arch/arm/mach-imx/ehci-imx27.c @@ -15,10 +15,10 @@ #include #include - -#include #include +#include "hardware.h" + #define USBCTRL_OTGBASE_OFFSET 0x600 #define MX27_OTG_SIC_SHIFT 29 diff --git a/trunk/arch/arm/mach-imx/ehci-imx31.c b/trunk/arch/arm/mach-imx/ehci-imx31.c index 9a880c78af34..05de4e1e39d7 100644 --- a/trunk/arch/arm/mach-imx/ehci-imx31.c +++ b/trunk/arch/arm/mach-imx/ehci-imx31.c @@ -15,10 +15,10 @@ #include #include - -#include #include +#include "hardware.h" + #define USBCTRL_OTGBASE_OFFSET 0x600 #define MX31_OTG_SIC_SHIFT 29 diff --git a/trunk/arch/arm/mach-imx/ehci-imx35.c b/trunk/arch/arm/mach-imx/ehci-imx35.c index 779e16eb65cb..a596f709a937 100644 --- a/trunk/arch/arm/mach-imx/ehci-imx35.c +++ b/trunk/arch/arm/mach-imx/ehci-imx35.c @@ -15,10 +15,10 @@ #include #include - -#include #include +#include "hardware.h" + #define USBCTRL_OTGBASE_OFFSET 0x600 #define MX35_OTG_SIC_SHIFT 29 diff --git a/trunk/arch/arm/mach-imx/ehci-imx5.c b/trunk/arch/arm/mach-imx/ehci-imx5.c index cf8d00e5cce1..e49710b10c68 100644 --- a/trunk/arch/arm/mach-imx/ehci-imx5.c +++ b/trunk/arch/arm/mach-imx/ehci-imx5.c @@ -15,10 +15,10 @@ #include #include - -#include #include +#include "hardware.h" + #define MXC_OTG_OFFSET 0 #define MXC_H1_OFFSET 0x200 #define MXC_H2_OFFSET 0x400 diff --git a/trunk/arch/arm/plat-mxc/epit.c b/trunk/arch/arm/mach-imx/epit.c similarity index 99% rename from trunk/arch/arm/plat-mxc/epit.c rename to trunk/arch/arm/mach-imx/epit.c index 88726f4dbbfa..04a5961beeac 100644 --- a/trunk/arch/arm/plat-mxc/epit.c +++ b/trunk/arch/arm/mach-imx/epit.c @@ -51,10 +51,10 @@ #include #include #include - -#include #include -#include + +#include "common.h" +#include "hardware.h" static struct clock_event_device clockevent_epit; static enum clock_event_mode clockevent_mode = CLOCK_EVT_MODE_UNUSED; diff --git a/trunk/arch/arm/plat-mxc/include/mach/eukrea-baseboards.h b/trunk/arch/arm/mach-imx/eukrea-baseboards.h similarity index 100% rename from trunk/arch/arm/plat-mxc/include/mach/eukrea-baseboards.h rename to trunk/arch/arm/mach-imx/eukrea-baseboards.h diff --git a/trunk/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c b/trunk/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c index 98aef571b9f8..b4c70028d359 100644 --- a/trunk/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c +++ b/trunk/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c @@ -29,11 +29,10 @@ #include -#include -#include -#include - +#include "common.h" #include "devices-imx27.h" +#include "hardware.h" +#include "iomux-mx27.h" static const int eukrea_mbimx27_pins[] __initconst = { /* UART2 */ diff --git a/trunk/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c b/trunk/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c index 0b84666792f0..e2b70f4c1a2c 100644 --- a/trunk/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c +++ b/trunk/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c @@ -26,14 +26,14 @@ #include #include