From 685f25ed431183fbb10b1ddf16e319a2d14668b8 Mon Sep 17 00:00:00 2001 From: Thomas Abraham Date: Tue, 27 Nov 2012 09:00:32 +0900 Subject: [PATCH] --- yaml --- r: 339946 b: refs/heads/master c: 166e54ab2505abad7aaef7f94b8eb62e0134d939 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/CREDITS | 5 - .../devicetree/bindings/arm/arm-boards | 4 - .../devicetree/bindings/arm/omap/counter.txt | 15 - .../devicetree/bindings/arm/omap/timer.txt | 31 - .../devicetree/bindings/bus/omap-ocp2scp.txt | 18 - .../devicetree/bindings/i2c/fsl-imx-i2c.txt | 4 +- .../bindings/i2c/trivial-devices.txt | 2 - .../devicetree/bindings/net/mdio-gpio.txt | 9 +- .../devicetree/bindings/usb/am33xx-usb.txt | 21 - trunk/Documentation/networking/vxlan.txt | 4 +- trunk/MAINTAINERS | 29 +- trunk/Makefile | 2 +- trunk/arch/alpha/kernel/osf_sys.c | 6 +- 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/Makefile | 6 +- trunk/arch/arm/boot/dts/am335x-bone.dts | 50 -- trunk/arch/arm/boot/dts/am335x-evm.dts | 118 --- trunk/arch/arm/boot/dts/am335x-evmsk.dts | 250 ------ trunk/arch/arm/boot/dts/am33xx.dtsi | 156 +--- 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/integratorap.dts | 5 - trunk/arch/arm/boot/dts/integratorcp.dts | 5 - trunk/arch/arm/boot/dts/omap2.dtsi | 86 -- trunk/arch/arm/boot/dts/omap2420.dtsi | 16 +- trunk/arch/arm/boot/dts/omap2430.dtsi | 19 +- trunk/arch/arm/boot/dts/omap3-beagle-xm.dts | 6 + trunk/arch/arm/boot/dts/omap3-beagle.dts | 67 -- trunk/arch/arm/boot/dts/omap3.dtsi | 107 +-- trunk/arch/arm/boot/dts/omap4-panda-a4.dts | 17 - trunk/arch/arm/boot/dts/omap4-panda.dts | 22 - .../{omap4-panda-es.dts => omap4-pandaES.dts} | 9 - .../arch/arm/boot/dts/omap4-sdp-es23plus.dts | 17 - trunk/arch/arm/boot/dts/omap4-sdp.dts | 22 - .../{omap4-var-som.dts => omap4-var_som.dts} | 0 trunk/arch/arm/boot/dts/omap4.dtsi | 105 +-- trunk/arch/arm/boot/dts/omap5-evm.dts | 13 +- trunk/arch/arm/boot/dts/omap5.dtsi | 178 +---- .../arch/arm/boot/dts/samsung_k3pe0e000b.dtsi | 67 -- trunk/arch/arm/boot/dts/tegra20-harmony.dts | 63 +- trunk/arch/arm/boot/dts/tegra20-paz00.dts | 59 +- trunk/arch/arm/boot/dts/tegra20-seaboard.dts | 59 +- trunk/arch/arm/boot/dts/tegra20-tamonten.dtsi | 63 +- trunk/arch/arm/boot/dts/tegra20-ventana.dts | 59 +- trunk/arch/arm/boot/dts/tegra20-whistler.dts | 119 ++- trunk/arch/arm/boot/dts/tegra30-cardhu.dtsi | 47 +- trunk/arch/arm/boot/dts/twl4030.dtsi | 27 - trunk/arch/arm/boot/dts/twl6030.dtsi | 5 - 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 + trunk/arch/arm/mach-at91/at91sam9g45.c | 1 + .../arm/mach-at91/include/mach/atmel-mci.h | 7 + trunk/arch/arm/mach-bcm2835/Makefile.boot | 4 +- trunk/arch/arm/mach-bcm2835/bcm2835.c | 4 +- .../arch/arm/mach-davinci/board-dm646x-evm.c | 2 +- trunk/arch/arm/mach-davinci/common.c | 2 + trunk/arch/arm/mach-davinci/dm644x.c | 3 +- trunk/arch/arm/mach-davinci/usb.c | 6 + trunk/arch/arm/mach-exynos/Kconfig | 5 - trunk/arch/arm/mach-exynos/Makefile | 1 - trunk/arch/arm/mach-exynos/clock-exynos4.c | 5 + trunk/arch/arm/mach-exynos/clock-exynos5.c | 18 +- trunk/arch/arm/mach-exynos/common.c | 58 +- trunk/arch/arm/mach-exynos/dev-audio.c | 2 +- trunk/arch/arm/mach-exynos/dev-dwmci.c | 75 -- trunk/arch/arm/mach-exynos/dev-ohci.c | 2 +- trunk/arch/arm/mach-exynos/dev-uart.c | 24 + trunk/arch/arm/mach-exynos/dma.c | 3 - .../arch/arm/mach-exynos/include/mach/dwmci.h | 20 - .../arch/arm/mach-exynos/include/mach/irqs.h | 5 + trunk/arch/arm/mach-exynos/include/mach/map.h | 2 +- .../arm/mach-exynos/include/mach/regs-pmu.h | 2 + trunk/arch/arm/mach-exynos/mach-nuri.c | 7 +- trunk/arch/arm/mach-exynos/mach-origen.c | 6 +- trunk/arch/arm/mach-exynos/mach-smdk4x12.c | 2 +- trunk/arch/arm/mach-exynos/mach-smdkv310.c | 6 +- .../arm/mach-exynos/mach-universal_c210.c | 5 +- trunk/arch/arm/mach-imx/Kconfig | 90 +-- trunk/arch/arm/mach-imx/Makefile | 22 - 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 +- 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/mach-imx/cpu_op-mx51.c | 3 +- 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 +- 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 +- .../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 +- trunk/arch/arm/mach-imx/hotplug.c | 3 +- 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 +- 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 +- 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 +- 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 +- trunk/arch/arm/mach-integrator/Kconfig | 2 - trunk/arch/arm/mach-integrator/common.h | 8 +- trunk/arch/arm/mach-integrator/core.c | 141 ++-- .../mach-integrator/include/mach/platform.h | 1 + .../arch/arm/mach-integrator/integrator_ap.c | 158 +--- .../arch/arm/mach-integrator/integrator_cp.c | 115 +-- trunk/arch/arm/mach-integrator/pci_v3.c | 32 +- trunk/arch/arm/mach-kirkwood/board-dockstar.c | 13 + .../arch/arm/mach-kirkwood/board-dreamplug.c | 15 + trunk/arch/arm/mach-kirkwood/board-dt.c | 4 +- .../arch/arm/mach-kirkwood/board-goflexnet.c | 13 + trunk/arch/arm/mach-kirkwood/board-ib62x0.c | 6 + trunk/arch/arm/mach-kirkwood/board-iconnect.c | 8 + .../arm/mach-kirkwood/board-iomega_ix2_200.c | 2 + trunk/arch/arm/mach-kirkwood/board-lsxl.c | 8 + trunk/arch/arm/mach-kirkwood/board-ts219.c | 3 + trunk/arch/arm/mach-kirkwood/common.c | 11 +- trunk/arch/arm/mach-kirkwood/common.h | 3 +- trunk/arch/arm/mach-kirkwood/cpuidle.c | 2 +- trunk/arch/arm/mach-kirkwood/dockstar-setup.c | 2 +- trunk/arch/arm/mach-kirkwood/irq.c | 1 - .../arch/arm/mach-kirkwood/lacie_v2-common.c | 1 - trunk/arch/arm/mach-kirkwood/mpp.c | 4 +- .../arm/mach-kirkwood/netspace_v2-setup.c | 4 +- trunk/arch/arm/mach-kirkwood/openrd-setup.c | 14 +- trunk/arch/arm/mach-kirkwood/pcie.c | 31 +- .../arch/arm/mach-kirkwood/sheevaplug-setup.c | 2 +- trunk/arch/arm/mach-kirkwood/t5325-setup.c | 6 +- trunk/arch/arm/mach-kirkwood/ts41x-setup.c | 3 +- trunk/arch/arm/mach-kirkwood/tsx1x-common.c | 7 +- 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 ------ .../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/timer.c | 1 - trunk/arch/arm/mach-omap1/timer32k.c | 2 +- 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 | 10 +- 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 | 25 +- trunk/arch/arm/mach-omap2/board-h4.c | 10 +- trunk/arch/arm/mach-omap2/board-igep0020.c | 18 +- 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 +- 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 -- .../mach-omap2/{cm3xxx.c => cm2xxx_3xxx.c} | 371 +++------ trunk/arch/arm/mach-omap2/cm2xxx_3xxx.h | 125 ++- trunk/arch/arm/mach-omap2/cm33xx.c | 58 +- 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 | 80 +- .../arm/mach-omap2/common-board-devices.h | 1 + trunk/arch/arm/mach-omap2/common.c | 187 ++++- trunk/arch/arm/mach-omap2/common.h | 147 ++-- trunk/arch/arm/mach-omap2/control.c | 18 +- trunk/arch/arm/mach-omap2/control.h | 2 - trunk/arch/arm/mach-omap2/cpuidle34xx.c | 1 + .../plat => mach-omap2}/debug-devices.h | 7 + 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 ++++++++++- 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 +- .../{ => include/mach}/board-zoom.h | 0 .../arm/mach-omap2/include/mach/debug-macro.S | 2 +- trunk/arch/arm/mach-omap2/include/mach/gpio.h | 3 + .../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 - 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 +- trunk/arch/arm/mach-omap2/omap_hwmod.c | 63 +- .../arm/mach-omap2/omap_hwmod_2420_data.c | 14 +- .../arm/mach-omap2/omap_hwmod_2430_data.c | 13 +- .../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 | 21 +- .../arm/mach-omap2/omap_hwmod_33xx_data.c | 10 +- .../arm/mach-omap2/omap_hwmod_3xxx_data.c | 55 +- .../arm/mach-omap2/omap_hwmod_44xx_data.c | 17 +- .../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 | 6 +- 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 | 391 +++------ trunk/arch/arm/mach-omap2/twl-common.c | 4 +- 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-s3c24xx/clock-s3c2443.c | 6 + trunk/arch/arm/mach-s3c64xx/clock.c | 20 +- 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-s5pv210/mach-goni.c | 1 + trunk/arch/arm/mach-shmobile/setup-r8a7740.c | 6 + trunk/arch/arm/mach-shmobile/setup-sh7372.c | 6 + trunk/arch/arm/mach-tegra/apbio.c | 5 +- trunk/arch/arm/mach-tegra/board-dt-tegra20.c | 4 +- trunk/arch/arm/mach-tegra/board-dt-tegra30.c | 3 +- trunk/arch/arm/mach-tegra/clock.c | 2 + trunk/arch/arm/mach-tegra/common.c | 2 +- trunk/arch/arm/mach-tegra/cpu-tegra.c | 3 + trunk/arch/arm/mach-tegra/cpuidle.c | 2 + trunk/arch/arm/mach-tegra/flowctrl.c | 3 +- trunk/arch/arm/mach-tegra/fuse.c | 3 +- trunk/arch/arm/mach-tegra/headsmp.S | 3 +- .../arm/mach-tegra/include/mach/debug-macro.S | 4 +- trunk/arch/arm/mach-tegra/include/mach/dma.h | 54 ++ .../arm/mach-tegra/{ => include/mach}/iomap.h | 2 + .../mach-tegra/{ => include/mach}/irammap.h | 0 .../arm/mach-tegra/include/mach/powergate.h | 2 - .../arm/mach-tegra/include/mach}/tegra-ahb.h | 6 +- .../arm/mach-tegra/include/mach/uncompress.h | 4 +- trunk/arch/arm/mach-tegra/io.c | 2 +- trunk/arch/arm/mach-tegra/irq.c | 3 +- trunk/arch/arm/mach-tegra/pcie.c | 2 +- trunk/arch/arm/mach-tegra/platsmp.c | 3 +- trunk/arch/arm/mach-tegra/pmc.c | 2 +- trunk/arch/arm/mach-tegra/powergate.c | 2 +- trunk/arch/arm/mach-tegra/reset.c | 5 +- trunk/arch/arm/mach-tegra/sleep-t20.S | 2 + trunk/arch/arm/mach-tegra/sleep-t30.S | 2 + trunk/arch/arm/mach-tegra/sleep.S | 2 +- trunk/arch/arm/mach-tegra/sleep.h | 2 +- trunk/arch/arm/mach-tegra/tegra20_clocks.c | 3 +- .../arch/arm/mach-tegra/tegra20_clocks_data.c | 2 + trunk/arch/arm/mach-tegra/tegra2_emc.c | 2 + trunk/arch/arm/mach-tegra/tegra30_clocks.c | 3 +- trunk/arch/arm/mach-tegra/timer.c | 2 +- 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 +- .../{mach-imx => plat-mxc}/3ds_debugboard.c | 2 +- trunk/arch/arm/plat-mxc/Kconfig | 89 +++ trunk/arch/arm/plat-mxc/Makefile | 24 + trunk/arch/arm/{mach-imx => plat-mxc}/avic.c | 5 +- trunk/arch/arm/{mach-imx => plat-mxc}/cpu.c | 3 +- .../arch/arm/{mach-imx => plat-mxc}/cpufreq.c | 3 +- .../arch/arm/{mach-imx => plat-mxc}/cpuidle.c | 0 .../{mach-imx/devices => plat-mxc}/devices.c | 4 +- .../{mach-imx => plat-mxc}/devices/Kconfig | 0 .../{mach-imx => plat-mxc}/devices/Makefile | 2 - .../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 => plat-mxc}/epit.c | 6 +- .../include/mach}/3ds_debugboard.h | 0 .../include/mach}/board-mx31lilly.h | 0 .../include/mach}/board-mx31lite.h | 0 .../include/mach}/board-mx31moboard.h | 0 .../include/mach}/board-pcm038.h | 0 .../include/mach}/common.h | 1 - .../include/mach}/cpuidle.h | 0 .../include/mach/debug-macro.S} | 33 +- .../include/mach}/devices-common.h | 9 +- .../include/mach}/eukrea-baseboards.h | 0 .../include/mach}/hardware.h | 26 +- .../{mach-imx => plat-mxc/include/mach}/iim.h | 0 .../include/mach}/iomux-mx1.h | 2 +- .../include/mach}/iomux-mx21.h | 4 +- .../include/mach}/iomux-mx25.h | 2 +- .../include/mach}/iomux-mx27.h | 4 +- .../include/mach}/iomux-mx2x.h | 0 .../include/mach}/iomux-mx3.h | 0 .../include/mach}/iomux-mx35.h | 2 +- .../include/mach}/iomux-mx50.h | 2 +- .../include/mach}/iomux-mx51.h | 2 +- .../include/mach}/iomux-v1.h | 0 .../include/mach}/iomux-v3.h | 0 .../arm/plat-mxc/include/mach/ipu.h} | 6 +- .../include/mach}/iram.h | 0 trunk/arch/arm/plat-mxc/include/mach/irqs.h | 21 + .../{mach-imx => plat-mxc/include/mach}/mx1.h | 0 .../include/mach}/mx21.h | 0 .../include/mach}/mx25.h | 0 .../include/mach}/mx27.h | 0 .../include/mach}/mx2x.h | 0 .../include/mach}/mx31.h | 0 .../include/mach}/mx35.h | 0 .../include/mach}/mx3x.h | 0 .../include/mach}/mx50.h | 0 .../include/mach}/mx51.h | 0 .../include/mach}/mx53.h | 0 .../include/mach}/mx6q.h | 0 .../{mach-imx => plat-mxc/include/mach}/mxc.h | 0 trunk/arch/arm/plat-mxc/include/mach/timex.h | 22 + .../include/mach}/ulpi.h | 0 .../arm/plat-mxc/include/mach/uncompress.h | 132 +++ .../arm/{mach-imx => plat-mxc}/iomux-v1.c | 5 +- .../arm/{mach-imx => plat-mxc}/iomux-v3.c | 5 +- .../arm/{mach-imx => plat-mxc}/iram_alloc.c | 3 +- .../arm/{mach-imx => plat-mxc}/irq-common.c | 0 .../arm/{mach-imx => plat-mxc}/irq-common.h | 3 - .../arm/{mach-imx => plat-mxc}/ssi-fiq-ksym.c | 0 .../arch/arm/{mach-imx => plat-mxc}/ssi-fiq.S | 0 .../arch/arm/{mach-imx => plat-mxc}/system.c | 5 +- trunk/arch/arm/{mach-imx => plat-mxc}/time.c | 5 +- trunk/arch/arm/{mach-imx => plat-mxc}/tzic.c | 6 +- trunk/arch/arm/{mach-imx => plat-mxc}/ulpi.c | 2 +- trunk/arch/arm/plat-omap/Kconfig | 6 - 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 | 236 ++---- trunk/arch/arm/plat-omap/fb.c | 62 +- trunk/arch/arm/plat-omap/i2c.c | 155 +++- .../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 ++++++++++- .../arm/plat-omap/include/plat/dma-44xx.h | 147 ++++ .../{plat-omap/dma-omap.h => plat/dma.h} | 201 ++++- .../arch/arm/plat-omap/include/plat/dmtimer.h | 143 ++-- trunk/arch/arm/plat-omap/include/plat/fpga.h | 193 +++++ .../include/plat}/gpmc.h | 61 +- trunk/arch/arm/plat-omap/include/plat/i2c.h | 30 +- .../arm/plat-omap/include/plat/led.h} | 2 + .../arm/plat-omap/include/plat}/menelaus.h | 2 + .../arm/plat-omap/include/plat/mmc.h} | 48 +- trunk/arch/arm/plat-omap/include/plat/multi.h | 120 +++ .../include/plat}/omap-pm.h | 0 .../arm/plat-omap/include/plat/omap-secure.h | 14 + .../include/plat}/omap_device.h | 2 +- .../include/plat}/omap_hwmod.h | 1 + trunk/arch/arm/plat-omap/include/plat/prcm.h | 37 + trunk/arch/arm/plat-omap/include/plat/sdrc.h | 164 ++++ .../mach => plat-omap/include/plat}/serial.h | 29 + trunk/arch/arm/plat-omap/include/plat/sram.h | 97 ++- .../mach => plat-omap/include/plat}/tc.h | 0 .../arm/plat-omap/include/plat/uncompress.h | 204 +++++ trunk/arch/arm/plat-omap/include/plat/usb.h | 179 +++++ .../arm/plat-omap/include/plat/vrfb.h} | 2 - .../{mach-omap2 => plat-omap}/omap-pm-noop.c | 5 +- .../{mach-omap2 => plat-omap}/omap_device.c | 5 +- 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/arch/arm/plat-samsung/adc.c | 48 +- trunk/arch/arm/plat-samsung/devs.c | 4 + .../arch/arm/plat-samsung/include/plat/devs.h | 1 - trunk/arch/m68k/include/asm/signal.h | 6 +- trunk/arch/mips/kernel/setup.c | 26 +- trunk/arch/mips/lib/mips-atomic.c | 8 +- trunk/arch/parisc/kernel/signal32.c | 6 +- trunk/arch/parisc/kernel/sys_parisc.c | 2 - trunk/arch/powerpc/boot/dts/mpc5200b.dtsi | 6 - trunk/arch/powerpc/boot/dts/o2d.dtsi | 6 + trunk/arch/powerpc/boot/dts/pcm030.dts | 7 +- .../arch/powerpc/platforms/52xx/mpc52xx_pic.c | 9 +- trunk/arch/powerpc/platforms/pseries/eeh_pe.c | 2 +- trunk/arch/powerpc/platforms/pseries/msi.c | 3 +- trunk/arch/sparc/include/asm/prom.h | 5 +- trunk/arch/sparc/kernel/signal_64.c | 4 +- trunk/arch/x86/boot/compressed/eboot.c | 2 - trunk/arch/x86/boot/header.S | 3 + trunk/arch/x86/include/asm/ptrace.h | 15 +- trunk/arch/x86/kernel/cpu/amd.c | 14 - trunk/arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- trunk/arch/x86/kernel/cpu/mcheck/mce_intel.c | 31 +- trunk/arch/x86/kernel/entry_64.S | 14 +- trunk/arch/x86/kernel/microcode_amd.c | 8 +- trunk/arch/x86/kernel/ptrace.c | 30 - trunk/arch/x86/mm/tlb.c | 2 +- trunk/arch/x86/pci/ce4100.c | 13 - trunk/arch/x86/platform/ce4100/ce4100.c | 24 - trunk/block/blk-exec.c | 8 +- trunk/drivers/amba/tegra-ahb.c | 1 - trunk/drivers/ata/ahci_platform.c | 2 +- trunk/drivers/ata/libata-acpi.c | 11 +- trunk/drivers/ata/libata-core.c | 4 - trunk/drivers/ata/libata-scsi.c | 2 - trunk/drivers/ata/pata_arasan_cf.c | 8 +- trunk/drivers/ata/sata_highbank.c | 4 +- trunk/drivers/ata/sata_svw.c | 35 - trunk/drivers/base/power/qos.c | 2 +- trunk/drivers/block/aoe/aoecmd.c | 2 +- trunk/drivers/block/floppy.c | 5 +- trunk/drivers/block/mtip32xx/mtip32xx.c | 18 +- trunk/drivers/block/mtip32xx/mtip32xx.h | 6 +- trunk/drivers/bluetooth/hci_ldisc.c | 7 +- trunk/drivers/char/hw_random/omap-rng.c | 2 + trunk/drivers/clk/clk-bcm2835.c | 2 +- trunk/drivers/crypto/omap-aes.c | 8 +- trunk/drivers/crypto/omap-sham.c | 10 +- trunk/drivers/crypto/tegra-aes.c | 2 + 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/edac/amd64_edac.h | 2 +- trunk/drivers/edac/edac_stub.c | 2 +- trunk/drivers/edac/mce_amd_inj.c | 4 +- trunk/drivers/firewire/sbp2.c | 2 - trunk/drivers/gpio/Kconfig | 2 +- trunk/drivers/gpio/gpio-mcp23s08.c | 6 +- trunk/drivers/gpio/gpio-mvebu.c | 23 - trunk/drivers/gpio/gpio-pxa.c | 2 +- .../gpu/drm/nouveau/core/engine/disp/nv50.c | 19 +- .../drm/nouveau/core/engine/graph/ctxnv40.c | 12 +- .../gpu/drm/nouveau/core/engine/graph/nv40.c | 4 +- .../gpu/drm/nouveau/core/engine/graph/nv40.h | 2 +- .../drm/nouveau/core/include/core/object.h | 14 +- .../drm/nouveau/core/include/subdev/clock.h | 3 +- .../gpu/drm/nouveau/core/subdev/bios/dcb.c | 2 +- .../gpu/drm/nouveau/core/subdev/clock/nva3.c | 19 - .../gpu/drm/nouveau/core/subdev/clock/nvc0.c | 1 - trunk/drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 - trunk/drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +- trunk/drivers/gpu/drm/radeon/evergreen.c | 2 - trunk/drivers/gpu/drm/radeon/radeon_agp.c | 5 +- trunk/drivers/i2c/busses/i2c-at91.c | 7 +- trunk/drivers/i2c/busses/i2c-imx.c | 40 +- trunk/drivers/i2c/busses/i2c-mxs.c | 2 - trunk/drivers/i2c/busses/i2c-omap.c | 36 +- trunk/drivers/i2c/busses/i2c-s3c2410.c | 1 - trunk/drivers/input/input-mt.c | 4 - trunk/drivers/input/mousedev.c | 4 +- trunk/drivers/input/touchscreen/ads7846.c | 6 +- trunk/drivers/iommu/intel-iommu.c | 4 +- trunk/drivers/iommu/tegra-smmu.c | 5 +- trunk/drivers/md/dm.c | 8 +- trunk/drivers/md/md.c | 27 +- trunk/drivers/md/raid10.c | 131 ++- trunk/drivers/md/raid5.c | 79 +- 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/devices/slram.c | 2 +- trunk/drivers/mtd/nand/mxc_nand.c | 96 +-- trunk/drivers/mtd/nand/nand_base.c | 10 +- trunk/drivers/mtd/nand/omap2.c | 129 +-- trunk/drivers/mtd/ofpart.c | 2 +- trunk/drivers/mtd/onenand/omap2.c | 47 +- trunk/drivers/mtd/onenand/onenand_base.c | 2 +- trunk/drivers/net/bonding/bond_main.c | 7 - trunk/drivers/net/ethernet/8390/ne.c | 1 - .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 11 +- trunk/drivers/net/ethernet/realtek/8139cp.c | 22 +- trunk/drivers/net/ethernet/sis/sis900.c | 2 +- .../net/ethernet/xilinx/xilinx_axienet_main.c | 2 - .../drivers/net/ethernet/xscale/ixp4xx_eth.c | 8 +- trunk/drivers/net/irda/sir_dev.c | 2 +- trunk/drivers/net/phy/mdio-gpio.c | 11 +- trunk/drivers/net/team/team_mode_broadcast.c | 6 +- trunk/drivers/net/wan/ixp4xx_hss.c | 8 +- trunk/drivers/net/wireless/ath/ath9k/hw.c | 2 +- .../net/wireless/iwlwifi/dvm/mac80211.c | 14 - trunk/drivers/net/wireless/iwlwifi/pcie/tx.c | 8 + trunk/drivers/net/wireless/mwifiex/cmdevt.c | 11 +- trunk/drivers/net/wireless/mwifiex/sdio.c | 11 +- .../net/wireless/rtlwifi/rtl8192cu/sw.c | 1 - trunk/drivers/net/xen-netfront.c | 98 +-- trunk/drivers/nfc/pn533.c | 25 +- trunk/drivers/pcmcia/omap_cf.c | 2 +- trunk/drivers/pinctrl/Kconfig | 2 +- trunk/drivers/rtc/rtc-mxc.c | 34 +- trunk/drivers/scsi/isci/request.c | 2 +- trunk/drivers/scsi/scsi.c | 45 -- trunk/drivers/scsi/scsi_lib.c | 22 +- trunk/drivers/scsi/sd.c | 202 +---- trunk/drivers/scsi/sd.h | 7 - trunk/drivers/staging/nvec/nvec.c | 1 + .../drivers/staging/tidspbridge/core/ue_deh.c | 1 + .../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/ehci-tegra.c | 5 +- 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/usb/phy/tegra_usb_phy.c | 4 +- trunk/drivers/usb/storage/scsiglue.c | 6 - 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/dsi.c | 13 +- trunk/drivers/video/omap2/dss/dss.c | 53 +- 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 | 7 +- .../drivers/video/omap2/omapfb/omapfb-ioctl.c | 4 +- .../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/drivers/xen/privcmd.c | 18 +- trunk/fs/devpts/inode.c | 61 +- trunk/fs/ext3/balloc.c | 5 +- trunk/fs/file.c | 1 + trunk/fs/jffs2/file.c | 39 +- trunk/fs/notify/fanotify/fanotify_user.c | 3 +- trunk/fs/reiserfs/inode.c | 10 +- trunk/fs/reiserfs/stree.c | 4 - trunk/fs/reiserfs/super.c | 60 +- trunk/fs/xfs/xfs_aops.c | 54 +- trunk/fs/xfs/xfs_attr_leaf.c | 20 +- trunk/fs/xfs/xfs_buf.c | 14 +- trunk/include/drm/drm_pciids.h | 1 - trunk/include/linux/devpts_fs.h | 20 +- trunk/include/linux/i2c-omap.h | 1 - trunk/include/linux/of_address.h | 2 - .../linux/platform_data/asoc-imx-ssi.h | 2 - trunk/include/linux/platform_data/dma-imx.h | 4 +- .../linux/platform_data/dmtimer-omap.h | 31 - trunk/include/linux/platform_data/gpio-omap.h | 1 + .../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/spi/ads7846.h | 5 +- trunk/include/linux/tty.h | 44 +- trunk/include/linux/tty_flip.h | 2 +- trunk/include/net/xfrm.h | 2 +- trunk/include/scsi/scsi_device.h | 4 - trunk/include/video/omapdss.h | 14 - trunk/kernel/printk.c | 12 +- trunk/lib/mpi/longlong.h | 19 +- trunk/mm/page_alloc.c | 2 +- trunk/net/core/net-sysfs.c | 20 - trunk/net/ipv4/route.c | 9 +- trunk/net/ipv4/xfrm4_policy.c | 13 +- trunk/net/ipv6/inet6_connection_sock.c | 3 +- trunk/net/mac80211/ibss.c | 8 +- trunk/net/netfilter/ipset/ip_set_hash_ip.c | 4 +- .../net/netfilter/ipset/ip_set_hash_ipport.c | 7 +- .../netfilter/ipset/ip_set_hash_ipportip.c | 7 +- .../netfilter/ipset/ip_set_hash_ipportnet.c | 7 +- trunk/net/netfilter/nfnetlink_cttimeout.c | 3 +- trunk/net/nfc/llcp/llcp.c | 2 +- trunk/scripts/sign-file | 6 +- trunk/security/selinux/netnode.c | 3 +- trunk/sound/pci/hda/hda_codec.c | 13 +- trunk/sound/pci/hda/hda_codec.h | 1 - trunk/sound/pci/hda/hda_intel.c | 39 +- trunk/sound/pci/hda/patch_cirrus.c | 1 - trunk/sound/pci/hda/patch_realtek.c | 1 - trunk/sound/soc/codecs/arizona.c | 4 +- trunk/sound/soc/codecs/cs4271.c | 11 +- trunk/sound/soc/fsl/imx-pcm-fiq.c | 1 + trunk/sound/soc/fsl/imx-ssi.c | 1 + trunk/sound/soc/kirkwood/kirkwood-dma.c | 3 +- trunk/sound/soc/kirkwood/kirkwood-i2s.c | 74 +- 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 + trunk/sound/soc/samsung/bells.c | 4 +- trunk/sound/soc/tegra/tegra30_ahub.c | 1 + trunk/sound/soc/tegra/tegra_pcm.h | 2 + trunk/sound/usb/midi.c | 8 +- trunk/sound/usb/pcm.c | 2 +- 922 files changed, 12088 insertions(+), 15061 deletions(-) delete mode 100644 trunk/Documentation/devicetree/bindings/arm/omap/counter.txt delete mode 100644 trunk/Documentation/devicetree/bindings/arm/omap/timer.txt create mode 100644 trunk/arch/arm/boot/compressed/head-vt8500.S delete mode 100644 trunk/arch/arm/boot/dts/am335x-evmsk.dts delete mode 100644 trunk/arch/arm/boot/dts/omap3-beagle.dts delete mode 100644 trunk/arch/arm/boot/dts/omap4-panda-a4.dts rename trunk/arch/arm/boot/dts/{omap4-panda-es.dts => omap4-pandaES.dts} (70%) delete mode 100644 trunk/arch/arm/boot/dts/omap4-sdp-es23plus.dts rename trunk/arch/arm/boot/dts/{omap4-var-som.dts => omap4-var_som.dts} (100%) delete mode 100644 trunk/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi delete mode 100644 trunk/arch/arm/mach-exynos/dev-dwmci.c delete mode 100644 trunk/arch/arm/mach-exynos/include/mach/dwmci.h create mode 100644 trunk/arch/arm/mach-imx/include/mach/dma-mx1-mx2.h delete mode 100644 trunk/arch/arm/mach-omap1/dma.h delete mode 100644 trunk/arch/arm/mach-omap1/fpga.h create mode 100644 trunk/arch/arm/mach-omap1/include/mach/gpio.h delete mode 100644 trunk/arch/arm/mach-omap1/include/mach/serial.h delete mode 100644 trunk/arch/arm/mach-omap1/include/mach/soc.h delete mode 100644 trunk/arch/arm/mach-omap1/mmc.h delete mode 100644 trunk/arch/arm/mach-omap1/soc.h delete mode 100644 trunk/arch/arm/mach-omap1/sram-init.c delete mode 100644 trunk/arch/arm/mach-omap1/sram.h create mode 100644 trunk/arch/arm/mach-omap2/clockdomain2xxx_3xxx.c create mode 100644 trunk/arch/arm/mach-omap2/clockdomain33xx.c create mode 100644 trunk/arch/arm/mach-omap2/clockdomain44xx.c delete mode 100644 trunk/arch/arm/mach-omap2/cm2xxx.c delete mode 100644 trunk/arch/arm/mach-omap2/cm2xxx.h rename trunk/arch/arm/mach-omap2/{cm3xxx.c => cm2xxx_3xxx.c} (67%) delete mode 100644 trunk/arch/arm/mach-omap2/cm3xxx.h delete mode 100644 trunk/arch/arm/mach-omap2/cm_common.c rename trunk/arch/arm/{plat-omap/include/plat => mach-omap2}/debug-devices.h (54%) delete mode 100644 trunk/arch/arm/mach-omap2/dma.h delete mode 100644 trunk/arch/arm/mach-omap2/gpmc-nand.h delete mode 100644 trunk/arch/arm/mach-omap2/gpmc-onenand.h delete mode 100644 trunk/arch/arm/mach-omap2/i2c.h rename trunk/arch/arm/mach-omap2/{ => include/mach}/board-zoom.h (100%) create mode 100644 trunk/arch/arm/mach-omap2/include/mach/gpio.h delete mode 100644 trunk/arch/arm/mach-omap2/mmc.h delete mode 100644 trunk/arch/arm/mach-omap2/omap2-restart.c delete mode 100644 trunk/arch/arm/mach-omap2/omap3-restart.c create mode 100644 trunk/arch/arm/mach-omap2/powerdomain2xxx_3xxx.c create mode 100644 trunk/arch/arm/mach-omap2/powerdomain33xx.c create mode 100644 trunk/arch/arm/mach-omap2/powerdomain44xx.c create mode 100644 trunk/arch/arm/mach-omap2/prcm.c delete mode 100644 trunk/arch/arm/mach-omap2/prm2xxx.c delete mode 100644 trunk/arch/arm/mach-omap2/prm2xxx.h delete mode 100644 trunk/arch/arm/mach-omap2/prm3xxx.c delete mode 100644 trunk/arch/arm/mach-omap2/prm3xxx.h delete mode 100644 trunk/arch/arm/mach-omap2/serial.h delete mode 100644 trunk/arch/arm/mach-omap2/sram.c delete mode 100644 trunk/arch/arm/mach-omap2/sram.h delete mode 100644 trunk/arch/arm/mach-omap2/usb.h create mode 100644 trunk/arch/arm/mach-pxa/include/mach/pxa95x.h create mode 100644 trunk/arch/arm/mach-pxa/pxa95x.c create mode 100644 trunk/arch/arm/mach-pxa/saarb.c create mode 100644 trunk/arch/arm/mach-pxa/tavorevb3.c create mode 100644 trunk/arch/arm/mach-tegra/include/mach/dma.h rename trunk/arch/arm/mach-tegra/{ => include/mach}/iomap.h (99%) rename trunk/arch/arm/mach-tegra/{ => include/mach}/irammap.h (100%) rename trunk/{include/linux => arch/arm/mach-tegra/include/mach}/tegra-ahb.h (86%) create mode 100644 trunk/arch/arm/mach-vt8500/include/mach/hardware.h create mode 100644 trunk/arch/arm/mach-vt8500/include/mach/i8042.h create mode 100644 trunk/arch/arm/mach-vt8500/include/mach/restart.h create mode 100644 trunk/arch/arm/mach-zynq/include/mach/clkdev.h rename trunk/arch/arm/{mach-imx => plat-mxc}/3ds_debugboard.c (99%) create mode 100644 trunk/arch/arm/plat-mxc/Kconfig create mode 100644 trunk/arch/arm/plat-mxc/Makefile rename trunk/arch/arm/{mach-imx => plat-mxc}/avic.c (98%) rename trunk/arch/arm/{mach-imx => plat-mxc}/cpu.c (97%) rename trunk/arch/arm/{mach-imx => plat-mxc}/cpufreq.c (99%) rename trunk/arch/arm/{mach-imx => plat-mxc}/cpuidle.c (100%) rename trunk/arch/arm/{mach-imx/devices => plat-mxc}/devices.c (92%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/Kconfig (100%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/Makefile (98%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-ahci-imx.c (98%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-fec.c (97%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-flexcan.c (96%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-fsl-usb2-udc.c (96%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-gpio-mxc.c (96%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-gpio_keys.c (94%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-imx-dma.c (63%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-imx-fb.c (79%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-imx-i2c.c (76%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-imx-keypad.c (97%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-imx-ssi.c (98%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-imx-uart.c (98%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-imx2-wdt.c (97%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-imx21-hcd.c (94%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-imx27-coda.c (93%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-imx_udc.c (96%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-imxdi_rtc.c (94%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-ipu-core.c (98%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-mx1-camera.c (94%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-mx2-camera.c (83%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-mxc-ehci.c (97%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-mxc-mmc.c (76%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-mxc_nand.c (74%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-mxc_pwm.c (97%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-mxc_rnga.c (95%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-mxc_rtc.c (77%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-mxc_w1.c (95%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-pata_imx.c (96%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-sdhci-esdhc-imx.c (98%) rename trunk/arch/arm/{mach-imx => plat-mxc}/devices/platform-spi_imx.c (98%) rename trunk/arch/arm/{mach-imx => plat-mxc}/epit.c (99%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/3ds_debugboard.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/board-mx31lilly.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/board-mx31lite.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/board-mx31moboard.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/board-pcm038.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/common.h (99%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/cpuidle.h (100%) rename trunk/arch/arm/{include/debug/imx.S => plat-mxc/include/mach/debug-macro.S} (59%) rename trunk/arch/arm/{mach-imx/devices => plat-mxc/include/mach}/devices-common.h (97%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/eukrea-baseboards.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/hardware.h (94%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/iim.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/iomux-mx1.h (99%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/iomux-mx21.h (99%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/iomux-mx25.h (99%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/iomux-mx27.h (99%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/iomux-mx2x.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/iomux-mx3.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/iomux-mx35.h (99%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/iomux-mx50.h (99%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/iomux-mx51.h (99%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/iomux-v1.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/iomux-v3.h (100%) rename trunk/{include/linux/dma/ipu-dma.h => arch/arm/plat-mxc/include/mach/ipu.h} (97%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/iram.h (100%) create mode 100644 trunk/arch/arm/plat-mxc/include/mach/irqs.h rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/mx1.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/mx21.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/mx25.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/mx27.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/mx2x.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/mx31.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/mx35.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/mx3x.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/mx50.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/mx51.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/mx53.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/mx6q.h (100%) rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/mxc.h (100%) create mode 100644 trunk/arch/arm/plat-mxc/include/mach/timex.h rename trunk/arch/arm/{mach-imx => plat-mxc/include/mach}/ulpi.h (100%) create mode 100644 trunk/arch/arm/plat-mxc/include/mach/uncompress.h rename trunk/arch/arm/{mach-imx => plat-mxc}/iomux-v1.c (98%) rename trunk/arch/arm/{mach-imx => plat-mxc}/iomux-v3.c (97%) rename trunk/arch/arm/{mach-imx => plat-mxc}/iram_alloc.c (98%) rename trunk/arch/arm/{mach-imx => plat-mxc}/irq-common.c (100%) rename trunk/arch/arm/{mach-imx => plat-mxc}/irq-common.h (94%) rename trunk/arch/arm/{mach-imx => plat-mxc}/ssi-fiq-ksym.c (100%) rename trunk/arch/arm/{mach-imx => plat-mxc}/ssi-fiq.S (100%) rename trunk/arch/arm/{mach-imx => plat-mxc}/system.c (97%) rename trunk/arch/arm/{mach-imx => plat-mxc}/time.c (99%) rename trunk/arch/arm/{mach-imx => plat-mxc}/tzic.c (98%) rename trunk/arch/arm/{mach-imx => plat-mxc}/ulpi.c (99%) create mode 100644 trunk/arch/arm/plat-omap/clock.c create mode 100644 trunk/arch/arm/plat-omap/common.c create mode 100644 trunk/arch/arm/plat-omap/include/plat/clkdev_omap.h create mode 100644 trunk/arch/arm/plat-omap/include/plat/clock.h create mode 100644 trunk/arch/arm/plat-omap/include/plat/common.h delete mode 100644 trunk/arch/arm/plat-omap/include/plat/counter-32k.h create mode 100644 trunk/arch/arm/plat-omap/include/plat/dma-44xx.h rename trunk/arch/arm/plat-omap/include/{plat-omap/dma-omap.h => plat/dma.h} (60%) create mode 100644 trunk/arch/arm/plat-omap/include/plat/fpga.h rename trunk/arch/arm/{mach-omap2 => plat-omap/include/plat}/gpmc.h (67%) rename trunk/{include/linux/platform_data/leds-omap.h => arch/arm/plat-omap/include/plat/led.h} (91%) rename trunk/{include/linux/mfd => arch/arm/plat-omap/include/plat}/menelaus.h (96%) rename trunk/{include/linux/platform_data/mmc-omap.h => arch/arm/plat-omap/include/plat/mmc.h} (80%) create mode 100644 trunk/arch/arm/plat-omap/include/plat/multi.h rename trunk/arch/arm/{mach-omap2 => plat-omap/include/plat}/omap-pm.h (100%) create mode 100644 trunk/arch/arm/plat-omap/include/plat/omap-secure.h rename trunk/arch/arm/{mach-omap2 => plat-omap/include/plat}/omap_device.h (99%) rename trunk/arch/arm/{mach-omap2 => plat-omap/include/plat}/omap_hwmod.h (99%) create mode 100644 trunk/arch/arm/plat-omap/include/plat/prcm.h create mode 100644 trunk/arch/arm/plat-omap/include/plat/sdrc.h rename trunk/arch/arm/{mach-omap2/include/mach => plat-omap/include/plat}/serial.h (81%) rename trunk/arch/arm/{mach-omap1/include/mach => plat-omap/include/plat}/tc.h (100%) create mode 100644 trunk/arch/arm/plat-omap/include/plat/uncompress.h create mode 100644 trunk/arch/arm/plat-omap/include/plat/usb.h rename trunk/{include/video/omapvrfb.h => arch/arm/plat-omap/include/plat/vrfb.h} (95%) rename trunk/arch/arm/{mach-omap2 => plat-omap}/omap-pm-noop.c (98%) rename trunk/arch/arm/{mach-omap2 => plat-omap}/omap_device.c (99%) create mode 100644 trunk/arch/arm/plat-omap/sram.h delete mode 100644 trunk/drivers/mfd/omap-usb.h delete mode 100644 trunk/include/linux/platform_data/dmtimer-omap.h delete mode 100644 trunk/include/linux/platform_data/omap-wd-timer.h delete mode 100644 trunk/include/linux/platform_data/usb-omap.h diff --git a/[refs] b/[refs] index 707c1a86f2e7..dbbbc467d5fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73f14f6d007df1596da7cea9113084acfe846b8f +refs/heads/master: 166e54ab2505abad7aaef7f94b8eb62e0134d939 diff --git a/trunk/CREDITS b/trunk/CREDITS index 2346b09ca8bb..d8fe12a9421f 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -1823,11 +1823,6 @@ S: Kattreinstr 38 S: D-64295 S: Germany -N: Avi Kivity -E: avi.kivity@gmail.com -D: Kernel-based Virtual Machine (KVM) -S: Ra'annana, Israel - N: Andi Kleen E: andi@firstfloor.org U: http://www.halobates.de diff --git a/trunk/Documentation/devicetree/bindings/arm/arm-boards b/trunk/Documentation/devicetree/bindings/arm/arm-boards index db5858e32d3f..fc81a7d6b0f1 100644 --- a/trunk/Documentation/devicetree/bindings/arm/arm-boards +++ b/trunk/Documentation/devicetree/bindings/arm/arm-boards @@ -9,10 +9,6 @@ Required properties (in root node): FPGA type interrupt controllers, see the versatile-fpga-irq binding doc. -In the root node the Integrator/CP must have a /cpcon node pointing -to the CP control registers, and the Integrator/AP must have a -/syscon node pointing to the Integrator/AP system controller. - ARM Versatile Application and Platform Baseboards ------------------------------------------------- diff --git a/trunk/Documentation/devicetree/bindings/arm/omap/counter.txt b/trunk/Documentation/devicetree/bindings/arm/omap/counter.txt deleted file mode 100644 index 5bd8aa091315..000000000000 --- a/trunk/Documentation/devicetree/bindings/arm/omap/counter.txt +++ /dev/null @@ -1,15 +0,0 @@ -OMAP Counter-32K bindings - -Required properties: -- compatible: Must be "ti,omap-counter32k" for OMAP controllers -- reg: Contains timer register address range (base address and length) -- ti,hwmods: Name of the hwmod associated to the counter, which is typically - "counter_32k" - -Example: - -counter32k: counter@4a304000 { - compatible = "ti,omap-counter32k"; - reg = <0x4a304000 0x20>; - ti,hwmods = "counter_32k"; -}; diff --git a/trunk/Documentation/devicetree/bindings/arm/omap/timer.txt b/trunk/Documentation/devicetree/bindings/arm/omap/timer.txt deleted file mode 100644 index 8732d4d41f8b..000000000000 --- a/trunk/Documentation/devicetree/bindings/arm/omap/timer.txt +++ /dev/null @@ -1,31 +0,0 @@ -OMAP Timer bindings - -Required properties: -- compatible: Must be "ti,omap2-timer" for OMAP2+ controllers. -- reg: Contains timer register address range (base address and - length). -- interrupts: Contains the interrupt information for the timer. The - format is being dependent on which interrupt controller - the OMAP device uses. -- ti,hwmods: Name of the hwmod associated to the timer, "timer", - where is the instance number of the timer from the - HW spec. - -Optional properties: -- ti,timer-alwon: Indicates the timer is in an alway-on power domain. -- ti,timer-dsp: Indicates the timer can interrupt the on-chip DSP in - addition to the ARM CPU. -- ti,timer-pwm: Indicates the timer can generate a PWM output. -- ti,timer-secure: Indicates the timer is reserved on a secure OMAP device - and therefore cannot be used by the kernel. - -Example: - -timer12: timer@48304000 { - compatible = "ti,omap2-timer"; - reg = <0x48304000 0x400>; - interrupts = <95>; - ti,hwmods = "timer12" - ti,timer-alwon; - ti,timer-secure; -}; diff --git a/trunk/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt b/trunk/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt index 63dd8051521c..d2fe064a828b 100644 --- a/trunk/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt +++ b/trunk/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt @@ -2,27 +2,9 @@ properties: - compatible : Should be "ti,omap-ocp2scp" -- reg : Address and length of the register set for the device - #address-cells, #size-cells : Must be present if the device has sub-nodes - ranges : the child address space are mapped 1:1 onto the parent address space - ti,hwmods : must be "ocp2scp_usb_phy" Sub-nodes: All the devices connected to ocp2scp are described using sub-node to ocp2scp - -ocp2scp@4a0ad000 { - compatible = "ti,omap-ocp2scp"; - reg = <0x4a0ad000 0x1f>; - #address-cells = <1>; - #size-cells = <1>; - ranges; - ti,hwmods = "ocp2scp_usb_phy"; - - subnode1 { - ... - }; - - subnode2 { - ... - }; -}; diff --git a/trunk/Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt b/trunk/Documentation/devicetree/bindings/i2c/fsl-imx-i2c.txt index 3614242e7732..f3cf43b66f7e 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,imx21-i2c"; + compatible = "fsl,imx51-i2c", "fsl,imx1-i2c"; reg = <0x83fc4000 0x4000>; interrupts = <63>; }; i2c@70038000 { /* HS-I2C on i.MX51 */ - compatible = "fsl,imx51-i2c", "fsl,imx21-i2c"; + compatible = "fsl,imx51-i2c", "fsl,imx1-i2c"; reg = <0x70038000 0x4000>; interrupts = <64>; clock-frequency = <400000>; diff --git a/trunk/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/trunk/Documentation/devicetree/bindings/i2c/trivial-devices.txt index 446859fcdca4..2f5322b119eb 100644 --- a/trunk/Documentation/devicetree/bindings/i2c/trivial-devices.txt +++ b/trunk/Documentation/devicetree/bindings/i2c/trivial-devices.txt @@ -55,7 +55,5 @@ st-micro,24c256 i2c serial eeprom (24cxx) stm,m41t00 Serial Access TIMEKEEPER stm,m41t62 Serial real-time clock (RTC) with alarm stm,m41t80 M41T80 - SERIAL ACCESS RTC WITH ALARMS -taos,tsl2550 Ambient Light Sensor with SMBUS/Two Wire Serial Interface ti,tsc2003 I2C Touch-Screen Controller ti,tmp102 Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface -ti,tmp275 Digital Temperature Sensor diff --git a/trunk/Documentation/devicetree/bindings/net/mdio-gpio.txt b/trunk/Documentation/devicetree/bindings/net/mdio-gpio.txt index c79bab025369..bc9549529014 100644 --- a/trunk/Documentation/devicetree/bindings/net/mdio-gpio.txt +++ b/trunk/Documentation/devicetree/bindings/net/mdio-gpio.txt @@ -8,16 +8,9 @@ gpios property as described in section VIII.1 in the following order: MDC, MDIO. -Note: Each gpio-mdio bus should have an alias correctly numbered in "aliases" -node. - Example: -aliases { - mdio-gpio0 = <&mdio0>; -}; - -mdio0: mdio { +mdio { compatible = "virtual,mdio-gpio"; #address-cells = <1>; #size-cells = <0>; diff --git a/trunk/Documentation/devicetree/bindings/usb/am33xx-usb.txt b/trunk/Documentation/devicetree/bindings/usb/am33xx-usb.txt index 707c1a2dae06..ca8fa56e9f03 100644 --- a/trunk/Documentation/devicetree/bindings/usb/am33xx-usb.txt +++ b/trunk/Documentation/devicetree/bindings/usb/am33xx-usb.txt @@ -1,7 +1,5 @@ AM33XX MUSB GLUE - compatible : Should be "ti,musb-am33xx" - - reg : offset and length of register sets, first usbss, then for musb instances - - interrupts : usbss, musb instance interrupts in order - ti,hwmods : must be "usb_otg_hs" - multipoint : Should be "1" indicating the musb controller supports multipoint. This is a MUSB configuration-specific setting. @@ -14,22 +12,3 @@ AM33XX MUSB GLUE represents PERIPHERAL. - power : Should be "250". This signifies the controller can supply upto 500mA when operating in host mode. - -Example: - -usb@47400000 { - compatible = "ti,musb-am33xx"; - reg = <0x47400000 0x1000 /* usbss */ - 0x47401000 0x800 /* musb instance 0 */ - 0x47401800 0x800>; /* musb instance 1 */ - interrupts = <17 /* usbss */ - 18 /* musb instance 0 */ - 19>; /* musb instance 1 */ - multipoint = <1>; - num-eps = <16>; - ram-bits = <12>; - port0-mode = <3>; - port1-mode = <3>; - power = <250>; - ti,hwmods = "usb_otg_hs"; -}; diff --git a/trunk/Documentation/networking/vxlan.txt b/trunk/Documentation/networking/vxlan.txt index 6d993510f091..5b34b762d7d5 100644 --- a/trunk/Documentation/networking/vxlan.txt +++ b/trunk/Documentation/networking/vxlan.txt @@ -32,7 +32,7 @@ no entry is in the forwarding table. # ip link delete vxlan0 3. Show vxlan info - # ip -d link show vxlan0 + # ip -d show vxlan0 It is possible to create, destroy and display the vxlan forwarding table using the new bridge command. @@ -41,7 +41,7 @@ forwarding table using the new bridge command. # bridge fdb add to 00:17:42:8a:b4:05 dst 192.19.0.2 dev vxlan0 2. Delete forwarding table entry - # bridge fdb delete 00:17:42:8a:b4:05 dev vxlan0 + # bridge fdb delete 00:17:42:8a:b4:05 3. Show forwarding table # bridge fdb show dev vxlan0 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 140ebd063f1b..bb0b27db673f 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -526,17 +526,17 @@ F: drivers/video/geode/ F: arch/x86/include/asm/geode.h AMD IOMMU (AMD-VI) -M: Joerg Roedel +M: Joerg Roedel L: iommu@lists.linux-foundation.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git -S: Maintained +S: Supported F: drivers/iommu/amd_iommu*.[ch] F: include/linux/amd-iommu.h AMD MICROCODE UPDATE SUPPORT -M: Andreas Herrmann +M: Andreas Herrmann L: amd64-microcode@amd64.org -S: Maintained +S: Supported F: arch/x86/kernel/microcode_amd.c AMS (Apple Motion Sensor) DRIVER @@ -797,6 +797,7 @@ 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 @@ -840,14 +841,6 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git F: arch/arm/mach-sa1100/jornada720.c F: arch/arm/mach-sa1100/include/mach/jornada720.h -ARM/IGEP MACHINE SUPPORT -M: Enric Balletbo i Serra -M: Javier Martinez Canillas -L: linux-omap@vger.kernel.org -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-omap2/board-igep0020.c - ARM/INCOME PXA270 SUPPORT M: Marek Vasut L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -2715,10 +2708,10 @@ F: include/linux/edac.h EDAC-AMD64 M: Doug Thompson -M: Borislav Petkov +M: Borislav Petkov L: linux-edac@vger.kernel.org W: bluesmoke.sourceforge.net -S: Maintained +S: Supported F: drivers/edac/amd64_edac* EDAC-E752X @@ -3760,7 +3753,7 @@ S: Maintained F: drivers/platform/x86/ideapad-laptop.c IDE/ATAPI DRIVERS -M: Borislav Petkov +M: Borislav Petkov L: linux-ide@vger.kernel.org S: Maintained F: Documentation/cdrom/ide-cd @@ -4287,8 +4280,8 @@ F: include/linux/lockd/ F: include/linux/sunrpc/ KERNEL VIRTUAL MACHINE (KVM) +M: Avi Kivity M: Marcelo Tosatti -M: Gleb Natapov L: kvm@vger.kernel.org W: http://kvm.qumranet.com S: Supported @@ -5420,7 +5413,7 @@ S: Maintained F: sound/drivers/opl4/ OPROFILE -M: Robert Richter +M: Robert Richter L: oprofile-list@lists.sf.net S: Maintained F: arch/*/include/asm/oprofile*.h @@ -8205,7 +8198,7 @@ F: drivers/platform/x86 X86 MCE INFRASTRUCTURE M: Tony Luck -M: Borislav Petkov +M: Borislav Petkov L: linux-edac@vger.kernel.org S: Maintained F: arch/x86/kernel/cpu/mcheck/* diff --git a/trunk/Makefile b/trunk/Makefile index 3d2fc460b22f..9f6ca124e890 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 7 SUBLEVEL = 0 -EXTRAVERSION = -rc7 +EXTRAVERSION = -rc6 NAME = Terrified Chipmunk # *DOCUMENTATION* diff --git a/trunk/arch/alpha/kernel/osf_sys.c b/trunk/arch/alpha/kernel/osf_sys.c index 14db93e4c8a8..1e6956a90608 100644 --- a/trunk/arch/alpha/kernel/osf_sys.c +++ b/trunk/arch/alpha/kernel/osf_sys.c @@ -445,7 +445,7 @@ struct procfs_args { * unhappy with OSF UFS. [CHECKME] */ static int -osf_ufs_mount(const char *dirname, struct ufs_args __user *args, int flags) +osf_ufs_mount(char *dirname, struct ufs_args __user *args, int flags) { int retval; struct cdfs_args tmp; @@ -465,7 +465,7 @@ osf_ufs_mount(const char *dirname, struct ufs_args __user *args, int flags) } static int -osf_cdfs_mount(const char *dirname, struct cdfs_args __user *args, int flags) +osf_cdfs_mount(char *dirname, struct cdfs_args __user *args, int flags) { int retval; struct cdfs_args tmp; @@ -485,7 +485,7 @@ osf_cdfs_mount(const char *dirname, struct cdfs_args __user *args, int flags) } static int -osf_procfs_mount(const char *dirname, struct procfs_args __user *args, int flags) +osf_procfs_mount(char *dirname, struct procfs_args __user *args, int flags) { struct procfs_args tmp; diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index d45ca1bf1de0..ade7e924bef5 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -433,6 +433,19 @@ 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 @@ -924,6 +937,7 @@ 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). @@ -945,6 +959,7 @@ 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 @@ -1043,7 +1058,7 @@ source "arch/arm/mach-msm/Kconfig" source "arch/arm/mach-mv78xx0/Kconfig" -source "arch/arm/mach-imx/Kconfig" +source "arch/arm/plat-mxc/Kconfig" source "arch/arm/mach-mxs/Kconfig" @@ -1153,7 +1168,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 || ARCH_MMP + default y if PXA27x || PXA3xx || PXA95x || 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 5566520686a5..b0f3857b3a4c 100644 --- a/trunk/arch/arm/Kconfig.debug +++ b/trunk/arch/arm/Kconfig.debug @@ -412,14 +412,6 @@ 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 97252d86a701..5f914fca911b 100644 --- a/trunk/arch/arm/Makefile +++ b/trunk/arch/arm/Makefile @@ -196,8 +196,10 @@ 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 537208f22e56..a517153a13ea 100644 --- a/trunk/arch/arm/boot/compressed/Makefile +++ b/trunk/arch/arm/boot/compressed/Makefile @@ -54,6 +54,10 @@ 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 new file mode 100644 index 000000000000..1dc1e21a3be3 --- /dev/null +++ b/trunk/arch/arm/boot/compressed/head-vt8500.S @@ -0,0 +1,46 @@ +/* + * 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/Makefile b/trunk/arch/arm/boot/dts/Makefile index 2458b69e2be6..f37cf9fa5fa0 100644 --- a/trunk/arch/arm/boot/dts/Makefile +++ b/trunk/arch/arm/boot/dts/Makefile @@ -63,17 +63,15 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ imx28-m28evk.dtb \ imx28-tx28.dtb dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ - omap3-beagle.dtb \ omap3-beagle-xm.dtb \ omap3-evm.dtb \ omap3-tobi.dtb \ omap4-panda.dtb \ - omap4-panda-es.dtb \ - omap4-var-som.dtb \ + omap4-pandaES.dtb \ + omap4-var_som.dtb \ omap4-sdp.dtb \ omap5-evm.dtb \ am335x-evm.dtb \ - am335x-evmsk.dtb \ am335x-bone.dtb dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb dtb-$(CONFIG_ARCH_U8500) += snowball.dtb diff --git a/trunk/arch/arm/boot/dts/am335x-bone.dts b/trunk/arch/arm/boot/dts/am335x-bone.dts index 2c338889df1b..c634f87e230e 100644 --- a/trunk/arch/arm/boot/dts/am335x-bone.dts +++ b/trunk/arch/arm/boot/dts/am335x-bone.dts @@ -13,31 +13,11 @@ model = "TI AM335x BeagleBone"; compatible = "ti,am335x-bone", "ti,am33xx"; - cpus { - cpu@0 { - cpu0-supply = <&dcdc2_reg>; - }; - }; - memory { device_type = "memory"; reg = <0x80000000 0x10000000>; /* 256 MB */ }; - am33xx_pinmux: pinmux@44e10800 { - pinctrl-names = "default"; - pinctrl-0 = <&user_leds_s0>; - - user_leds_s0: user_leds_s0 { - pinctrl-single,pins = < - 0x54 0x7 /* gpmc_a5.gpio1_21, OUTPUT | MODE7 */ - 0x58 0x17 /* gpmc_a6.gpio1_22, OUTPUT_PULLUP | MODE7 */ - 0x5c 0x7 /* gpmc_a7.gpio1_23, OUTPUT | MODE7 */ - 0x60 0x17 /* gpmc_a8.gpio1_24, OUTPUT_PULLUP | MODE7 */ - >; - }; - }; - ocp { uart1: serial@44e09000 { status = "okay"; @@ -53,36 +33,6 @@ }; }; - - leds { - compatible = "gpio-leds"; - - led@2 { - label = "beaglebone:green:heartbeat"; - gpios = <&gpio2 21 0>; - linux,default-trigger = "heartbeat"; - default-state = "off"; - }; - - led@3 { - label = "beaglebone:green:mmc0"; - gpios = <&gpio2 22 0>; - linux,default-trigger = "mmc0"; - default-state = "off"; - }; - - led@4 { - label = "beaglebone:green:usr2"; - gpios = <&gpio2 23 0>; - default-state = "off"; - }; - - led@5 { - label = "beaglebone:green:usr3"; - gpios = <&gpio2 24 0>; - default-state = "off"; - }; - }; }; /include/ "tps65217.dtsi" diff --git a/trunk/arch/arm/boot/dts/am335x-evm.dts b/trunk/arch/arm/boot/dts/am335x-evm.dts index 9f65f17ebdf8..185d6325a458 100644 --- a/trunk/arch/arm/boot/dts/am335x-evm.dts +++ b/trunk/arch/arm/boot/dts/am335x-evm.dts @@ -13,39 +13,11 @@ model = "TI AM335x EVM"; compatible = "ti,am335x-evm", "ti,am33xx"; - cpus { - cpu@0 { - cpu0-supply = <&vdd1_reg>; - }; - }; - memory { device_type = "memory"; reg = <0x80000000 0x10000000>; /* 256 MB */ }; - am33xx_pinmux: pinmux@44e10800 { - pinctrl-names = "default"; - pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0>; - - matrix_keypad_s0: matrix_keypad_s0 { - pinctrl-single,pins = < - 0x54 0x7 /* gpmc_a5.gpio1_21, OUTPUT | MODE7 */ - 0x58 0x7 /* gpmc_a6.gpio1_22, OUTPUT | MODE7 */ - 0x64 0x27 /* gpmc_a9.gpio1_25, INPUT | MODE7 */ - 0x68 0x27 /* gpmc_a10.gpio1_26, INPUT | MODE7 */ - 0x6c 0x27 /* gpmc_a11.gpio1_27, INPUT | MODE7 */ - >; - }; - - volume_keys_s0: volume_keys_s0 { - pinctrl-single,pins = < - 0x150 0x27 /* spi0_sclk.gpio0_2, INPUT | MODE7 */ - 0x154 0x27 /* spi0_d0.gpio0_3, INPUT | MODE7 */ - >; - }; - }; - ocp { uart1: serial@44e09000 { status = "okay"; @@ -59,49 +31,6 @@ reg = <0x2d>; }; }; - - i2c2: i2c@4802a000 { - status = "okay"; - clock-frequency = <100000>; - - lis331dlh: lis331dlh@18 { - compatible = "st,lis331dlh", "st,lis3lv02d"; - reg = <0x18>; - Vdd-supply = <&lis3_reg>; - Vdd_IO-supply = <&lis3_reg>; - - st,click-single-x; - st,click-single-y; - st,click-single-z; - st,click-thresh-x = <10>; - st,click-thresh-y = <10>; - st,click-thresh-z = <10>; - st,irq1-click; - st,irq2-click; - st,wakeup-x-lo; - st,wakeup-x-hi; - st,wakeup-y-lo; - st,wakeup-y-hi; - st,wakeup-z-lo; - st,wakeup-z-hi; - st,min-limit-x = <120>; - st,min-limit-y = <120>; - st,min-limit-z = <140>; - st,max-limit-x = <550>; - st,max-limit-y = <550>; - st,max-limit-z = <750>; - }; - - tsl2550: tsl2550@39 { - compatible = "taos,tsl2550"; - reg = <0x39>; - }; - - tmp275: tmp275@48 { - compatible = "ti,tmp275"; - reg = <0x48>; - }; - }; }; vbat: fixedregulator@0 { @@ -111,53 +40,6 @@ regulator-max-microvolt = <5000000>; regulator-boot-on; }; - - lis3_reg: fixedregulator@1 { - compatible = "regulator-fixed"; - regulator-name = "lis3_reg"; - regulator-boot-on; - }; - - matrix_keypad: matrix_keypad@0 { - compatible = "gpio-matrix-keypad"; - debounce-delay-ms = <5>; - col-scan-delay-us = <2>; - - row-gpios = <&gpio2 25 0 /* Bank1, pin25 */ - &gpio2 26 0 /* Bank1, pin26 */ - &gpio2 27 0>; /* Bank1, pin27 */ - - col-gpios = <&gpio2 21 0 /* Bank1, pin21 */ - &gpio2 22 0>; /* Bank1, pin22 */ - - linux,keymap = <0x0000008b /* MENU */ - 0x0100009e /* BACK */ - 0x02000069 /* LEFT */ - 0x0001006a /* RIGHT */ - 0x0101001c /* ENTER */ - 0x0201006c>; /* DOWN */ - }; - - gpio_keys: volume_keys@0 { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - autorepeat; - - switch@9 { - label = "volume-up"; - linux,code = <115>; - gpios = <&gpio1 2 1>; - gpio-key,wakeup; - }; - - switch@10 { - label = "volume-down"; - linux,code = <114>; - gpios = <&gpio1 3 1>; - gpio-key,wakeup; - }; - }; }; /include/ "tps65910.dtsi" diff --git a/trunk/arch/arm/boot/dts/am335x-evmsk.dts b/trunk/arch/arm/boot/dts/am335x-evmsk.dts deleted file mode 100644 index f5a6162a4ff2..000000000000 --- a/trunk/arch/arm/boot/dts/am335x-evmsk.dts +++ /dev/null @@ -1,250 +0,0 @@ -/* - * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -/* - * AM335x Starter Kit - * http://www.ti.com/tool/tmdssk3358 - */ - -/dts-v1/; - -/include/ "am33xx.dtsi" - -/ { - model = "TI AM335x EVM-SK"; - compatible = "ti,am335x-evmsk", "ti,am33xx"; - - cpus { - cpu@0 { - cpu0-supply = <&vdd1_reg>; - }; - }; - - memory { - device_type = "memory"; - reg = <0x80000000 0x10000000>; /* 256 MB */ - }; - - am33xx_pinmux: pinmux@44e10800 { - pinctrl-names = "default"; - pinctrl-0 = <&user_leds_s0 &gpio_keys_s0>; - - user_leds_s0: user_leds_s0 { - pinctrl-single,pins = < - 0x10 0x7 /* gpmc_ad4.gpio1_4, OUTPUT | MODE7 */ - 0x14 0x7 /* gpmc_ad5.gpio1_5, OUTPUT | MODE7 */ - 0x18 0x7 /* gpmc_ad6.gpio1_6, OUTPUT | MODE7 */ - 0x1c 0x7 /* gpmc_ad7.gpio1_7, OUTPUT | MODE7 */ - >; - }; - - gpio_keys_s0: gpio_keys_s0 { - pinctrl-single,pins = < - 0x94 0x27 /* gpmc_oen_ren.gpio2_3, INPUT | MODE7 */ - 0x90 0x27 /* gpmc_advn_ale.gpio2_2, INPUT | MODE7 */ - 0x70 0x27 /* gpmc_wait0.gpio0_30, INPUT | MODE7 */ - 0x9c 0x27 /* gpmc_ben0_cle.gpio2_5, INPUT | MODE7 */ - >; - }; - }; - - ocp { - uart1: serial@44e09000 { - status = "okay"; - }; - - i2c1: i2c@44e0b000 { - status = "okay"; - clock-frequency = <400000>; - - tps: tps@2d { - reg = <0x2d>; - }; - - lis331dlh: lis331dlh@18 { - compatible = "st,lis331dlh", "st,lis3lv02d"; - reg = <0x18>; - Vdd-supply = <&lis3_reg>; - Vdd_IO-supply = <&lis3_reg>; - - st,click-single-x; - st,click-single-y; - st,click-single-z; - st,click-thresh-x = <10>; - st,click-thresh-y = <10>; - st,click-thresh-z = <10>; - st,irq1-click; - st,irq2-click; - st,wakeup-x-lo; - st,wakeup-x-hi; - st,wakeup-y-lo; - st,wakeup-y-hi; - st,wakeup-z-lo; - st,wakeup-z-hi; - st,min-limit-x = <120>; - st,min-limit-y = <120>; - st,min-limit-z = <140>; - st,max-limit-x = <550>; - st,max-limit-y = <550>; - st,max-limit-z = <750>; - }; - }; - }; - - vbat: fixedregulator@0 { - compatible = "regulator-fixed"; - regulator-name = "vbat"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-boot-on; - }; - - lis3_reg: fixedregulator@1 { - compatible = "regulator-fixed"; - regulator-name = "lis3_reg"; - regulator-boot-on; - }; - - leds { - compatible = "gpio-leds"; - - led@1 { - label = "evmsk:green:usr0"; - gpios = <&gpio2 4 0>; - default-state = "off"; - }; - - led@2 { - label = "evmsk:green:usr1"; - gpios = <&gpio2 5 0>; - default-state = "off"; - }; - - led@3 { - label = "evmsk:green:mmc0"; - gpios = <&gpio2 6 0>; - linux,default-trigger = "mmc0"; - default-state = "off"; - }; - - led@4 { - label = "evmsk:green:heartbeat"; - gpios = <&gpio2 7 0>; - linux,default-trigger = "heartbeat"; - default-state = "off"; - }; - }; - - gpio_buttons: gpio_buttons@0 { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - - switch@1 { - label = "button0"; - linux,code = <0x100>; - gpios = <&gpio3 3 0>; - }; - - switch@2 { - label = "button1"; - linux,code = <0x101>; - gpios = <&gpio3 2 0>; - }; - - switch@3 { - label = "button2"; - linux,code = <0x102>; - gpios = <&gpio1 30 0>; - gpio-key,wakeup; - }; - - switch@4 { - label = "button3"; - linux,code = <0x103>; - gpios = <&gpio3 5 0>; - }; - }; -}; - -/include/ "tps65910.dtsi" - -&tps { - vcc1-supply = <&vbat>; - vcc2-supply = <&vbat>; - vcc3-supply = <&vbat>; - vcc4-supply = <&vbat>; - vcc5-supply = <&vbat>; - vcc6-supply = <&vbat>; - vcc7-supply = <&vbat>; - vccio-supply = <&vbat>; - - regulators { - vrtc_reg: regulator@0 { - regulator-always-on; - }; - - vio_reg: regulator@1 { - regulator-always-on; - }; - - vdd1_reg: regulator@2 { - /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */ - regulator-name = "vdd_mpu"; - regulator-min-microvolt = <912500>; - regulator-max-microvolt = <1312500>; - regulator-boot-on; - regulator-always-on; - }; - - vdd2_reg: regulator@3 { - /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */ - regulator-name = "vdd_core"; - regulator-min-microvolt = <912500>; - regulator-max-microvolt = <1150000>; - regulator-boot-on; - regulator-always-on; - }; - - vdd3_reg: regulator@4 { - regulator-always-on; - }; - - vdig1_reg: regulator@5 { - regulator-always-on; - }; - - vdig2_reg: regulator@6 { - regulator-always-on; - }; - - vpll_reg: regulator@7 { - regulator-always-on; - }; - - vdac_reg: regulator@8 { - regulator-always-on; - }; - - vaux1_reg: regulator@9 { - regulator-always-on; - }; - - vaux2_reg: regulator@10 { - regulator-always-on; - }; - - vaux33_reg: regulator@11 { - regulator-always-on; - }; - - vmmc_reg: regulator@12 { - regulator-always-on; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/am33xx.dtsi b/trunk/arch/arm/boot/dts/am33xx.dtsi index 20a3f29a6bfe..bb31bff01998 100644 --- a/trunk/arch/arm/boot/dts/am33xx.dtsi +++ b/trunk/arch/arm/boot/dts/am33xx.dtsi @@ -12,7 +12,6 @@ / { compatible = "ti,am33xx"; - interrupt-parent = <&intc>; aliases { serial0 = &uart1; @@ -26,21 +25,6 @@ cpus { cpu@0 { compatible = "arm,cortex-a8"; - - /* - * To consider voltage drop between PMIC and SoC, - * tolerance value is reduced to 2% from 4% and - * voltage value is increased as a precaution. - */ - operating-points = < - /* kHz uV */ - 720000 1285000 - 600000 1225000 - 500000 1125000 - 275000 1125000 - >; - voltage-tolerance = <2>; /* 2 percentage */ - clock-latency = <300000>; /* From omap-cpufreq driver */ }; }; @@ -56,15 +40,6 @@ }; }; - am33xx_pinmux: pinmux@44e10800 { - compatible = "pinctrl-single"; - reg = <0x44e10800 0x0238>; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-single,register-width = <32>; - pinctrl-single,function-mask = <0x7f>; - }; - /* * XXX: Use a flat representation of the AM33XX interconnect. * The real AM33XX interconnect network is quite complex.Since @@ -95,6 +70,7 @@ interrupt-controller; #interrupt-cells = <1>; reg = <0x44e07000 0x1000>; + interrupt-parent = <&intc>; interrupts = <96>; }; @@ -106,6 +82,7 @@ interrupt-controller; #interrupt-cells = <1>; reg = <0x4804c000 0x1000>; + interrupt-parent = <&intc>; interrupts = <98>; }; @@ -117,6 +94,7 @@ interrupt-controller; #interrupt-cells = <1>; reg = <0x481ac000 0x1000>; + interrupt-parent = <&intc>; interrupts = <32>; }; @@ -128,6 +106,7 @@ interrupt-controller; #interrupt-cells = <1>; reg = <0x481ae000 0x1000>; + interrupt-parent = <&intc>; interrupts = <62>; }; @@ -136,6 +115,7 @@ ti,hwmods = "uart1"; clock-frequency = <48000000>; reg = <0x44e09000 0x2000>; + interrupt-parent = <&intc>; interrupts = <72>; status = "disabled"; }; @@ -145,6 +125,7 @@ ti,hwmods = "uart2"; clock-frequency = <48000000>; reg = <0x48022000 0x2000>; + interrupt-parent = <&intc>; interrupts = <73>; status = "disabled"; }; @@ -154,6 +135,7 @@ ti,hwmods = "uart3"; clock-frequency = <48000000>; reg = <0x48024000 0x2000>; + interrupt-parent = <&intc>; interrupts = <74>; status = "disabled"; }; @@ -163,6 +145,7 @@ ti,hwmods = "uart4"; clock-frequency = <48000000>; reg = <0x481a6000 0x2000>; + interrupt-parent = <&intc>; interrupts = <44>; status = "disabled"; }; @@ -172,6 +155,7 @@ ti,hwmods = "uart5"; clock-frequency = <48000000>; reg = <0x481a8000 0x2000>; + interrupt-parent = <&intc>; interrupts = <45>; status = "disabled"; }; @@ -181,6 +165,7 @@ ti,hwmods = "uart6"; clock-frequency = <48000000>; reg = <0x481aa000 0x2000>; + interrupt-parent = <&intc>; interrupts = <46>; status = "disabled"; }; @@ -191,6 +176,7 @@ #size-cells = <0>; ti,hwmods = "i2c1"; reg = <0x44e0b000 0x1000>; + interrupt-parent = <&intc>; interrupts = <70>; status = "disabled"; }; @@ -201,6 +187,7 @@ #size-cells = <0>; ti,hwmods = "i2c2"; reg = <0x4802a000 0x1000>; + interrupt-parent = <&intc>; interrupts = <71>; status = "disabled"; }; @@ -211,6 +198,7 @@ #size-cells = <0>; ti,hwmods = "i2c3"; reg = <0x4819c000 0x1000>; + interrupt-parent = <&intc>; interrupts = <30>; status = "disabled"; }; @@ -219,124 +207,8 @@ compatible = "ti,omap3-wdt"; ti,hwmods = "wd_timer2"; reg = <0x44e35000 0x1000>; + interrupt-parent = <&intc>; interrupts = <91>; }; - - dcan0: d_can@481cc000 { - compatible = "bosch,d_can"; - ti,hwmods = "d_can0"; - reg = <0x481cc000 0x2000>; - interrupts = <52>; - status = "disabled"; - }; - - dcan1: d_can@481d0000 { - compatible = "bosch,d_can"; - ti,hwmods = "d_can1"; - reg = <0x481d0000 0x2000>; - interrupts = <55>; - status = "disabled"; - }; - - timer1: timer@44e31000 { - compatible = "ti,omap2-timer"; - reg = <0x44e31000 0x400>; - interrupts = <67>; - ti,hwmods = "timer1"; - ti,timer-alwon; - }; - - timer2: timer@48040000 { - compatible = "ti,omap2-timer"; - reg = <0x48040000 0x400>; - interrupts = <68>; - ti,hwmods = "timer2"; - }; - - timer3: timer@48042000 { - compatible = "ti,omap2-timer"; - reg = <0x48042000 0x400>; - interrupts = <69>; - ti,hwmods = "timer3"; - }; - - timer4: timer@48044000 { - compatible = "ti,omap2-timer"; - reg = <0x48044000 0x400>; - interrupts = <92>; - ti,hwmods = "timer4"; - ti,timer-pwm; - }; - - timer5: timer@48046000 { - compatible = "ti,omap2-timer"; - reg = <0x48046000 0x400>; - interrupts = <93>; - ti,hwmods = "timer5"; - ti,timer-pwm; - }; - - timer6: timer@48048000 { - compatible = "ti,omap2-timer"; - reg = <0x48048000 0x400>; - interrupts = <94>; - ti,hwmods = "timer6"; - ti,timer-pwm; - }; - - timer7: timer@4804a000 { - compatible = "ti,omap2-timer"; - reg = <0x4804a000 0x400>; - interrupts = <95>; - ti,hwmods = "timer7"; - ti,timer-pwm; - }; - - rtc@44e3e000 { - compatible = "ti,da830-rtc"; - reg = <0x44e3e000 0x1000>; - interrupts = <75 - 76>; - ti,hwmods = "rtc"; - }; - - spi0: spi@48030000 { - compatible = "ti,omap4-mcspi"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x48030000 0x400>; - interrupt = <65>; - ti,spi-num-cs = <2>; - ti,hwmods = "spi0"; - status = "disabled"; - }; - - spi1: spi@481a0000 { - compatible = "ti,omap4-mcspi"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x481a0000 0x400>; - interrupt = <125>; - ti,spi-num-cs = <2>; - ti,hwmods = "spi1"; - status = "disabled"; - }; - - usb@47400000 { - compatible = "ti,musb-am33xx"; - reg = <0x47400000 0x1000 /* usbss */ - 0x47401000 0x800 /* musb instance 0 */ - 0x47401800 0x800>; /* musb instance 1 */ - interrupts = <17 /* usbss */ - 18 /* musb instance 0 */ - 19>; /* musb instance 1 */ - multipoint = <1>; - num-eps = <16>; - ram-bits = <12>; - port0-mode = <3>; - port1-mode = <3>; - power = <250>; - ti,hwmods = "usb_otg_hs"; - }; }; }; diff --git a/trunk/arch/arm/boot/dts/imx27.dtsi b/trunk/arch/arm/boot/dts/imx27.dtsi index 67d672792b0d..3e54f1498841 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,imx21-i2c"; + compatible = "fsl,imx27-i2c", "fsl,imx1-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,imx21-i2c"; + compatible = "fsl,imx27-i2c", "fsl,imx1-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 54aea74769a1..75d069fcf897 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,imx21-i2c"; + compatible = "fsl,imx51-i2c", "fsl,imx1-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,imx21-i2c"; + compatible = "fsl,imx51-i2c", "fsl,imx1-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 caf09ff73f10..76ebb1ad2675 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,imx21-i2c"; + compatible = "fsl,imx53-i2c", "fsl,imx1-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,imx21-i2c"; + compatible = "fsl,imx53-i2c", "fsl,imx1-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,imx21-i2c"; + compatible = "fsl,imx53-i2c", "fsl,imx1-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 f604a44a5c66..f3990b04fecf 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,imx21-i2c"; + compatible = "fsl,imx6q-i2c", "fsl,imx1-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,imx21-i2c"; + compatible = "fsl,imx6q-i2c", "fsl,imx1-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,imx21-i2c"; + compatible = "fsl,imx6q-i2c", "fsl,imx1-i2c"; reg = <0x021a8000 0x4000>; interrupts = <0 38 0x04>; clocks = <&clks 127>; diff --git a/trunk/arch/arm/boot/dts/integratorap.dts b/trunk/arch/arm/boot/dts/integratorap.dts index c9c3fa344647..61767757b50a 100644 --- a/trunk/arch/arm/boot/dts/integratorap.dts +++ b/trunk/arch/arm/boot/dts/integratorap.dts @@ -18,11 +18,6 @@ bootargs = "root=/dev/ram0 console=ttyAM0,38400n8 earlyprintk"; }; - syscon { - /* AP system controller registers */ - reg = <0x11000000 0x100>; - }; - timer0: timer@13000000 { compatible = "arm,integrator-timer"; }; diff --git a/trunk/arch/arm/boot/dts/integratorcp.dts b/trunk/arch/arm/boot/dts/integratorcp.dts index 8b119399025a..2dd5e4e48481 100644 --- a/trunk/arch/arm/boot/dts/integratorcp.dts +++ b/trunk/arch/arm/boot/dts/integratorcp.dts @@ -18,11 +18,6 @@ bootargs = "root=/dev/ram0 console=ttyAMA0,38400n8 earlyprintk"; }; - cpcon { - /* CP controller registers */ - reg = <0xcb000000 0x100>; - }; - timer0: timer@13000000 { compatible = "arm,sp804", "arm,primecell"; }; diff --git a/trunk/arch/arm/boot/dts/omap2.dtsi b/trunk/arch/arm/boot/dts/omap2.dtsi index 761c4b69b25b..581cb081cb0f 100644 --- a/trunk/arch/arm/boot/dts/omap2.dtsi +++ b/trunk/arch/arm/boot/dts/omap2.dtsi @@ -12,7 +12,6 @@ / { compatible = "ti,omap2430", "ti,omap2420", "ti,omap2"; - interrupt-parent = <&intc>; aliases { serial0 = &uart1; @@ -66,90 +65,5 @@ ti,hwmods = "uart3"; clock-frequency = <48000000>; }; - - timer2: timer@4802a000 { - compatible = "ti,omap2-timer"; - reg = <0x4802a000 0x400>; - interrupts = <38>; - ti,hwmods = "timer2"; - }; - - timer3: timer@48078000 { - compatible = "ti,omap2-timer"; - reg = <0x48078000 0x400>; - interrupts = <39>; - ti,hwmods = "timer3"; - }; - - timer4: timer@4807a000 { - compatible = "ti,omap2-timer"; - reg = <0x4807a000 0x400>; - interrupts = <40>; - ti,hwmods = "timer4"; - }; - - timer5: timer@4807c000 { - compatible = "ti,omap2-timer"; - reg = <0x4807c000 0x400>; - interrupts = <41>; - ti,hwmods = "timer5"; - ti,timer-dsp; - }; - - timer6: timer@4807e000 { - compatible = "ti,omap2-timer"; - reg = <0x4807e000 0x400>; - interrupts = <42>; - ti,hwmods = "timer6"; - ti,timer-dsp; - }; - - timer7: timer@48080000 { - compatible = "ti,omap2-timer"; - reg = <0x48080000 0x400>; - interrupts = <43>; - ti,hwmods = "timer7"; - ti,timer-dsp; - }; - - timer8: timer@48082000 { - compatible = "ti,omap2-timer"; - reg = <0x48082000 0x400>; - interrupts = <44>; - ti,hwmods = "timer8"; - ti,timer-dsp; - }; - - timer9: timer@48084000 { - compatible = "ti,omap2-timer"; - reg = <0x48084000 0x400>; - interrupts = <45>; - ti,hwmods = "timer9"; - ti,timer-pwm; - }; - - timer10: timer@48086000 { - compatible = "ti,omap2-timer"; - reg = <0x48086000 0x400>; - interrupts = <46>; - ti,hwmods = "timer10"; - ti,timer-pwm; - }; - - timer11: timer@48088000 { - compatible = "ti,omap2-timer"; - reg = <0x48088000 0x400>; - interrupts = <47>; - ti,hwmods = "timer11"; - ti,timer-pwm; - }; - - timer12: timer@4808a000 { - compatible = "ti,omap2-timer"; - reg = <0x4808a000 0x400>; - interrupts = <48>; - ti,hwmods = "timer12"; - ti,timer-pwm; - }; }; }; diff --git a/trunk/arch/arm/boot/dts/omap2420.dtsi b/trunk/arch/arm/boot/dts/omap2420.dtsi index af6560908905..bfd76b4a0ddc 100644 --- a/trunk/arch/arm/boot/dts/omap2420.dtsi +++ b/trunk/arch/arm/boot/dts/omap2420.dtsi @@ -14,12 +14,6 @@ compatible = "ti,omap2420", "ti,omap2"; ocp { - counter32k: counter@48004000 { - compatible = "ti,omap-counter32k"; - reg = <0x48004000 0x20>; - ti,hwmods = "counter_32k"; - }; - omap2420_pmx: pinmux@48000030 { compatible = "ti,omap2420-padconf", "pinctrl-single"; reg = <0x48000030 0x0113>; @@ -36,6 +30,7 @@ interrupts = <59>, /* TX interrupt */ <60>; /* RX interrupt */ interrupt-names = "tx", "rx"; + interrupt-parent = <&intc>; ti,hwmods = "mcbsp1"; }; @@ -46,15 +41,8 @@ interrupts = <62>, /* TX interrupt */ <63>; /* RX interrupt */ interrupt-names = "tx", "rx"; + interrupt-parent = <&intc>; ti,hwmods = "mcbsp2"; }; - - timer1: timer@48028000 { - compatible = "ti,omap2-timer"; - reg = <0x48028000 0x400>; - interrupts = <37>; - ti,hwmods = "timer1"; - ti,timer-alwon; - }; }; }; diff --git a/trunk/arch/arm/boot/dts/omap2430.dtsi b/trunk/arch/arm/boot/dts/omap2430.dtsi index c3924457c9b6..4565d9750f4d 100644 --- a/trunk/arch/arm/boot/dts/omap2430.dtsi +++ b/trunk/arch/arm/boot/dts/omap2430.dtsi @@ -14,12 +14,6 @@ compatible = "ti,omap2430", "ti,omap2"; ocp { - counter32k: counter@49020000 { - compatible = "ti,omap-counter32k"; - reg = <0x49020000 0x20>; - ti,hwmods = "counter_32k"; - }; - omap2430_pmx: pinmux@49002030 { compatible = "ti,omap2430-padconf", "pinctrl-single"; reg = <0x49002030 0x0154>; @@ -38,6 +32,7 @@ <60>, /* RX interrupt */ <61>; /* RX overflow interrupt */ interrupt-names = "common", "tx", "rx", "rx_overflow"; + interrupt-parent = <&intc>; ti,buffer-size = <128>; ti,hwmods = "mcbsp1"; }; @@ -50,6 +45,7 @@ <62>, /* TX interrupt */ <63>; /* RX interrupt */ interrupt-names = "common", "tx", "rx"; + interrupt-parent = <&intc>; ti,buffer-size = <128>; ti,hwmods = "mcbsp2"; }; @@ -62,6 +58,7 @@ <89>, /* TX interrupt */ <90>; /* RX interrupt */ interrupt-names = "common", "tx", "rx"; + interrupt-parent = <&intc>; ti,buffer-size = <128>; ti,hwmods = "mcbsp3"; }; @@ -74,6 +71,7 @@ <54>, /* TX interrupt */ <55>; /* RX interrupt */ interrupt-names = "common", "tx", "rx"; + interrupt-parent = <&intc>; ti,buffer-size = <128>; ti,hwmods = "mcbsp4"; }; @@ -86,16 +84,9 @@ <81>, /* TX interrupt */ <82>; /* RX interrupt */ interrupt-names = "common", "tx", "rx"; + interrupt-parent = <&intc>; ti,buffer-size = <128>; ti,hwmods = "mcbsp5"; }; - - timer1: timer@49018000 { - compatible = "ti,omap2-timer"; - reg = <0x49018000 0x400>; - interrupts = <37>; - ti,hwmods = "timer1"; - ti,timer-alwon; - }; }; }; diff --git a/trunk/arch/arm/boot/dts/omap3-beagle-xm.dts b/trunk/arch/arm/boot/dts/omap3-beagle-xm.dts index 3705a81c1fc2..c38cf76df81f 100644 --- a/trunk/arch/arm/boot/dts/omap3-beagle-xm.dts +++ b/trunk/arch/arm/boot/dts/omap3-beagle-xm.dts @@ -55,6 +55,12 @@ interrupts = <7>; /* SYS_NIRQ cascaded to intc */ interrupt-parent = <&intc>; + vsim: regulator-vsim { + compatible = "ti,twl4030-vsim"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3000000>; + }; + twl_audio: audio { compatible = "ti,twl4030-audio"; codec { diff --git a/trunk/arch/arm/boot/dts/omap3-beagle.dts b/trunk/arch/arm/boot/dts/omap3-beagle.dts deleted file mode 100644 index f624dc85d441..000000000000 --- a/trunk/arch/arm/boot/dts/omap3-beagle.dts +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -/dts-v1/; - -/include/ "omap3.dtsi" - -/ { - model = "TI OMAP3 BeagleBoard"; - compatible = "ti,omap3-beagle", "ti,omap3"; - - memory { - device_type = "memory"; - reg = <0x80000000 0x10000000>; /* 256 MB */ - }; - - leds { - compatible = "gpio-leds"; - pmu_stat { - label = "beagleboard::pmu_stat"; - gpios = <&twl_gpio 19 0>; /* LEDB */ - }; - - heartbeat { - label = "beagleboard::usr0"; - gpios = <&gpio5 22 0>; /* 150 -> D6 LED */ - linux,default-trigger = "heartbeat"; - }; - - mmc { - label = "beagleboard::usr1"; - gpios = <&gpio5 21 0>; /* 149 -> D7 LED */ - linux,default-trigger = "mmc0"; - }; - }; - -}; - -&i2c1 { - clock-frequency = <2600000>; - - twl: twl@48 { - reg = <0x48>; - interrupts = <7>; /* SYS_NIRQ cascaded to intc */ - interrupt-parent = <&intc>; - }; -}; - -/include/ "twl4030.dtsi" - -&mmc1 { - vmmc-supply = <&vmmc1>; - vmmc_aux-supply = <&vsim>; - bus-width = <8>; -}; - -&mmc2 { - status = "disabled"; -}; - -&mmc3 { - status = "disabled"; -}; diff --git a/trunk/arch/arm/boot/dts/omap3.dtsi b/trunk/arch/arm/boot/dts/omap3.dtsi index 1acc26148ffc..696e929d0304 100644 --- a/trunk/arch/arm/boot/dts/omap3.dtsi +++ b/trunk/arch/arm/boot/dts/omap3.dtsi @@ -12,7 +12,6 @@ / { compatible = "ti,omap3430", "ti,omap3"; - interrupt-parent = <&intc>; aliases { serial0 = &uart1; @@ -61,12 +60,6 @@ ranges; ti,hwmods = "l3_main"; - counter32k: counter@48320000 { - compatible = "ti,omap-counter32k"; - reg = <0x48320000 0x20>; - ti,hwmods = "counter_32k"; - }; - intc: interrupt-controller@48200000 { compatible = "ti,omap2-intc"; interrupt-controller; @@ -247,6 +240,7 @@ <59>, /* TX interrupt */ <60>; /* RX interrupt */ interrupt-names = "common", "tx", "rx"; + interrupt-parent = <&intc>; ti,buffer-size = <128>; ti,hwmods = "mcbsp1"; }; @@ -261,6 +255,7 @@ <63>, /* RX interrupt */ <4>; /* Sidetone */ interrupt-names = "common", "tx", "rx", "sidetone"; + interrupt-parent = <&intc>; ti,buffer-size = <1280>; ti,hwmods = "mcbsp2", "mcbsp2_sidetone"; }; @@ -275,6 +270,7 @@ <90>, /* RX interrupt */ <5>; /* Sidetone */ interrupt-names = "common", "tx", "rx", "sidetone"; + interrupt-parent = <&intc>; ti,buffer-size = <128>; ti,hwmods = "mcbsp3", "mcbsp3_sidetone"; }; @@ -287,6 +283,7 @@ <54>, /* TX interrupt */ <55>; /* RX interrupt */ interrupt-names = "common", "tx", "rx"; + interrupt-parent = <&intc>; ti,buffer-size = <128>; ti,hwmods = "mcbsp4"; }; @@ -299,103 +296,9 @@ <81>, /* TX interrupt */ <82>; /* RX interrupt */ interrupt-names = "common", "tx", "rx"; + interrupt-parent = <&intc>; ti,buffer-size = <128>; ti,hwmods = "mcbsp5"; }; - - timer1: timer@48318000 { - compatible = "ti,omap2-timer"; - reg = <0x48318000 0x400>; - interrupts = <37>; - ti,hwmods = "timer1"; - ti,timer-alwon; - }; - - timer2: timer@49032000 { - compatible = "ti,omap2-timer"; - reg = <0x49032000 0x400>; - interrupts = <38>; - ti,hwmods = "timer2"; - }; - - timer3: timer@49034000 { - compatible = "ti,omap2-timer"; - reg = <0x49034000 0x400>; - interrupts = <39>; - ti,hwmods = "timer3"; - }; - - timer4: timer@49036000 { - compatible = "ti,omap2-timer"; - reg = <0x49036000 0x400>; - interrupts = <40>; - ti,hwmods = "timer4"; - }; - - timer5: timer@49038000 { - compatible = "ti,omap2-timer"; - reg = <0x49038000 0x400>; - interrupts = <41>; - ti,hwmods = "timer5"; - ti,timer-dsp; - }; - - timer6: timer@4903a000 { - compatible = "ti,omap2-timer"; - reg = <0x4903a000 0x400>; - interrupts = <42>; - ti,hwmods = "timer6"; - ti,timer-dsp; - }; - - timer7: timer@4903c000 { - compatible = "ti,omap2-timer"; - reg = <0x4903c000 0x400>; - interrupts = <43>; - ti,hwmods = "timer7"; - ti,timer-dsp; - }; - - timer8: timer@4903e000 { - compatible = "ti,omap2-timer"; - reg = <0x4903e000 0x400>; - interrupts = <44>; - ti,hwmods = "timer8"; - ti,timer-pwm; - ti,timer-dsp; - }; - - timer9: timer@49040000 { - compatible = "ti,omap2-timer"; - reg = <0x49040000 0x400>; - interrupts = <45>; - ti,hwmods = "timer9"; - ti,timer-pwm; - }; - - timer10: timer@48086000 { - compatible = "ti,omap2-timer"; - reg = <0x48086000 0x400>; - interrupts = <46>; - ti,hwmods = "timer10"; - ti,timer-pwm; - }; - - timer11: timer@48088000 { - compatible = "ti,omap2-timer"; - reg = <0x48088000 0x400>; - interrupts = <47>; - ti,hwmods = "timer11"; - ti,timer-pwm; - }; - - timer12: timer@48304000 { - compatible = "ti,omap2-timer"; - reg = <0x48304000 0x400>; - interrupts = <95>; - ti,hwmods = "timer12"; - ti,timer-alwon; - ti,timer-secure; - }; }; }; diff --git a/trunk/arch/arm/boot/dts/omap4-panda-a4.dts b/trunk/arch/arm/boot/dts/omap4-panda-a4.dts deleted file mode 100644 index 75466d2abfb5..000000000000 --- a/trunk/arch/arm/boot/dts/omap4-panda-a4.dts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -/include/ "omap4-panda.dts" - -/* Pandaboard Rev A4+ have external pullups on SCL & SDA */ -&dss_hdmi_pins { - pinctrl-single,pins = < - 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ - 0x5c 0x100 /* hdmi_scl.hdmi_scl INPUT | MODE 0 */ - 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */ - >; -}; diff --git a/trunk/arch/arm/boot/dts/omap4-panda.dts b/trunk/arch/arm/boot/dts/omap4-panda.dts index 4122efe31cfd..e8f927cbb376 100644 --- a/trunk/arch/arm/boot/dts/omap4-panda.dts +++ b/trunk/arch/arm/boot/dts/omap4-panda.dts @@ -65,8 +65,6 @@ &twl6040_pins &mcpdm_pins &mcbsp1_pins - &dss_hdmi_pins - &tpd12s015_pins >; twl6040_pins: pinmux_twl6040_pins { @@ -94,22 +92,6 @@ 0xc4 0x100 /* abe_mcbsp1_fsx.abe_mcbsp1_fsx INPUT | MODE0 */ >; }; - - dss_hdmi_pins: pinmux_dss_hdmi_pins { - pinctrl-single,pins = < - 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ - 0x5c 0x118 /* hdmi_scl.hdmi_scl INPUT PULLUP | MODE 0 */ - 0x5e 0x118 /* hdmi_sda.hdmi_sda INPUT PULLUP | MODE 0 */ - >; - }; - - tpd12s015_pins: pinmux_tpd12s015_pins { - pinctrl-single,pins = < - 0x22 0x3 /* gpmc_a17.gpio_41 OUTPUT | MODE3 */ - 0x48 0x3 /* gpmc_nbe1.gpio_60 OUTPUT | MODE3 */ - 0x58 0x10b /* hdmi_hpd.gpio_63 INPUT PULLDOWN | MODE3 */ - >; - }; }; &i2c1 { @@ -202,7 +184,3 @@ &dmic { status = "disabled"; }; - -&twl_usb_comparator { - usb-supply = <&vusb>; -}; diff --git a/trunk/arch/arm/boot/dts/omap4-panda-es.dts b/trunk/arch/arm/boot/dts/omap4-pandaES.dts similarity index 70% rename from trunk/arch/arm/boot/dts/omap4-panda-es.dts rename to trunk/arch/arm/boot/dts/omap4-pandaES.dts index 73bc1a67e444..d4ba43a48d9b 100644 --- a/trunk/arch/arm/boot/dts/omap4-panda-es.dts +++ b/trunk/arch/arm/boot/dts/omap4-pandaES.dts @@ -22,12 +22,3 @@ "AFML", "Line In", "AFMR", "Line In"; }; - -/* PandaboardES has external pullups on SCL & SDA */ -&dss_hdmi_pins { - pinctrl-single,pins = < - 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ - 0x5c 0x100 /* hdmi_scl.hdmi_scl INPUT | MODE 0 */ - 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */ - >; -}; diff --git a/trunk/arch/arm/boot/dts/omap4-sdp-es23plus.dts b/trunk/arch/arm/boot/dts/omap4-sdp-es23plus.dts deleted file mode 100644 index b4a40ffbce31..000000000000 --- a/trunk/arch/arm/boot/dts/omap4-sdp-es23plus.dts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -/include/ "omap4-sdp.dts" - -/* SDP boards with 4430 ES2.3+ or 4460 have external pullups on SCL & SDA */ -&dss_hdmi_pins { - pinctrl-single,pins = < - 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ - 0x5c 0x100 /* hdmi_scl.hdmi_scl INPUT | MODE 0 */ - 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */ - >; -}; diff --git a/trunk/arch/arm/boot/dts/omap4-sdp.dts b/trunk/arch/arm/boot/dts/omap4-sdp.dts index 43e5258a9372..5b7e04fbff50 100644 --- a/trunk/arch/arm/boot/dts/omap4-sdp.dts +++ b/trunk/arch/arm/boot/dts/omap4-sdp.dts @@ -124,8 +124,6 @@ &dmic_pins &mcbsp1_pins &mcbsp2_pins - &dss_hdmi_pins - &tpd12s015_pins >; uart2_pins: pinmux_uart2_pins { @@ -196,22 +194,6 @@ 0xbc 0x100 /* abe_mcbsp2_fsx.abe_mcbsp2_fsx INPUT | MODE0 */ >; }; - - dss_hdmi_pins: pinmux_dss_hdmi_pins { - pinctrl-single,pins = < - 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ - 0x5c 0x118 /* hdmi_scl.hdmi_scl INPUT PULLUP | MODE 0 */ - 0x5e 0x118 /* hdmi_sda.hdmi_sda INPUT PULLUP | MODE 0 */ - >; - }; - - tpd12s015_pins: pinmux_tpd12s015_pins { - pinctrl-single,pins = < - 0x22 0x3 /* gpmc_a17.gpio_41 OUTPUT | MODE3 */ - 0x48 0x3 /* gpmc_nbe1.gpio_60 OUTPUT | MODE3 */ - 0x58 0x10b /* hdmi_hpd.gpio_63 INPUT PULLDOWN | MODE3 */ - >; - }; }; &i2c1 { @@ -424,7 +406,3 @@ &mcbsp3 { status = "disabled"; }; - -&twl_usb_comparator { - usb-supply = <&vusb>; -}; diff --git a/trunk/arch/arm/boot/dts/omap4-var-som.dts b/trunk/arch/arm/boot/dts/omap4-var_som.dts similarity index 100% rename from trunk/arch/arm/boot/dts/omap4-var-som.dts rename to trunk/arch/arm/boot/dts/omap4-var_som.dts diff --git a/trunk/arch/arm/boot/dts/omap4.dtsi b/trunk/arch/arm/boot/dts/omap4.dtsi index 739bb79e410e..3883f94fdbd0 100644 --- a/trunk/arch/arm/boot/dts/omap4.dtsi +++ b/trunk/arch/arm/boot/dts/omap4.dtsi @@ -95,12 +95,6 @@ ranges; ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3"; - counter32k: counter@4a304000 { - compatible = "ti,omap-counter32k"; - reg = <0x4a304000 0x20>; - ti,hwmods = "counter_32k"; - }; - omap4_pmx_core: pinmux@4a100040 { compatible = "ti,omap4-padconf", "pinctrl-single"; reg = <0x4a100040 0x0196>; @@ -346,6 +340,7 @@ <0x49032000 0x7f>; /* L3 Interconnect */ reg-names = "mpu", "dma"; interrupts = <0 112 0x4>; + interrupt-parent = <&gic>; ti,hwmods = "mcpdm"; }; @@ -355,6 +350,7 @@ <0x4902e000 0x7f>; /* L3 Interconnect */ reg-names = "mpu", "dma"; interrupts = <0 114 0x4>; + interrupt-parent = <&gic>; ti,hwmods = "dmic"; }; @@ -365,6 +361,7 @@ reg-names = "mpu", "dma"; interrupts = <0 17 0x4>; interrupt-names = "common"; + interrupt-parent = <&gic>; ti,buffer-size = <128>; ti,hwmods = "mcbsp1"; }; @@ -376,6 +373,7 @@ reg-names = "mpu", "dma"; interrupts = <0 22 0x4>; interrupt-names = "common"; + interrupt-parent = <&gic>; ti,buffer-size = <128>; ti,hwmods = "mcbsp2"; }; @@ -387,6 +385,7 @@ reg-names = "mpu", "dma"; interrupts = <0 23 0x4>; interrupt-names = "common"; + interrupt-parent = <&gic>; ti,buffer-size = <128>; ti,hwmods = "mcbsp3"; }; @@ -397,6 +396,7 @@ reg-names = "mpu"; interrupts = <0 16 0x4>; interrupt-names = "common"; + interrupt-parent = <&gic>; ti,buffer-size = <128>; ti,hwmods = "mcbsp4"; }; @@ -431,103 +431,12 @@ hw-caps-temp-alert; }; - ocp2scp@4a0ad000 { + ocp2scp { compatible = "ti,omap-ocp2scp"; - reg = <0x4a0ad000 0x1f>; #address-cells = <1>; #size-cells = <1>; ranges; ti,hwmods = "ocp2scp_usb_phy"; }; - - timer1: timer@4a318000 { - compatible = "ti,omap2-timer"; - reg = <0x4a318000 0x80>; - interrupts = <0 37 0x4>; - ti,hwmods = "timer1"; - ti,timer-alwon; - }; - - timer2: timer@48032000 { - compatible = "ti,omap2-timer"; - reg = <0x48032000 0x80>; - interrupts = <0 38 0x4>; - ti,hwmods = "timer2"; - }; - - timer3: timer@48034000 { - compatible = "ti,omap2-timer"; - reg = <0x48034000 0x80>; - interrupts = <0 39 0x4>; - ti,hwmods = "timer3"; - }; - - timer4: timer@48036000 { - compatible = "ti,omap2-timer"; - reg = <0x48036000 0x80>; - interrupts = <0 40 0x4>; - ti,hwmods = "timer4"; - }; - - timer5: timer@40138000 { - compatible = "ti,omap2-timer"; - reg = <0x40138000 0x80>, - <0x49038000 0x80>; - interrupts = <0 41 0x4>; - ti,hwmods = "timer5"; - ti,timer-dsp; - }; - - timer6: timer@4013a000 { - compatible = "ti,omap2-timer"; - reg = <0x4013a000 0x80>, - <0x4903a000 0x80>; - interrupts = <0 42 0x4>; - ti,hwmods = "timer6"; - ti,timer-dsp; - }; - - timer7: timer@4013c000 { - compatible = "ti,omap2-timer"; - reg = <0x4013c000 0x80>, - <0x4903c000 0x80>; - interrupts = <0 43 0x4>; - ti,hwmods = "timer7"; - ti,timer-dsp; - }; - - timer8: timer@4013e000 { - compatible = "ti,omap2-timer"; - reg = <0x4013e000 0x80>, - <0x4903e000 0x80>; - interrupts = <0 44 0x4>; - ti,hwmods = "timer8"; - ti,timer-pwm; - ti,timer-dsp; - }; - - timer9: timer@4803e000 { - compatible = "ti,omap2-timer"; - reg = <0x4803e000 0x80>; - interrupts = <0 45 0x4>; - ti,hwmods = "timer9"; - ti,timer-pwm; - }; - - timer10: timer@48086000 { - compatible = "ti,omap2-timer"; - reg = <0x48086000 0x80>; - interrupts = <0 46 0x4>; - ti,hwmods = "timer10"; - ti,timer-pwm; - }; - - timer11: timer@48088000 { - compatible = "ti,omap2-timer"; - reg = <0x48088000 0x80>; - interrupts = <0 47 0x4>; - ti,hwmods = "timer11"; - ti,timer-pwm; - }; }; }; diff --git a/trunk/arch/arm/boot/dts/omap5-evm.dts b/trunk/arch/arm/boot/dts/omap5-evm.dts index 8722c15bbba2..c663eba73168 100644 --- a/trunk/arch/arm/boot/dts/omap5-evm.dts +++ b/trunk/arch/arm/boot/dts/omap5-evm.dts @@ -8,7 +8,6 @@ /dts-v1/; /include/ "omap5.dtsi" -/include/ "samsung_k3pe0e000b.dtsi" / { model = "TI OMAP5 EVM board"; @@ -16,7 +15,7 @@ memory { device_type = "memory"; - reg = <0x80000000 0x80000000>; /* 2 GB */ + reg = <0x80000000 0x40000000>; /* 1 GB */ }; vmmcsd_fixed: fixedregulator-mmcsd { @@ -141,13 +140,3 @@ &mcbsp3 { status = "disabled"; }; - -&emif1 { - cs1-used; - device-handle = <&samsung_K3PE0E000B>; -}; - -&emif2 { - cs1-used; - device-handle = <&samsung_K3PE0E000B>; -}; diff --git a/trunk/arch/arm/boot/dts/omap5.dtsi b/trunk/arch/arm/boot/dts/omap5.dtsi index 790bb2a4b343..42c78beb4fdc 100644 --- a/trunk/arch/arm/boot/dts/omap5.dtsi +++ b/trunk/arch/arm/boot/dts/omap5.dtsi @@ -77,12 +77,6 @@ ranges; ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3"; - counter32k: counter@4ae04000 { - compatible = "ti,omap-counter32k"; - reg = <0x4ae04000 0x40>; - ti,hwmods = "counter_32k"; - }; - omap5_pmx_core: pinmux@4a002840 { compatible = "ti,omap4-padconf", "pinctrl-single"; reg = <0x4a002840 0x01b6>; @@ -110,8 +104,6 @@ gpio1: gpio@4ae10000 { compatible = "ti,omap4-gpio"; - reg = <0x4ae10000 0x200>; - interrupts = <0 29 0x4>; ti,hwmods = "gpio1"; gpio-controller; #gpio-cells = <2>; @@ -121,8 +113,6 @@ gpio2: gpio@48055000 { compatible = "ti,omap4-gpio"; - reg = <0x48055000 0x200>; - interrupts = <0 30 0x4>; ti,hwmods = "gpio2"; gpio-controller; #gpio-cells = <2>; @@ -132,8 +122,6 @@ gpio3: gpio@48057000 { compatible = "ti,omap4-gpio"; - reg = <0x48057000 0x200>; - interrupts = <0 31 0x4>; ti,hwmods = "gpio3"; gpio-controller; #gpio-cells = <2>; @@ -143,8 +131,6 @@ gpio4: gpio@48059000 { compatible = "ti,omap4-gpio"; - reg = <0x48059000 0x200>; - interrupts = <0 32 0x4>; ti,hwmods = "gpio4"; gpio-controller; #gpio-cells = <2>; @@ -154,8 +140,6 @@ gpio5: gpio@4805b000 { compatible = "ti,omap4-gpio"; - reg = <0x4805b000 0x200>; - interrupts = <0 33 0x4>; ti,hwmods = "gpio5"; gpio-controller; #gpio-cells = <2>; @@ -165,8 +149,6 @@ gpio6: gpio@4805d000 { compatible = "ti,omap4-gpio"; - reg = <0x4805d000 0x200>; - interrupts = <0 34 0x4>; ti,hwmods = "gpio6"; gpio-controller; #gpio-cells = <2>; @@ -176,8 +158,6 @@ gpio7: gpio@48051000 { compatible = "ti,omap4-gpio"; - reg = <0x48051000 0x200>; - interrupts = <0 35 0x4>; ti,hwmods = "gpio7"; gpio-controller; #gpio-cells = <2>; @@ -187,8 +167,6 @@ gpio8: gpio@48053000 { compatible = "ti,omap4-gpio"; - reg = <0x48053000 0x200>; - interrupts = <0 121 0x4>; ti,hwmods = "gpio8"; gpio-controller; #gpio-cells = <2>; @@ -198,8 +176,6 @@ i2c1: i2c@48070000 { compatible = "ti,omap4-i2c"; - reg = <0x48070000 0x100>; - interrupts = <0 56 0x4>; #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c1"; @@ -207,8 +183,6 @@ i2c2: i2c@48072000 { compatible = "ti,omap4-i2c"; - reg = <0x48072000 0x100>; - interrupts = <0 57 0x4>; #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c2"; @@ -216,26 +190,20 @@ i2c3: i2c@48060000 { compatible = "ti,omap4-i2c"; - reg = <0x48060000 0x100>; - interrupts = <0 61 0x4>; #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c3"; }; - i2c4: i2c@4807a000 { + i2c4: i2c@4807A000 { compatible = "ti,omap4-i2c"; - reg = <0x4807a000 0x100>; - interrupts = <0 62 0x4>; #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c4"; }; - i2c5: i2c@4807c000 { + i2c5: i2c@4807C000 { compatible = "ti,omap4-i2c"; - reg = <0x4807c000 0x100>; - interrupts = <0 60 0x4>; #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c5"; @@ -243,56 +211,42 @@ uart1: serial@4806a000 { compatible = "ti,omap4-uart"; - reg = <0x4806a000 0x100>; - interrupts = <0 72 0x4>; ti,hwmods = "uart1"; clock-frequency = <48000000>; }; uart2: serial@4806c000 { compatible = "ti,omap4-uart"; - reg = <0x4806c000 0x100>; - interrupts = <0 73 0x4>; ti,hwmods = "uart2"; clock-frequency = <48000000>; }; uart3: serial@48020000 { compatible = "ti,omap4-uart"; - reg = <0x48020000 0x100>; - interrupts = <0 74 0x4>; ti,hwmods = "uart3"; clock-frequency = <48000000>; }; uart4: serial@4806e000 { compatible = "ti,omap4-uart"; - reg = <0x4806e000 0x100>; - interrupts = <0 70 0x4>; ti,hwmods = "uart4"; clock-frequency = <48000000>; }; uart5: serial@48066000 { - compatible = "ti,omap4-uart"; - reg = <0x48066000 0x100>; - interrupts = <0 105 0x4>; + compatible = "ti,omap5-uart"; ti,hwmods = "uart5"; clock-frequency = <48000000>; }; uart6: serial@48068000 { - compatible = "ti,omap4-uart"; - reg = <0x48068000 0x100>; - interrupts = <0 106 0x4>; + compatible = "ti,omap6-uart"; ti,hwmods = "uart6"; clock-frequency = <48000000>; }; mmc1: mmc@4809c000 { compatible = "ti,omap4-hsmmc"; - reg = <0x4809c000 0x400>; - interrupts = <0 83 0x4>; ti,hwmods = "mmc1"; ti,dual-volt; ti,needs-special-reset; @@ -300,32 +254,24 @@ mmc2: mmc@480b4000 { compatible = "ti,omap4-hsmmc"; - reg = <0x480b4000 0x400>; - interrupts = <0 86 0x4>; ti,hwmods = "mmc2"; ti,needs-special-reset; }; mmc3: mmc@480ad000 { compatible = "ti,omap4-hsmmc"; - reg = <0x480ad000 0x400>; - interrupts = <0 94 0x4>; ti,hwmods = "mmc3"; ti,needs-special-reset; }; mmc4: mmc@480d1000 { compatible = "ti,omap4-hsmmc"; - reg = <0x480d1000 0x400>; - interrupts = <0 96 0x4>; ti,hwmods = "mmc4"; ti,needs-special-reset; }; mmc5: mmc@480d5000 { compatible = "ti,omap4-hsmmc"; - reg = <0x480d5000 0x400>; - interrupts = <0 59 0x4>; ti,hwmods = "mmc5"; ti,needs-special-reset; }; @@ -341,6 +287,7 @@ <0x49032000 0x7f>; /* L3 Interconnect */ reg-names = "mpu", "dma"; interrupts = <0 112 0x4>; + interrupt-parent = <&gic>; ti,hwmods = "mcpdm"; }; @@ -350,6 +297,7 @@ <0x4902e000 0x7f>; /* L3 Interconnect */ reg-names = "mpu", "dma"; interrupts = <0 114 0x4>; + interrupt-parent = <&gic>; ti,hwmods = "dmic"; }; @@ -360,6 +308,7 @@ reg-names = "mpu", "dma"; interrupts = <0 17 0x4>; interrupt-names = "common"; + interrupt-parent = <&gic>; ti,buffer-size = <128>; ti,hwmods = "mcbsp1"; }; @@ -371,6 +320,7 @@ reg-names = "mpu", "dma"; interrupts = <0 22 0x4>; interrupt-names = "common"; + interrupt-parent = <&gic>; ti,buffer-size = <128>; ti,hwmods = "mcbsp2"; }; @@ -382,119 +332,9 @@ reg-names = "mpu", "dma"; interrupts = <0 23 0x4>; interrupt-names = "common"; + interrupt-parent = <&gic>; ti,buffer-size = <128>; ti,hwmods = "mcbsp3"; }; - - timer1: timer@4ae18000 { - compatible = "ti,omap2-timer"; - reg = <0x4ae18000 0x80>; - interrupts = <0 37 0x4>; - ti,hwmods = "timer1"; - ti,timer-alwon; - }; - - timer2: timer@48032000 { - compatible = "ti,omap2-timer"; - reg = <0x48032000 0x80>; - interrupts = <0 38 0x4>; - ti,hwmods = "timer2"; - }; - - timer3: timer@48034000 { - compatible = "ti,omap2-timer"; - reg = <0x48034000 0x80>; - interrupts = <0 39 0x4>; - ti,hwmods = "timer3"; - }; - - timer4: timer@48036000 { - compatible = "ti,omap2-timer"; - reg = <0x48036000 0x80>; - interrupts = <0 40 0x4>; - ti,hwmods = "timer4"; - }; - - timer5: timer@40138000 { - compatible = "ti,omap2-timer"; - reg = <0x40138000 0x80>, - <0x49038000 0x80>; - interrupts = <0 41 0x4>; - ti,hwmods = "timer5"; - ti,timer-dsp; - }; - - timer6: timer@4013a000 { - compatible = "ti,omap2-timer"; - reg = <0x4013a000 0x80>, - <0x4903a000 0x80>; - interrupts = <0 42 0x4>; - ti,hwmods = "timer6"; - ti,timer-dsp; - ti,timer-pwm; - }; - - timer7: timer@4013c000 { - compatible = "ti,omap2-timer"; - reg = <0x4013c000 0x80>, - <0x4903c000 0x80>; - interrupts = <0 43 0x4>; - ti,hwmods = "timer7"; - ti,timer-dsp; - }; - - timer8: timer@4013e000 { - compatible = "ti,omap2-timer"; - reg = <0x4013e000 0x80>, - <0x4903e000 0x80>; - interrupts = <0 44 0x4>; - ti,hwmods = "timer8"; - ti,timer-dsp; - ti,timer-pwm; - }; - - timer9: timer@4803e000 { - compatible = "ti,omap2-timer"; - reg = <0x4803e000 0x80>; - interrupts = <0 45 0x4>; - ti,hwmods = "timer9"; - }; - - timer10: timer@48086000 { - compatible = "ti,omap2-timer"; - reg = <0x48086000 0x80>; - interrupts = <0 46 0x4>; - ti,hwmods = "timer10"; - }; - - timer11: timer@48088000 { - compatible = "ti,omap2-timer"; - reg = <0x48088000 0x80>; - interrupts = <0 47 0x4>; - ti,hwmods = "timer11"; - ti,timer-pwm; - }; - - emif1: emif@0x4c000000 { - compatible = "ti,emif-4d5"; - ti,hwmods = "emif1"; - phy-type = <2>; /* DDR PHY type: Intelli PHY */ - reg = <0x4c000000 0x400>; - interrupts = <0 110 0x4>; - hw-caps-read-idle-ctrl; - hw-caps-ll-interface; - hw-caps-temp-alert; - }; - - emif2: emif@0x4d000000 { - compatible = "ti,emif-4d5"; - ti,hwmods = "emif2"; - phy-type = <2>; /* DDR PHY type: Intelli PHY */ - reg = <0x4d000000 0x400>; - interrupts = <0 111 0x4>; - hw-caps-read-idle-ctrl; - hw-caps-ll-interface; - hw-caps-temp-alert; - }; }; }; diff --git a/trunk/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi b/trunk/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi deleted file mode 100644 index 9657a5cbc3ad..000000000000 --- a/trunk/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Timings and Geometry for Samsung K3PE0E000B memory part - */ - -/ { - samsung_K3PE0E000B: lpddr2 { - compatible = "Samsung,K3PE0E000B","jedec,lpddr2-s4"; - density = <4096>; - io-width = <32>; - - tRPab-min-tck = <3>; - tRCD-min-tck = <3>; - tWR-min-tck = <3>; - tRASmin-min-tck = <3>; - tRRD-min-tck = <2>; - tWTR-min-tck = <2>; - tXP-min-tck = <2>; - tRTP-min-tck = <2>; - tCKE-min-tck = <3>; - tCKESR-min-tck = <3>; - tFAW-min-tck = <8>; - - timings_samsung_K3PE0E000B_533MHz: lpddr2-timings@0 { - compatible = "jedec,lpddr2-timings"; - min-freq = <10000000>; - max-freq = <533333333>; - tRPab = <21000>; - tRCD = <18000>; - tWR = <15000>; - tRAS-min = <42000>; - tRRD = <10000>; - tWTR = <7500>; - tXP = <7500>; - tRTP = <7500>; - tCKESR = <15000>; - tDQSCK-max = <5500>; - tFAW = <50000>; - tZQCS = <90000>; - tZQCL = <360000>; - tZQinit = <1000000>; - tRAS-max-ns = <70000>; - tDQSCK-max-derated = <6000>; - }; - - timings_samsung_K3PE0E000B_266MHz: lpddr2-timings@1 { - compatible = "jedec,lpddr2-timings"; - min-freq = <10000000>; - max-freq = <266666666>; - tRPab = <21000>; - tRCD = <18000>; - tWR = <15000>; - tRAS-min = <42000>; - tRRD = <10000>; - tWTR = <7500>; - tXP = <7500>; - tRTP = <7500>; - tCKESR = <15000>; - tDQSCK-max = <5500>; - tFAW = <50000>; - tZQCS = <90000>; - tZQCL = <360000>; - tZQinit = <1000000>; - tRAS-max-ns = <70000>; - tDQSCK-max-derated = <6000>; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/tegra20-harmony.dts b/trunk/arch/arm/boot/dts/tegra20-harmony.dts index 74b8a47adf91..c3ef1ad26b6a 100644 --- a/trunk/arch/arm/boot/dts/tegra20-harmony.dts +++ b/trunk/arch/arm/boot/dts/tegra20-harmony.dts @@ -297,98 +297,131 @@ vinldo9-supply = <&sm2_reg>; regulators { - sys_reg: sys { + #address-cells = <1>; + #size-cells = <0>; + + sys_reg: regulator@0 { + reg = <0>; + regulator-compatible = "sys"; regulator-name = "vdd_sys"; regulator-always-on; }; - sm0 { + regulator@1 { + reg = <1>; + regulator-compatible = "sm0"; regulator-name = "vdd_sm0,vdd_core"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; regulator-always-on; }; - sm1 { + regulator@2 { + reg = <2>; + regulator-compatible = "sm1"; regulator-name = "vdd_sm1,vdd_cpu"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; regulator-always-on; }; - sm2_reg: sm2 { + sm2_reg: regulator@3 { + reg = <3>; + regulator-compatible = "sm2"; regulator-name = "vdd_sm2,vin_ldo*"; regulator-min-microvolt = <3700000>; regulator-max-microvolt = <3700000>; regulator-always-on; }; - ldo0 { + regulator@4 { + reg = <4>; + regulator-compatible = "ldo0"; regulator-name = "vdd_ldo0,vddio_pex_clk"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; - ldo1 { + regulator@5 { + reg = <5>; + regulator-compatible = "ldo1"; regulator-name = "vdd_ldo1,avdd_pll*"; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; regulator-always-on; }; - ldo2 { + regulator@6 { + reg = <6>; + regulator-compatible = "ldo2"; regulator-name = "vdd_ldo2,vdd_rtc"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; }; - ldo3 { + regulator@7 { + reg = <7>; + regulator-compatible = "ldo3"; regulator-name = "vdd_ldo3,avdd_usb*"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - ldo4 { + regulator@8 { + reg = <8>; + regulator-compatible = "ldo4"; regulator-name = "vdd_ldo4,avdd_osc,vddio_sys"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-always-on; }; - ldo5 { + regulator@9 { + reg = <9>; + regulator-compatible = "ldo5"; regulator-name = "vdd_ldo5,vcore_mmc"; regulator-min-microvolt = <2850000>; regulator-max-microvolt = <2850000>; regulator-always-on; }; - ldo6 { + regulator@10 { + reg = <10>; + regulator-compatible = "ldo6"; regulator-name = "vdd_ldo6,avdd_vdac"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - ldo7 { + regulator@11 { + reg = <11>; + regulator-compatible = "ldo7"; regulator-name = "vdd_ldo7,avdd_hdmi"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; - ldo8 { + regulator@12 { + reg = <12>; + regulator-compatible = "ldo8"; regulator-name = "vdd_ldo8,avdd_hdmi_pll"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - ldo9 { + regulator@13 { + reg = <13>; + regulator-compatible = "ldo9"; regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx"; regulator-min-microvolt = <2850000>; regulator-max-microvolt = <2850000>; regulator-always-on; }; - ldo_rtc { + regulator@14 { + reg = <14>; + regulator-compatible = "ldo_rtc"; regulator-name = "vdd_rtc_out,vdd_cell"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; diff --git a/trunk/arch/arm/boot/dts/tegra20-paz00.dts b/trunk/arch/arm/boot/dts/tegra20-paz00.dts index 6a93d1404c76..ddf287f52d49 100644 --- a/trunk/arch/arm/boot/dts/tegra20-paz00.dts +++ b/trunk/arch/arm/boot/dts/tegra20-paz00.dts @@ -291,26 +291,37 @@ vinldo9-supply = <&sm2_reg>; regulators { - sys_reg: sys { + #address-cells = <1>; + #size-cells = <0>; + + sys_reg: regulator@0 { + reg = <0>; + regulator-compatible = "sys"; regulator-name = "vdd_sys"; regulator-always-on; }; - sm0 { + regulator@1 { + reg = <1>; + regulator-compatible = "sm0"; regulator-name = "+1.2vs_sm0,vdd_core"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; regulator-always-on; }; - sm1 { + regulator@2 { + reg = <2>; + regulator-compatible = "sm1"; regulator-name = "+1.0vs_sm1,vdd_cpu"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; regulator-always-on; }; - sm2_reg: sm2 { + sm2_reg: regulator@3 { + reg = <3>; + regulator-compatible = "sm2"; regulator-name = "+3.7vs_sm2,vin_ldo*"; regulator-min-microvolt = <3700000>; regulator-max-microvolt = <3700000>; @@ -319,41 +330,53 @@ /* LDO0 is not connected to anything */ - ldo1 { + regulator@5 { + reg = <5>; + regulator-compatible = "ldo1"; regulator-name = "+1.1vs_ldo1,avdd_pll*"; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; regulator-always-on; }; - ldo2 { + regulator@6 { + reg = <6>; + regulator-compatible = "ldo2"; regulator-name = "+1.2vs_ldo2,vdd_rtc"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; }; - ldo3 { + regulator@7 { + reg = <7>; + regulator-compatible = "ldo3"; regulator-name = "+3.3vs_ldo3,avdd_usb*"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - ldo4 { + regulator@8 { + reg = <8>; + regulator-compatible = "ldo4"; regulator-name = "+1.8vs_ldo4,avdd_osc,vddio_sys"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-always-on; }; - ldo5 { + regulator@9 { + reg = <9>; + regulator-compatible = "ldo5"; regulator-name = "+2.85vs_ldo5,vcore_mmc"; regulator-min-microvolt = <2850000>; regulator-max-microvolt = <2850000>; regulator-always-on; }; - ldo6 { + regulator@10 { + reg = <10>; + regulator-compatible = "ldo6"; /* * Research indicates this should be * 1.8v; other boards that use this @@ -367,26 +390,34 @@ regulator-max-microvolt = <1800000>; }; - ldo7 { + regulator@11 { + reg = <11>; + regulator-compatible = "ldo7"; regulator-name = "+3.3vs_ldo7,avdd_hdmi"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; - ldo8 { + regulator@12 { + reg = <12>; + regulator-compatible = "ldo8"; regulator-name = "+1.8vs_ldo8,avdd_hdmi_pll"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - ldo9 { + regulator@13 { + reg = <13>; + regulator-compatible = "ldo9"; regulator-name = "+2.85vs_ldo9,vdd_ddr_rx"; regulator-min-microvolt = <2850000>; regulator-max-microvolt = <2850000>; regulator-always-on; }; - ldo_rtc { + regulator@14 { + reg = <14>; + regulator-compatible = "ldo_rtc"; regulator-name = "+3.3vs_rtc"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; diff --git a/trunk/arch/arm/boot/dts/tegra20-seaboard.dts b/trunk/arch/arm/boot/dts/tegra20-seaboard.dts index 33ae81358d8e..f0ba901676ac 100644 --- a/trunk/arch/arm/boot/dts/tegra20-seaboard.dts +++ b/trunk/arch/arm/boot/dts/tegra20-seaboard.dts @@ -395,26 +395,37 @@ vinldo9-supply = <&sm2_reg>; regulators { - sys_reg: sys { + #address-cells = <1>; + #size-cells = <0>; + + sys_reg: regulator@0 { + reg = <0>; + regulator-compatible = "sys"; regulator-name = "vdd_sys"; regulator-always-on; }; - sm0 { + regulator@1 { + reg = <1>; + regulator-compatible = "sm0"; regulator-name = "vdd_sm0,vdd_core"; regulator-min-microvolt = <1300000>; regulator-max-microvolt = <1300000>; regulator-always-on; }; - sm1 { + regulator@2 { + reg = <2>; + regulator-compatible = "sm1"; regulator-name = "vdd_sm1,vdd_cpu"; regulator-min-microvolt = <1125000>; regulator-max-microvolt = <1125000>; regulator-always-on; }; - sm2_reg: sm2 { + sm2_reg: regulator@3 { + reg = <3>; + regulator-compatible = "sm2"; regulator-name = "vdd_sm2,vin_ldo*"; regulator-min-microvolt = <3700000>; regulator-max-microvolt = <3700000>; @@ -423,66 +434,86 @@ /* LDO0 is not connected to anything */ - ldo1 { + regulator@5 { + reg = <5>; + regulator-compatible = "ldo1"; regulator-name = "vdd_ldo1,avdd_pll*"; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; regulator-always-on; }; - ldo2 { + regulator@6 { + reg = <6>; + regulator-compatible = "ldo2"; regulator-name = "vdd_ldo2,vdd_rtc"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; }; - ldo3 { + regulator@7 { + reg = <7>; + regulator-compatible = "ldo3"; regulator-name = "vdd_ldo3,avdd_usb*"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - ldo4 { + regulator@8 { + reg = <8>; + regulator-compatible = "ldo4"; regulator-name = "vdd_ldo4,avdd_osc,vddio_sys"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-always-on; }; - ldo5 { + regulator@9 { + reg = <9>; + regulator-compatible = "ldo5"; regulator-name = "vdd_ldo5,vcore_mmc"; regulator-min-microvolt = <2850000>; regulator-max-microvolt = <2850000>; regulator-always-on; }; - ldo6 { + regulator@10 { + reg = <10>; + regulator-compatible = "ldo6"; regulator-name = "vdd_ldo6,avdd_vdac,vddio_vi,vddio_cam"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - ldo7 { + regulator@11 { + reg = <11>; + regulator-compatible = "ldo7"; regulator-name = "vdd_ldo7,avdd_hdmi,vdd_fuse"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; - ldo8 { + regulator@12 { + reg = <12>; + regulator-compatible = "ldo8"; regulator-name = "vdd_ldo8,avdd_hdmi_pll"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - ldo9 { + regulator@13 { + reg = <13>; + regulator-compatible = "ldo9"; regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx"; regulator-min-microvolt = <2850000>; regulator-max-microvolt = <2850000>; regulator-always-on; }; - ldo_rtc { + regulator@14 { + reg = <14>; + regulator-compatible = "ldo_rtc"; regulator-name = "vdd_rtc_out,vdd_cell"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; diff --git a/trunk/arch/arm/boot/dts/tegra20-tamonten.dtsi b/trunk/arch/arm/boot/dts/tegra20-tamonten.dtsi index 5b3d8b157b33..f18cec9f6a77 100644 --- a/trunk/arch/arm/boot/dts/tegra20-tamonten.dtsi +++ b/trunk/arch/arm/boot/dts/tegra20-tamonten.dtsi @@ -271,72 +271,97 @@ vinldo9-supply = <&sm2_reg>; regulators { - sys_reg: sys { + #address-cells = <1>; + #size-cells = <0>; + + sys_reg: regulator@0 { + reg = <0>; + regulator-compatible = "sys"; regulator-name = "vdd_sys"; regulator-always-on; }; - sm0 { + regulator@1 { + reg = <1>; + regulator-compatible = "sm0"; regulator-name = "vdd_sys_sm0,vdd_core"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; regulator-always-on; }; - sm1 { + regulator@2 { + reg = <2>; + regulator-compatible = "sm1"; regulator-name = "vdd_sys_sm1,vdd_cpu"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; regulator-always-on; }; - sm2_reg: sm2 { + sm2_reg: regulator@3 { + reg = <3>; + regulator-compatible = "sm2"; regulator-name = "vdd_sys_sm2,vin_ldo*"; regulator-min-microvolt = <3700000>; regulator-max-microvolt = <3700000>; regulator-always-on; }; - ldo0 { + regulator@4 { + reg = <4>; + regulator-compatible = "ldo0"; regulator-name = "vdd_ldo0,vddio_pex_clk"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; - ldo1 { + regulator@5 { + reg = <5>; + regulator-compatible = "ldo1"; regulator-name = "vdd_ldo1,avdd_pll*"; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; regulator-always-on; }; - ldo2 { + regulator@6 { + reg = <6>; + regulator-compatible = "ldo2"; regulator-name = "vdd_ldo2,vdd_rtc"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; }; - ldo3 { + regulator@7 { + reg = <7>; + regulator-compatible = "ldo3"; regulator-name = "vdd_ldo3,avdd_usb*"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - ldo4 { + regulator@8 { + reg = <8>; + regulator-compatible = "ldo4"; regulator-name = "vdd_ldo4,avdd_osc,vddio_sys"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-always-on; }; - ldo5 { + regulator@9 { + reg = <9>; + regulator-compatible = "ldo5"; regulator-name = "vdd_ldo5,vcore_mmc"; regulator-min-microvolt = <2850000>; regulator-max-microvolt = <2850000>; }; - ldo6 { + regulator@10 { + reg = <10>; + regulator-compatible = "ldo6"; regulator-name = "vdd_ldo6,avdd_vdac"; /* * According to the Tegra 2 Automotive @@ -348,19 +373,25 @@ regulator-max-microvolt = <2850000>; }; - ldo7 { + regulator@11 { + reg = <11>; + regulator-compatible = "ldo7"; regulator-name = "vdd_ldo7,avdd_hdmi"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; - ldo8 { + regulator@12 { + reg = <12>; + regulator-compatible = "ldo8"; regulator-name = "vdd_ldo8,avdd_hdmi_pll"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - ldo9 { + regulator@13 { + reg = <13>; + regulator-compatible = "ldo9"; regulator-name = "vdd_ldo9,vdd_ddr_rx,avdd_cam"; /* * According to the Tegra 2 Automotive @@ -373,7 +404,9 @@ regulator-always-on; }; - ldo_rtc { + regulator@14 { + reg = <14>; + regulator-compatible = "ldo_rtc"; regulator-name = "vdd_rtc_out"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; diff --git a/trunk/arch/arm/boot/dts/tegra20-ventana.dts b/trunk/arch/arm/boot/dts/tegra20-ventana.dts index 86854f1abd58..3e5952fcfbc5 100644 --- a/trunk/arch/arm/boot/dts/tegra20-ventana.dts +++ b/trunk/arch/arm/boot/dts/tegra20-ventana.dts @@ -311,26 +311,37 @@ vinldo9-supply = <&sm2_reg>; regulators { - sys_reg: sys { + #address-cells = <1>; + #size-cells = <0>; + + sys_reg: regulator@0 { + reg = <0>; + regulator-compatible = "sys"; regulator-name = "vdd_sys"; regulator-always-on; }; - sm0 { + regulator@1 { + reg = <1>; + regulator-compatible = "sm0"; regulator-name = "vdd_sm0,vdd_core"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; regulator-always-on; }; - sm1 { + regulator@2 { + reg = <2>; + regulator-compatible = "sm1"; regulator-name = "vdd_sm1,vdd_cpu"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; regulator-always-on; }; - sm2_reg: sm2 { + sm2_reg: regulator@3 { + reg = <3>; + regulator-compatible = "sm2"; regulator-name = "vdd_sm2,vin_ldo*"; regulator-min-microvolt = <3700000>; regulator-max-microvolt = <3700000>; @@ -339,66 +350,86 @@ /* LDO0 is not connected to anything */ - ldo1 { + regulator@5 { + reg = <5>; + regulator-compatible = "ldo1"; regulator-name = "vdd_ldo1,avdd_pll*"; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; regulator-always-on; }; - ldo2 { + regulator@6 { + reg = <6>; + regulator-compatible = "ldo2"; regulator-name = "vdd_ldo2,vdd_rtc"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; }; - ldo3 { + regulator@7 { + reg = <7>; + regulator-compatible = "ldo3"; regulator-name = "vdd_ldo3,avdd_usb*"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - ldo4 { + regulator@8 { + reg = <8>; + regulator-compatible = "ldo4"; regulator-name = "vdd_ldo4,avdd_osc,vddio_sys"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-always-on; }; - ldo5 { + regulator@9 { + reg = <9>; + regulator-compatible = "ldo5"; regulator-name = "vdd_ldo5,vcore_mmc"; regulator-min-microvolt = <2850000>; regulator-max-microvolt = <2850000>; regulator-always-on; }; - ldo6 { + regulator@10 { + reg = <10>; + regulator-compatible = "ldo6"; regulator-name = "vdd_ldo6,avdd_vdac"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - ldo7 { + regulator@11 { + reg = <11>; + regulator-compatible = "ldo7"; regulator-name = "vdd_ldo7,avdd_hdmi,vdd_fuse"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; - ldo8 { + regulator@12 { + reg = <12>; + regulator-compatible = "ldo8"; regulator-name = "vdd_ldo8,avdd_hdmi_pll"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - ldo9 { + regulator@13 { + reg = <13>; + regulator-compatible = "ldo9"; regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx"; regulator-min-microvolt = <2850000>; regulator-max-microvolt = <2850000>; regulator-always-on; }; - ldo_rtc { + regulator@14 { + reg = <14>; + regulator-compatible = "ldo_rtc"; regulator-name = "vdd_rtc_out,vdd_cell"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; diff --git a/trunk/arch/arm/boot/dts/tegra20-whistler.dts b/trunk/arch/arm/boot/dts/tegra20-whistler.dts index 94a71c91beb5..c636d002d6d8 100644 --- a/trunk/arch/arm/boot/dts/tegra20-whistler.dts +++ b/trunk/arch/arm/boot/dts/tegra20-whistler.dts @@ -295,182 +295,243 @@ in20-supply = <&mbatt_reg>; regulators { - mbatt_reg: mbatt { + #address-cells = <1>; + #size-cells = <0>; + + mbatt_reg: regulator@0 { + reg = <0>; + regulator-compatible = "mbatt"; regulator-name = "vbat_pmu"; regulator-always-on; }; - sd1 { + regulator@1 { + reg = <1>; + regulator-compatible = "sd1"; regulator-name = "nvvdd_sv1,vdd_cpu_pmu"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; regulator-always-on; }; - sd2 { + regulator@2 { + reg = <2>; + regulator-compatible = "sd2"; regulator-name = "nvvdd_sv2,vdd_core"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; regulator-always-on; }; - nvvdd_sv3_reg: sd3 { + nvvdd_sv3_reg: regulator@3 { + reg = <3>; + regulator-compatible = "sd3"; regulator-name = "nvvdd_sv3"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-always-on; }; - ldo1 { + regulator@4 { + reg = <4>; + regulator-compatible = "ldo1"; regulator-name = "nvvdd_ldo1,vddio_rx_ddr,vcore_acc"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - ldo2 { + regulator@5 { + reg = <5>; + regulator-compatible = "ldo2"; regulator-name = "nvvdd_ldo2,avdd_pll*"; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; regulator-always-on; }; - ldo3 { + regulator@6 { + reg = <6>; + regulator-compatible = "ldo3"; regulator-name = "nvvdd_ldo3,vcom_1v8b"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-always-on; }; - ldo4 { + regulator@7 { + reg = <7>; + regulator-compatible = "ldo4"; regulator-name = "nvvdd_ldo4,avdd_usb*"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - ldo5 { + regulator@8 { + reg = <8>; + regulator-compatible = "ldo5"; regulator-name = "nvvdd_ldo5,vcore_mmc,avdd_lcd1,vddio_1wire"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; regulator-always-on; }; - ldo6 { + regulator@9 { + reg = <9>; + regulator-compatible = "ldo6"; regulator-name = "nvvdd_ldo6,avdd_hdmi_pll"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - ldo7 { + regulator@10 { + reg = <10>; + regulator-compatible = "ldo7"; regulator-name = "nvvdd_ldo7,avddio_audio"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; regulator-always-on; }; - ldo8 { + regulator@11 { + reg = <11>; + regulator-compatible = "ldo8"; regulator-name = "nvvdd_ldo8,vcom_3v0,vcore_cmps"; regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; }; - ldo9 { + regulator@12 { + reg = <12>; + regulator-compatible = "ldo9"; regulator-name = "nvvdd_ldo9,avdd_cam*"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; }; - ldo10 { + regulator@13 { + reg = <13>; + regulator-compatible = "ldo10"; regulator-name = "nvvdd_ldo10,avdd_usb_ic_3v0"; regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; regulator-always-on; }; - ldo11 { + regulator@14 { + reg = <14>; + regulator-compatible = "ldo11"; regulator-name = "nvvdd_ldo11,vddio_pex_clk,vcom_33,avdd_hdmi"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; - ldo12 { + regulator@15 { + reg = <15>; + regulator-compatible = "ldo12"; regulator-name = "nvvdd_ldo12,vddio_sdio"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; regulator-always-on; }; - ldo13 { + regulator@16 { + reg = <16>; + regulator-compatible = "ldo13"; regulator-name = "nvvdd_ldo13,vcore_phtn,vdd_af"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; }; - ldo14 { + regulator@17 { + reg = <17>; + regulator-compatible = "ldo14"; regulator-name = "nvvdd_ldo14,avdd_vdac"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; }; - ldo15 { + regulator@18 { + reg = <18>; + regulator-compatible = "ldo15"; regulator-name = "nvvdd_ldo15,vcore_temp,vddio_hdcp"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; - ldo16 { + regulator@19 { + reg = <19>; + regulator-compatible = "ldo16"; regulator-name = "nvvdd_ldo16,vdd_dbrtr"; regulator-min-microvolt = <1300000>; regulator-max-microvolt = <1300000>; }; - ldo17 { + regulator@20 { + reg = <20>; + regulator-compatible = "ldo17"; regulator-name = "nvvdd_ldo17,vddio_mipi"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; }; - ldo18 { + regulator@21 { + reg = <21>; + regulator-compatible = "ldo18"; regulator-name = "nvvdd_ldo18,vddio_vi,vcore_cam*"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - ldo19 { + regulator@22 { + reg = <22>; + regulator-compatible = "ldo19"; regulator-name = "nvvdd_ldo19,avdd_lcd2,vddio_lx"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; }; - ldo20 { + regulator@23 { + reg = <23>; + regulator-compatible = "ldo20"; regulator-name = "nvvdd_ldo20,vddio_ddr_1v2,vddio_hsic,vcom_1v2"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; regulator-always-on; }; - out5v { + regulator@24 { + reg = <24>; + regulator-compatible = "out5v"; regulator-name = "usb0_vbus_reg"; }; - out33v { + regulator@25 { + reg = <25>; + regulator-compatible = "out33v"; regulator-name = "pmu_out3v3"; }; - bbat { + regulator@26 { + reg = <26>; + regulator-compatible = "bbat"; regulator-name = "pmu_bbat"; regulator-min-microvolt = <2400000>; regulator-max-microvolt = <2400000>; regulator-always-on; }; - sdby { + regulator@27 { + reg = <27>; + regulator-compatible = "sdby"; regulator-name = "vdd_aon"; regulator-always-on; }; - vrtc { + regulator@28 { + reg = <28>; + regulator-compatible = "vrtc"; regulator-name = "vrtc,pmu_vccadc"; regulator-always-on; }; diff --git a/trunk/arch/arm/boot/dts/tegra30-cardhu.dtsi b/trunk/arch/arm/boot/dts/tegra30-cardhu.dtsi index b1271a894327..d10c9c5a3606 100644 --- a/trunk/arch/arm/boot/dts/tegra30-cardhu.dtsi +++ b/trunk/arch/arm/boot/dts/tegra30-cardhu.dtsi @@ -171,41 +171,56 @@ vccio-supply = <&vdd_ac_bat_reg>; regulators { - vdd1_reg: vdd1 { + #address-cells = <1>; + #size-cells = <0>; + + vdd1_reg: regulator@0 { + reg = <0>; + regulator-compatible = "vdd1"; regulator-name = "vddio_ddr_1v2"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; regulator-always-on; }; - vdd2_reg: vdd2 { + vdd2_reg: regulator@1 { + reg = <1>; + regulator-compatible = "vdd2"; regulator-name = "vdd_1v5_gen"; regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; regulator-always-on; }; - vddctrl_reg: vddctrl { + vddctrl_reg: regulator@2 { + reg = <2>; + regulator-compatible = "vddctrl"; regulator-name = "vdd_cpu,vdd_sys"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; regulator-always-on; }; - vio_reg: vio { + vio_reg: regulator@3 { + reg = <3>; + regulator-compatible = "vio"; regulator-name = "vdd_1v8_gen"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-always-on; }; - ldo1_reg: ldo1 { + ldo1_reg: regulator@4 { + reg = <4>; + regulator-compatible = "ldo1"; regulator-name = "vdd_pexa,vdd_pexb"; regulator-min-microvolt = <1050000>; regulator-max-microvolt = <1050000>; }; - ldo2_reg: ldo2 { + ldo2_reg: regulator@5 { + reg = <5>; + regulator-compatible = "ldo2"; regulator-name = "vdd_sata,avdd_plle"; regulator-min-microvolt = <1050000>; regulator-max-microvolt = <1050000>; @@ -213,34 +228,44 @@ /* LDO3 is not connected to anything */ - ldo4_reg: ldo4 { + ldo4_reg: regulator@7 { + reg = <7>; + regulator-compatible = "ldo4"; regulator-name = "vdd_rtc"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; regulator-always-on; }; - ldo5_reg: ldo5 { + ldo5_reg: regulator@8 { + reg = <8>; + regulator-compatible = "ldo5"; regulator-name = "vddio_sdmmc,avdd_vdac"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - ldo6_reg: ldo6 { + ldo6_reg: regulator@9 { + reg = <9>; + regulator-compatible = "ldo6"; regulator-name = "avdd_dsi_csi,pwrdet_mipi"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; }; - ldo7_reg: ldo7 { + ldo7_reg: regulator@10 { + reg = <10>; + regulator-compatible = "ldo7"; regulator-name = "vdd_pllm,x,u,a_p_c_s"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; regulator-always-on; }; - ldo8_reg: ldo8 { + ldo8_reg: regulator@11 { + reg = <11>; + regulator-compatible = "ldo8"; regulator-name = "vdd_ddr_hs"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; diff --git a/trunk/arch/arm/boot/dts/twl4030.dtsi b/trunk/arch/arm/boot/dts/twl4030.dtsi index 63411b036932..ff000172c93c 100644 --- a/trunk/arch/arm/boot/dts/twl4030.dtsi +++ b/trunk/arch/arm/boot/dts/twl4030.dtsi @@ -37,24 +37,6 @@ regulator-max-microvolt = <3150000>; }; - vusb1v5: regulator-vusb1v5 { - compatible = "ti,twl4030-vusb1v5"; - }; - - vusb1v8: regulator-vusb1v8 { - compatible = "ti,twl4030-vusb1v8"; - }; - - vusb3v1: regulator-vusb3v1 { - compatible = "ti,twl4030-vusb3v1"; - }; - - vsim: regulator-vsim { - compatible = "ti,twl4030-vsim"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3000000>; - }; - twl_gpio: gpio { compatible = "ti,twl4030-gpio"; gpio-controller; @@ -62,13 +44,4 @@ interrupt-controller; #interrupt-cells = <1>; }; - - twl4030-usb { - compatible = "ti,twl4030-usb"; - interrupts = <10>, <4>; - usb1v5-supply = <&vusb1v5>; - usb1v8-supply = <&vusb1v8>; - usb3v1-supply = <&vusb3v1>; - usb_mode = <1>; - }; }; diff --git a/trunk/arch/arm/boot/dts/twl6030.dtsi b/trunk/arch/arm/boot/dts/twl6030.dtsi index 9996cfc5ee80..123e2c40218a 100644 --- a/trunk/arch/arm/boot/dts/twl6030.dtsi +++ b/trunk/arch/arm/boot/dts/twl6030.dtsi @@ -86,9 +86,4 @@ clk32kg: regulator-clk32kg { compatible = "ti,twl6030-clk32kg"; }; - - twl_usb_comparator: usb-comparator { - compatible = "ti,twl6030-usb"; - interrupts = <4>, <10>; - }; }; diff --git a/trunk/arch/arm/boot/dts/zynq-ep107.dts b/trunk/arch/arm/boot/dts/zynq-ep107.dts index 574bc044f572..37ca192fb193 100644 --- a/trunk/arch/arm/boot/dts/zynq-ep107.dts +++ b/trunk/arch/arm/boot/dts/zynq-ep107.dts @@ -36,27 +36,16 @@ ranges; intc: interrupt-controller@f8f01000 { - compatible = "arm,cortex-a9-gic"; - #interrupt-cells = <3>; - #address-cells = <1>; interrupt-controller; - 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>; + compatible = "arm,gic"; + reg = <0xF8F01000 0x1000>; + #interrupt-cells = <2>; }; uart0: uart@e0000000 { compatible = "xlnx,xuartps"; reg = <0xE0000000 0x1000>; - interrupts = <0 27 4>; + interrupts = <59 0>; clock = <50000000>; }; }; diff --git a/trunk/arch/arm/configs/imx_v4_v5_defconfig b/trunk/arch/arm/configs/imx_v4_v5_defconfig index f71302c3ac33..78ed575feb1a 100644 --- a/trunk/arch/arm/configs/imx_v4_v5_defconfig +++ b/trunk/arch/arm/configs/imx_v4_v5_defconfig @@ -18,9 +18,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_MXC=y -CONFIG_ARCH_MULTI_V4T=y -CONFIG_ARCH_MULTI_V5=y -# CONFIG_ARCH_MULTI_V7 is not set +CONFIG_ARCH_IMX_V4_V5=y 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 44f117aab52c..394ded624e37 100644 --- a/trunk/arch/arm/configs/imx_v6_v7_defconfig +++ b/trunk/arch/arm/configs/imx_v6_v7_defconfig @@ -17,8 +17,6 @@ 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 8ea02ac3ec1a..23004847bb05 100644 --- a/trunk/arch/arm/include/asm/dma-mapping.h +++ b/trunk/arch/arm/include/asm/dma-mapping.h @@ -210,6 +210,13 @@ 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/mach-at91/at91sam9g45.c b/trunk/arch/arm/mach-at91/at91sam9g45.c index b7ae124c16e5..84af1b506d92 100644 --- a/trunk/arch/arm/mach-at91/at91sam9g45.c +++ b/trunk/arch/arm/mach-at91/at91sam9g45.c @@ -343,6 +343,7 @@ 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-at91/include/mach/atmel-mci.h b/trunk/arch/arm/mach-at91/include/mach/atmel-mci.h index 3069e4135573..cd580a12e904 100644 --- a/trunk/arch/arm/mach-at91/include/mach/atmel-mci.h +++ b/trunk/arch/arm/mach-at91/include/mach/atmel-mci.h @@ -14,4 +14,11 @@ struct mci_dma_data { #define slave_data_ptr(s) (&(s)->sdata) #define find_slave_dev(s) ((s)->sdata.dma_dev) +#define setup_dma_addr(s, t, r) do { \ + if (s) { \ + (s)->sdata.tx_reg = (t); \ + (s)->sdata.rx_reg = (r); \ + } \ +} while (0) + #endif /* __MACH_ATMEL_MCI_H */ diff --git a/trunk/arch/arm/mach-bcm2835/Makefile.boot b/trunk/arch/arm/mach-bcm2835/Makefile.boot index b3271754e9fd..2d30e17f5b69 100644 --- a/trunk/arch/arm/mach-bcm2835/Makefile.boot +++ b/trunk/arch/arm/mach-bcm2835/Makefile.boot @@ -1 +1,3 @@ -zreladdr-y := 0x00008000 + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 diff --git a/trunk/arch/arm/mach-bcm2835/bcm2835.c b/trunk/arch/arm/mach-bcm2835/bcm2835.c index 53e3842c9330..f6fea4933571 100644 --- a/trunk/arch/arm/mach-bcm2835/bcm2835.c +++ b/trunk/arch/arm/mach-bcm2835/bcm2835.c @@ -30,12 +30,12 @@ static struct map_desc io_map __initdata = { .type = MT_DEVICE }; -static void __init bcm2835_map_io(void) +void __init bcm2835_map_io(void) { iotable_init(&io_map, 1); } -static void __init bcm2835_init(void) +void __init bcm2835_init(void) { int ret; diff --git a/trunk/arch/arm/mach-davinci/board-dm646x-evm.c b/trunk/arch/arm/mach-davinci/board-dm646x-evm.c index 9211e8800c79..1dbf85beed1b 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 a794f6d9d444..64b0f65a8639 100644 --- a/trunk/arch/arm/mach-davinci/common.c +++ b/trunk/arch/arm/mach-davinci/common.c @@ -87,6 +87,8 @@ 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/dm644x.c b/trunk/arch/arm/mach-davinci/dm644x.c index 14e9947bad6e..cd0c8b1e1ecf 100644 --- a/trunk/arch/arm/mach-davinci/dm644x.c +++ b/trunk/arch/arm/mach-davinci/dm644x.c @@ -713,7 +713,8 @@ static int dm644x_venc_setup_clock(enum vpbe_enc_timings_type type, break; case VPBE_ENC_CUSTOM_TIMINGS: if (pclock <= 27000000) { - v |= DM644X_VPSS_DACCLKEN; + v |= DM644X_VPSS_MUXSEL_PLL2_MODE | + DM644X_VPSS_DACCLKEN; writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL)); } else { /* diff --git a/trunk/arch/arm/mach-davinci/usb.c b/trunk/arch/arm/mach-davinci/usb.c index 34509ffba221..f77b95336e2b 100644 --- a/trunk/arch/arm/mach-davinci/usb.c +++ b/trunk/arch/arm/mach-davinci/usb.c @@ -42,8 +42,14 @@ 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/mach-exynos/Kconfig b/trunk/arch/arm/mach-exynos/Kconfig index da55107033dd..69d10373a410 100644 --- a/trunk/arch/arm/mach-exynos/Kconfig +++ b/trunk/arch/arm/mach-exynos/Kconfig @@ -98,11 +98,6 @@ config EXYNOS_DEV_SYSMMU help Common setup code for SYSTEM MMU in EXYNOS platforms -config EXYNOS4_DEV_DWMCI - bool - help - Compile in platform device definitions for DWMCI - config EXYNOS4_DEV_USB_OHCI bool help diff --git a/trunk/arch/arm/mach-exynos/Makefile b/trunk/arch/arm/mach-exynos/Makefile index 9b58024f7d43..0c74bdc6b698 100644 --- a/trunk/arch/arm/mach-exynos/Makefile +++ b/trunk/arch/arm/mach-exynos/Makefile @@ -50,7 +50,6 @@ obj-$(CONFIG_MACH_EXYNOS5_DT) += mach-exynos5-dt.o obj-y += dev-uart.o obj-$(CONFIG_ARCH_EXYNOS4) += dev-audio.o obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev-ahci.o -obj-$(CONFIG_EXYNOS4_DEV_DWMCI) += dev-dwmci.o obj-$(CONFIG_EXYNOS_DEV_DMA) += dma.o obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI) += dev-ohci.o obj-$(CONFIG_EXYNOS_DEV_DRM) += dev-drm.o diff --git a/trunk/arch/arm/mach-exynos/clock-exynos4.c b/trunk/arch/arm/mach-exynos/clock-exynos4.c index fa8a13405c94..6a45c9a9abe9 100644 --- a/trunk/arch/arm/mach-exynos/clock-exynos4.c +++ b/trunk/arch/arm/mach-exynos/clock-exynos4.c @@ -611,6 +611,11 @@ static struct clk exynos4_init_clocks_off[] = { .devname = "exynos4210-spi.2", .enable = exynos4_clk_ip_peril_ctrl, .ctrlbit = (1 << 18), + }, { + .name = "iis", + .devname = "samsung-i2s.0", + .enable = exynos4_clk_ip_peril_ctrl, + .ctrlbit = (1 << 19), }, { .name = "iis", .devname = "samsung-i2s.1", diff --git a/trunk/arch/arm/mach-exynos/clock-exynos5.c b/trunk/arch/arm/mach-exynos/clock-exynos5.c index 4478757b9301..c44ca1ee1b8d 100644 --- a/trunk/arch/arm/mach-exynos/clock-exynos5.c +++ b/trunk/arch/arm/mach-exynos/clock-exynos5.c @@ -292,7 +292,7 @@ static struct clksrc_sources exynos5_clk_src_mpll = { .nr_sources = ARRAY_SIZE(exynos5_clk_src_mpll_list), }; -static struct clksrc_clk exynos5_clk_mout_mpll = { +struct clksrc_clk exynos5_clk_mout_mpll = { .clk = { .name = "mout_mpll", }, @@ -467,12 +467,12 @@ static struct clksrc_clk exynos5_clk_pclk_acp = { /* Core list of CMU_TOP side */ -static struct clk *exynos5_clkset_aclk_top_list[] = { +struct clk *exynos5_clkset_aclk_top_list[] = { [0] = &exynos5_clk_mout_mpll_user.clk, [1] = &exynos5_clk_mout_bpll_user.clk, }; -static struct clksrc_sources exynos5_clkset_aclk = { +struct clksrc_sources exynos5_clkset_aclk = { .sources = exynos5_clkset_aclk_top_list, .nr_sources = ARRAY_SIZE(exynos5_clkset_aclk_top_list), }; @@ -486,12 +486,12 @@ static struct clksrc_clk exynos5_clk_aclk_400 = { .reg_div = { .reg = EXYNOS5_CLKDIV_TOP0, .shift = 24, .size = 3 }, }; -static struct clk *exynos5_clkset_aclk_333_166_list[] = { +struct clk *exynos5_clkset_aclk_333_166_list[] = { [0] = &exynos5_clk_mout_cpll.clk, [1] = &exynos5_clk_mout_mpll_user.clk, }; -static struct clksrc_sources exynos5_clkset_aclk_333_166 = { +struct clksrc_sources exynos5_clkset_aclk_333_166 = { .sources = exynos5_clkset_aclk_333_166_list, .nr_sources = ARRAY_SIZE(exynos5_clkset_aclk_333_166_list), }; @@ -966,7 +966,7 @@ static struct clk exynos5_clk_fimd1 = { .ctrlbit = (1 << 0), }; -static struct clk *exynos5_clkset_group_list[] = { +struct clk *exynos5_clkset_group_list[] = { [0] = &clk_ext_xtal_mux, [1] = NULL, [2] = &exynos5_clk_sclk_hdmi24m, @@ -979,7 +979,7 @@ static struct clk *exynos5_clkset_group_list[] = { [9] = &exynos5_clk_mout_cpll.clk, }; -static struct clksrc_sources exynos5_clkset_group = { +struct clksrc_sources exynos5_clkset_group = { .sources = exynos5_clkset_group_list, .nr_sources = ARRAY_SIZE(exynos5_clkset_group_list), }; @@ -1195,7 +1195,7 @@ static struct clksrc_clk exynos5_clk_sclk_spi2 = { .reg_div = { .reg = EXYNOS5_CLKDIV_PERIC2, .shift = 8, .size = 8 }, }; -static struct clksrc_clk exynos5_clk_sclk_fimd1 = { +struct clksrc_clk exynos5_clk_sclk_fimd1 = { .clk = { .name = "sclk_fimd", .devname = "exynos5-fb.1", @@ -1476,7 +1476,7 @@ static void exynos5_clock_resume(void) #define exynos5_clock_resume NULL #endif -static struct syscore_ops exynos5_clock_syscore_ops = { +struct syscore_ops exynos5_clock_syscore_ops = { .suspend = exynos5_clock_suspend, .resume = exynos5_clock_resume, }; diff --git a/trunk/arch/arm/mach-exynos/common.c b/trunk/arch/arm/mach-exynos/common.c index 0dbee7fef9bd..1947be8e5f5b 100644 --- a/trunk/arch/arm/mach-exynos/common.c +++ b/trunk/arch/arm/mach-exynos/common.c @@ -63,7 +63,7 @@ static void exynos4_map_io(void); static void exynos5_map_io(void); static void exynos4_init_clocks(int xtal); static void exynos5_init_clocks(int xtal); -static void exynos4_init_uarts(struct s3c2410_uartcfg *cfg, int no); +static void exynos_init_uarts(struct s3c2410_uartcfg *cfg, int no); static int exynos_init(void); static struct cpu_table cpu_ids[] __initdata = { @@ -72,7 +72,7 @@ static struct cpu_table cpu_ids[] __initdata = { .idmask = EXYNOS4_CPU_MASK, .map_io = exynos4_map_io, .init_clocks = exynos4_init_clocks, - .init_uarts = exynos4_init_uarts, + .init_uarts = exynos_init_uarts, .init = exynos_init, .name = name_exynos4210, }, { @@ -80,7 +80,7 @@ static struct cpu_table cpu_ids[] __initdata = { .idmask = EXYNOS4_CPU_MASK, .map_io = exynos4_map_io, .init_clocks = exynos4_init_clocks, - .init_uarts = exynos4_init_uarts, + .init_uarts = exynos_init_uarts, .init = exynos_init, .name = name_exynos4212, }, { @@ -88,7 +88,7 @@ static struct cpu_table cpu_ids[] __initdata = { .idmask = EXYNOS4_CPU_MASK, .map_io = exynos4_map_io, .init_clocks = exynos4_init_clocks, - .init_uarts = exynos4_init_uarts, + .init_uarts = exynos_init_uarts, .init = exynos_init, .name = name_exynos4412, }, { @@ -96,6 +96,7 @@ static struct cpu_table cpu_ids[] __initdata = { .idmask = EXYNOS5_SOC_MASK, .map_io = exynos5_map_io, .init_clocks = exynos5_init_clocks, + .init_uarts = exynos_init_uarts, .init = exynos_init, .name = name_exynos5250, }, @@ -255,11 +256,26 @@ static struct map_desc exynos5_iodesc[] __initdata = { .pfn = __phys_to_pfn(EXYNOS5_PA_PMU), .length = SZ_64K, .type = MT_DEVICE, + }, { + .virtual = (unsigned long)S5P_VA_COMBINER_BASE, + .pfn = __phys_to_pfn(EXYNOS5_PA_COMBINER), + .length = SZ_4K, + .type = MT_DEVICE, }, { .virtual = (unsigned long)S3C_VA_UART, .pfn = __phys_to_pfn(EXYNOS5_PA_UART), .length = SZ_512K, .type = MT_DEVICE, + }, { + .virtual = (unsigned long)S5P_VA_GIC_CPU, + .pfn = __phys_to_pfn(EXYNOS5_PA_GIC_CPU), + .length = SZ_8K, + .type = MT_DEVICE, + }, { + .virtual = (unsigned long)S5P_VA_GIC_DIST, + .pfn = __phys_to_pfn(EXYNOS5_PA_GIC_DIST), + .length = SZ_4K, + .type = MT_DEVICE, }, }; @@ -338,6 +354,23 @@ static void __init exynos4_map_io(void) static void __init exynos5_map_io(void) { iotable_init(exynos5_iodesc, ARRAY_SIZE(exynos5_iodesc)); + + s3c_device_i2c0.resource[0].start = EXYNOS5_PA_IIC(0); + s3c_device_i2c0.resource[0].end = EXYNOS5_PA_IIC(0) + SZ_4K - 1; + s3c_device_i2c0.resource[1].start = EXYNOS5_IRQ_IIC; + s3c_device_i2c0.resource[1].end = EXYNOS5_IRQ_IIC; + + s3c_sdhci_setname(0, "exynos4-sdhci"); + s3c_sdhci_setname(1, "exynos4-sdhci"); + s3c_sdhci_setname(2, "exynos4-sdhci"); + s3c_sdhci_setname(3, "exynos4-sdhci"); + + /* The I2C bus controllers are directly compatible with s3c2440 */ + s3c_i2c0_setname("s3c2440-i2c"); + s3c_i2c1_setname("s3c2440-i2c"); + s3c_i2c2_setname("s3c2440-i2c"); + + s3c64xx_spi_setname("exynos4210-spi"); } static void __init exynos4_init_clocks(int xtal) @@ -556,8 +589,7 @@ static void __init combiner_init(void __iomem *combiner_base, } #ifdef CONFIG_OF -static int __init combiner_of_init(struct device_node *np, - struct device_node *parent) +int __init combiner_of_init(struct device_node *np, struct device_node *parent) { void __iomem *combiner_base; @@ -695,7 +727,7 @@ static int __init exynos_init(void) /* uart registration process */ -static void __init exynos4_init_uarts(struct s3c2410_uartcfg *cfg, int no) +static void __init exynos_init_uarts(struct s3c2410_uartcfg *cfg, int no) { struct s3c2410_uartcfg *tcfg = cfg; u32 ucnt; @@ -703,7 +735,10 @@ static void __init exynos4_init_uarts(struct s3c2410_uartcfg *cfg, int no) for (ucnt = 0; ucnt < no; ucnt++, tcfg++) tcfg->has_fracval = 1; - s3c24xx_init_uartdevs("exynos4210-uart", exynos4_uart_resources, cfg, no); + if (soc_is_exynos5250()) + s3c24xx_init_uartdevs("exynos4210-uart", exynos5_uart_resources, cfg, no); + else + s3c24xx_init_uartdevs("exynos4210-uart", exynos4_uart_resources, cfg, no); } static void __iomem *exynos_eint_base; @@ -935,7 +970,14 @@ static void exynos_irq_eint0_15(unsigned int irq, struct irq_desc *desc) struct irq_chip *chip = irq_get_chip(irq); chained_irq_enter(chip, desc); + chip->irq_mask(&desc->irq_data); + + if (chip->irq_ack) + chip->irq_ack(&desc->irq_data); + generic_handle_irq(*irq_data); + + chip->irq_unmask(&desc->irq_data); chained_irq_exit(chip, desc); } diff --git a/trunk/arch/arm/mach-exynos/dev-audio.c b/trunk/arch/arm/mach-exynos/dev-audio.c index a1cb42c39590..ae321c7cb15f 100644 --- a/trunk/arch/arm/mach-exynos/dev-audio.c +++ b/trunk/arch/arm/mach-exynos/dev-audio.c @@ -14,9 +14,9 @@ #include #include #include -#include #include +#include #include #include diff --git a/trunk/arch/arm/mach-exynos/dev-dwmci.c b/trunk/arch/arm/mach-exynos/dev-dwmci.c deleted file mode 100644 index 79035018fb74..000000000000 --- a/trunk/arch/arm/mach-exynos/dev-dwmci.c +++ /dev/null @@ -1,75 +0,0 @@ -/* - * linux/arch/arm/mach-exynos4/dev-dwmci.c - * - * Copyright (c) 2011 Samsung Electronics Co., Ltd. - * http://www.samsung.com - * - * Platform device for Synopsys DesignWare Mobile Storage IP - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#include -#include -#include -#include -#include -#include - -#include - -#include - -static int exynos4_dwmci_get_bus_wd(u32 slot_id) -{ - return 4; -} - -static int exynos4_dwmci_init(u32 slot_id, irq_handler_t handler, void *data) -{ - return 0; -} - -static struct resource exynos4_dwmci_resource[] = { - [0] = DEFINE_RES_MEM(EXYNOS4_PA_DWMCI, SZ_4K), - [1] = DEFINE_RES_IRQ(EXYNOS4_IRQ_DWMCI), -}; - -static struct dw_mci_board exynos4_dwci_pdata = { - .num_slots = 1, - .quirks = DW_MCI_QUIRK_BROKEN_CARD_DETECTION, - .bus_hz = 80 * 1000 * 1000, - .detect_delay_ms = 200, - .init = exynos4_dwmci_init, - .get_bus_wd = exynos4_dwmci_get_bus_wd, -}; - -static u64 exynos4_dwmci_dmamask = DMA_BIT_MASK(32); - -struct platform_device exynos4_device_dwmci = { - .name = "dw_mmc", - .id = -1, - .num_resources = ARRAY_SIZE(exynos4_dwmci_resource), - .resource = exynos4_dwmci_resource, - .dev = { - .dma_mask = &exynos4_dwmci_dmamask, - .coherent_dma_mask = DMA_BIT_MASK(32), - .platform_data = &exynos4_dwci_pdata, - }, -}; - -void __init exynos4_dwmci_set_platdata(struct dw_mci_board *pd) -{ - struct dw_mci_board *npd; - - npd = s3c_set_platdata(pd, sizeof(struct dw_mci_board), - &exynos4_device_dwmci); - - if (!npd->init) - npd->init = exynos4_dwmci_init; - if (!npd->get_bus_wd) - npd->get_bus_wd = exynos4_dwmci_get_bus_wd; -} diff --git a/trunk/arch/arm/mach-exynos/dev-ohci.c b/trunk/arch/arm/mach-exynos/dev-ohci.c index 4244d02dafbd..14ed7951a2c6 100644 --- a/trunk/arch/arm/mach-exynos/dev-ohci.c +++ b/trunk/arch/arm/mach-exynos/dev-ohci.c @@ -12,10 +12,10 @@ #include #include -#include #include #include +#include #include #include diff --git a/trunk/arch/arm/mach-exynos/dev-uart.c b/trunk/arch/arm/mach-exynos/dev-uart.c index 7c42f4b7c8be..2e85c022fd16 100644 --- a/trunk/arch/arm/mach-exynos/dev-uart.c +++ b/trunk/arch/arm/mach-exynos/dev-uart.c @@ -52,3 +52,27 @@ struct s3c24xx_uart_resources exynos4_uart_resources[] __initdata = { .nr_resources = ARRAY_SIZE(exynos4_uart3_resource), }, }; + +EXYNOS_UART_RESOURCE(5, 0) +EXYNOS_UART_RESOURCE(5, 1) +EXYNOS_UART_RESOURCE(5, 2) +EXYNOS_UART_RESOURCE(5, 3) + +struct s3c24xx_uart_resources exynos5_uart_resources[] __initdata = { + [0] = { + .resources = exynos5_uart0_resource, + .nr_resources = ARRAY_SIZE(exynos5_uart0_resource), + }, + [1] = { + .resources = exynos5_uart1_resource, + .nr_resources = ARRAY_SIZE(exynos5_uart0_resource), + }, + [2] = { + .resources = exynos5_uart2_resource, + .nr_resources = ARRAY_SIZE(exynos5_uart2_resource), + }, + [3] = { + .resources = exynos5_uart3_resource, + .nr_resources = ARRAY_SIZE(exynos5_uart3_resource), + }, +}; diff --git a/trunk/arch/arm/mach-exynos/dma.c b/trunk/arch/arm/mach-exynos/dma.c index 87e07d6fc615..21d568b3b149 100644 --- a/trunk/arch/arm/mach-exynos/dma.c +++ b/trunk/arch/arm/mach-exynos/dma.c @@ -275,9 +275,6 @@ static int __init exynos_dma_init(void) exynos_pdma1_pdata.nr_valid_peri = ARRAY_SIZE(exynos4210_pdma1_peri); exynos_pdma1_pdata.peri_id = exynos4210_pdma1_peri; - - if (samsung_rev() == EXYNOS4210_REV_0) - exynos_mdma1_device.res.start = EXYNOS4_PA_S_MDMA1; } else if (soc_is_exynos4212() || soc_is_exynos4412()) { exynos_pdma0_pdata.nr_valid_peri = ARRAY_SIZE(exynos4212_pdma0_peri); diff --git a/trunk/arch/arm/mach-exynos/include/mach/dwmci.h b/trunk/arch/arm/mach-exynos/include/mach/dwmci.h deleted file mode 100644 index 7ce657459cc0..000000000000 --- a/trunk/arch/arm/mach-exynos/include/mach/dwmci.h +++ /dev/null @@ -1,20 +0,0 @@ -/* linux/arch/arm/mach-exynos4/include/mach/dwmci.h - * - * Copyright (c) 2011 Samsung Electronics Co., Ltd. - * http://www.samsung.com/ - * - * Synopsys DesignWare Mobile Storage for EXYNOS4210 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#ifndef __ASM_ARM_ARCH_DWMCI_H -#define __ASM_ARM_ARCH_DWMCI_H __FILE__ - -#include - -extern void exynos4_dwmci_set_platdata(struct dw_mci_board *pd); - -#endif /* __ASM_ARM_ARCH_DWMCI_H */ diff --git a/trunk/arch/arm/mach-exynos/include/mach/irqs.h b/trunk/arch/arm/mach-exynos/include/mach/irqs.h index 6da31152de3a..35bced6f9092 100644 --- a/trunk/arch/arm/mach-exynos/include/mach/irqs.h +++ b/trunk/arch/arm/mach-exynos/include/mach/irqs.h @@ -259,6 +259,11 @@ #define EXYNOS5_IRQ_IEM_IEC IRQ_SPI(48) #define EXYNOS5_IRQ_IEM_APC IRQ_SPI(49) #define EXYNOS5_IRQ_GPIO_C2C IRQ_SPI(50) +#define EXYNOS5_IRQ_UART0 IRQ_SPI(51) +#define EXYNOS5_IRQ_UART1 IRQ_SPI(52) +#define EXYNOS5_IRQ_UART2 IRQ_SPI(53) +#define EXYNOS5_IRQ_UART3 IRQ_SPI(54) +#define EXYNOS5_IRQ_UART4 IRQ_SPI(55) #define EXYNOS5_IRQ_IIC IRQ_SPI(56) #define EXYNOS5_IRQ_IIC1 IRQ_SPI(57) #define EXYNOS5_IRQ_IIC2 IRQ_SPI(58) diff --git a/trunk/arch/arm/mach-exynos/include/mach/map.h b/trunk/arch/arm/mach-exynos/include/mach/map.h index 872840b2ff45..8480849affb9 100644 --- a/trunk/arch/arm/mach-exynos/include/mach/map.h +++ b/trunk/arch/arm/mach-exynos/include/mach/map.h @@ -90,7 +90,6 @@ #define EXYNOS4_PA_MDMA0 0x10810000 #define EXYNOS4_PA_MDMA1 0x12850000 -#define EXYNOS4_PA_S_MDMA1 0x12840000 #define EXYNOS4_PA_PDMA0 0x12680000 #define EXYNOS4_PA_PDMA1 0x12690000 #define EXYNOS5_PA_MDMA0 0x10800000 @@ -280,6 +279,7 @@ #define EXYNOS5_PA_UART1 0x12C10000 #define EXYNOS5_PA_UART2 0x12C20000 #define EXYNOS5_PA_UART3 0x12C30000 +#define EXYNOS5_SZ_UART SZ_256 #define S3C_VA_UARTx(x) (S3C_VA_UART + ((x) * S3C_UART_OFFSET)) diff --git a/trunk/arch/arm/mach-exynos/include/mach/regs-pmu.h b/trunk/arch/arm/mach-exynos/include/mach/regs-pmu.h index 70b2795f5283..d4e392b811a3 100644 --- a/trunk/arch/arm/mach-exynos/include/mach/regs-pmu.h +++ b/trunk/arch/arm/mach-exynos/include/mach/regs-pmu.h @@ -230,6 +230,8 @@ /* For EXYNOS5 */ +#define EXYNOS5_USB_CFG S5P_PMUREG(0x0230) + #define EXYNOS5_AUTO_WDTRESET_DISABLE S5P_PMUREG(0x0408) #define EXYNOS5_MASK_WDTRESET_REQUEST S5P_PMUREG(0x040C) diff --git a/trunk/arch/arm/mach-exynos/mach-nuri.c b/trunk/arch/arm/mach-exynos/mach-nuri.c index 69359a0c8a1c..c05d7aa84031 100644 --- a/trunk/arch/arm/mach-exynos/mach-nuri.c +++ b/trunk/arch/arm/mach-exynos/mach-nuri.c @@ -25,10 +25,7 @@ #include #include #include -#include -#include #include -#include #include #include