From 817ba283acf2d7b5aa073b96fd989f336fcff72a Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Fri, 23 Oct 2015 05:50:33 +0200 Subject: merge more stuff from 3.2.72 --- arch/arm/mach-at91/Kconfig | 30 +- arch/arm/mach-at91/Makefile | 11 +- arch/arm/mach-at91/Makefile.boot | 8 +- arch/arm/mach-at91/at91cap9.c | 47 +- arch/arm/mach-at91/at91cap9_devices.c | 15 +- arch/arm/mach-at91/at91rm9200.c | 49 +- arch/arm/mach-at91/at91rm9200_devices.c | 17 +- arch/arm/mach-at91/at91sam9260.c | 110 +- arch/arm/mach-at91/at91sam9260_devices.c | 19 +- arch/arm/mach-at91/at91sam9261.c | 93 +- arch/arm/mach-at91/at91sam9261_devices.c | 19 +- arch/arm/mach-at91/at91sam9263.c | 53 +- arch/arm/mach-at91/at91sam9263_devices.c | 15 +- arch/arm/mach-at91/at91sam9g45.c | 62 +- arch/arm/mach-at91/at91sam9g45_devices.c | 44 +- arch/arm/mach-at91/at91sam9rl.c | 59 +- arch/arm/mach-at91/at91sam9rl_devices.c | 9 +- arch/arm/mach-at91/board-1arm.c | 13 +- arch/arm/mach-at91/board-afeb-9260v1.c | 23 +- arch/arm/mach-at91/board-cam60.c | 23 +- arch/arm/mach-at91/board-cap9adk.c | 23 +- arch/arm/mach-at91/board-carmeva.c | 13 +- arch/arm/mach-at91/board-cpu9krea.c | 13 +- arch/arm/mach-at91/board-cpuat91.c | 13 +- arch/arm/mach-at91/board-csb337.c | 13 +- arch/arm/mach-at91/board-csb637.c | 13 +- arch/arm/mach-at91/board-eb9200.c | 13 +- arch/arm/mach-at91/board-ecbat91.c | 13 +- arch/arm/mach-at91/board-eco920.c | 11 +- arch/arm/mach-at91/board-flexibity.c | 11 +- arch/arm/mach-at91/board-foxg20.c | 12 +- arch/arm/mach-at91/board-gsia18s.c | 9 +- arch/arm/mach-at91/board-kafa.c | 13 +- arch/arm/mach-at91/board-kb9202.c | 22 +- arch/arm/mach-at91/board-neocore926.c | 23 +- arch/arm/mach-at91/board-pcontrol-g20.c | 11 +- arch/arm/mach-at91/board-picotux200.c | 13 +- arch/arm/mach-at91/board-qil-a9260.c | 23 +- arch/arm/mach-at91/board-rm9200dk.c | 22 +- arch/arm/mach-at91/board-rm9200ek.c | 13 +- arch/arm/mach-at91/board-sam9-l9260.c | 23 +- arch/arm/mach-at91/board-sam9260ek.c | 23 +- arch/arm/mach-at91/board-sam9261ek.c | 23 +- arch/arm/mach-at91/board-sam9263ek.c | 23 +- arch/arm/mach-at91/board-sam9g20ek.c | 27 +- arch/arm/mach-at91/board-sam9m10g45ek.c | 23 +- arch/arm/mach-at91/board-sam9rlek.c | 23 +- arch/arm/mach-at91/board-snapper9260.c | 23 +- arch/arm/mach-at91/board-stamp9g20.c | 16 +- arch/arm/mach-at91/board-usb-a9260.c | 236 --- arch/arm/mach-at91/board-usb-a9263.c | 252 --- arch/arm/mach-at91/board-yl-9200.c | 25 +- arch/arm/mach-at91/cpuidle.c | 42 +- arch/arm/mach-at91/generic.h | 34 +- arch/arm/mach-at91/gpio.c | 4 +- arch/arm/mach-at91/include/mach/at91_dbgu.h | 27 +- arch/arm/mach-at91/include/mach/at91_mci.h | 115 -- arch/arm/mach-at91/include/mach/at91_wdt.h | 37 - arch/arm/mach-at91/include/mach/at91cap9.h | 1 - arch/arm/mach-at91/include/mach/at91rm9200.h | 1 - arch/arm/mach-at91/include/mach/at91sam9260.h | 1 - arch/arm/mach-at91/include/mach/at91sam9261.h | 1 - arch/arm/mach-at91/include/mach/at91sam9263.h | 1 - arch/arm/mach-at91/include/mach/at91sam9g45.h | 3 - arch/arm/mach-at91/include/mach/at91sam9rl.h | 1 - arch/arm/mach-at91/include/mach/board.h | 8 +- arch/arm/mach-at91/include/mach/clkdev.h | 7 - arch/arm/mach-at91/include/mach/cpu.h | 159 +- arch/arm/mach-at91/include/mach/debug-macro.S | 16 +- arch/arm/mach-at91/include/mach/gpio.h | 5 - arch/arm/mach-at91/include/mach/hardware.h | 14 + arch/arm/mach-at91/include/mach/io.h | 11 +- arch/arm/mach-at91/include/mach/system_rev.h | 2 +- arch/arm/mach-at91/include/mach/timex.h | 5 + arch/arm/mach-at91/include/mach/vmalloc.h | 2 + arch/arm/mach-at91/leds.c | 2 +- arch/arm/mach-at91/pm.c | 4 +- arch/arm/mach-bcmring/Kconfig | 2 - arch/arm/mach-bcmring/Makefile.boot | 2 +- arch/arm/mach-bcmring/arch.c | 4 +- arch/arm/mach-bcmring/core.c | 2 +- arch/arm/mach-bcmring/dma.c | 6 +- arch/arm/mach-bcmring/include/mach/clkdev.h | 7 - arch/arm/mach-bcmring/include/mach/entry-macro.S | 4 - arch/arm/mach-bcmring/include/mach/hardware.h | 5 +- arch/arm/mach-bcmring/include/mach/memory.h | 33 - arch/arm/mach-bcmring/irq.c | 1 - arch/arm/mach-bcmring/mm.c | 4 + arch/arm/mach-bcmring/timer.c | 1 - arch/arm/mach-clps711x/Makefile.boot | 2 +- arch/arm/mach-clps711x/autcpu12.c | 2 +- arch/arm/mach-clps711x/cdb89712.c | 2 +- arch/arm/mach-clps711x/ceiva.c | 2 +- arch/arm/mach-clps711x/clep7312.c | 5 +- arch/arm/mach-clps711x/edb7211-arch.c | 5 +- arch/arm/mach-clps711x/fortunet.c | 4 +- arch/arm/mach-clps711x/include/mach/debug-macro.S | 2 +- arch/arm/mach-clps711x/p720t.c | 5 +- arch/arm/mach-cns3xxx/Makefile.boot | 2 +- arch/arm/mach-cns3xxx/cns3420vb.c | 5 +- arch/arm/mach-cns3xxx/core.c | 43 + arch/arm/mach-cns3xxx/core.h | 6 + arch/arm/mach-cns3xxx/include/mach/debug-macro.S | 2 +- arch/arm/mach-cns3xxx/include/mach/entry-macro.S | 1 - arch/arm/mach-cns3xxx/include/mach/hardware.h | 22 - arch/arm/mach-cns3xxx/include/mach/memory.h | 26 - arch/arm/mach-cns3xxx/include/mach/pm.h | 2 +- arch/arm/mach-cns3xxx/include/mach/system.h | 1 - arch/arm/mach-cns3xxx/include/mach/uncompress.h | 1 - arch/arm/mach-cns3xxx/include/mach/vmalloc.h | 2 +- arch/arm/mach-cns3xxx/pcie.c | 7 +- arch/arm/mach-cns3xxx/pm.c | 2 +- arch/arm/mach-davinci/Kconfig | 10 + arch/arm/mach-davinci/Makefile | 3 +- arch/arm/mach-davinci/Makefile.boot | 4 +- arch/arm/mach-davinci/board-da830-evm.c | 5 +- arch/arm/mach-davinci/board-da850-evm.c | 126 +- arch/arm/mach-davinci/board-dm355-evm.c | 5 +- arch/arm/mach-davinci/board-dm355-leopard.c | 5 +- arch/arm/mach-davinci/board-dm365-evm.c | 7 +- arch/arm/mach-davinci/board-dm644x-evm.c | 6 +- arch/arm/mach-davinci/board-dm646x-evm.c | 24 +- arch/arm/mach-davinci/board-mityomapl138.c | 7 +- arch/arm/mach-davinci/board-neuros-osd2.c | 5 +- arch/arm/mach-davinci/board-omapl138-hawk.c | 3 +- arch/arm/mach-davinci/board-sffsdr.c | 3 +- arch/arm/mach-davinci/board-tnetv107x-evm.c | 5 +- arch/arm/mach-davinci/cdce949.c | 1 + arch/arm/mach-davinci/clock.c | 46 +- arch/arm/mach-davinci/clock.h | 3 + arch/arm/mach-davinci/common.c | 3 + arch/arm/mach-davinci/cpufreq.c | 1 + arch/arm/mach-davinci/cpuidle.c | 54 +- arch/arm/mach-davinci/da830.c | 3 +- arch/arm/mach-davinci/da850.c | 22 +- arch/arm/mach-davinci/devices-da8xx.c | 129 ++ arch/arm/mach-davinci/devices-tnetv107x.c | 1 + arch/arm/mach-davinci/dm355.c | 3 +- arch/arm/mach-davinci/dm365.c | 3 +- arch/arm/mach-davinci/dm644x.c | 3 +- arch/arm/mach-davinci/dm646x.c | 9 +- arch/arm/mach-davinci/dma.c | 5 +- arch/arm/mach-davinci/gpio-tnetv107x.c | 205 --- arch/arm/mach-davinci/gpio.c | 460 ----- arch/arm/mach-davinci/include/mach/clkdev.h | 15 - arch/arm/mach-davinci/include/mach/da8xx.h | 2 + arch/arm/mach-davinci/include/mach/debug-macro.S | 52 +- arch/arm/mach-davinci/include/mach/dm646x.h | 2 - arch/arm/mach-davinci/include/mach/entry-macro.S | 3 - arch/arm/mach-davinci/include/mach/gpio.h | 79 +- arch/arm/mach-davinci/include/mach/memory.h | 51 - arch/arm/mach-davinci/include/mach/mmc.h | 3 + arch/arm/mach-davinci/include/mach/mux.h | 10 + arch/arm/mach-davinci/include/mach/nand.h | 4 +- arch/arm/mach-davinci/include/mach/psc.h | 156 +- arch/arm/mach-davinci/include/mach/serial.h | 3 +- arch/arm/mach-davinci/include/mach/uncompress.h | 7 +- arch/arm/mach-davinci/pm.c | 1 + arch/arm/mach-davinci/psc.c | 32 +- arch/arm/mach-davinci/sleep.S | 2 +- arch/arm/mach-davinci/tnetv107x.c | 3 +- arch/arm/mach-dove/Makefile.boot | 2 +- arch/arm/mach-dove/cm-a510.c | 2 +- arch/arm/mach-dove/common.c | 4 +- arch/arm/mach-dove/dove-db-setup.c | 2 +- arch/arm/mach-dove/include/mach/debug-macro.S | 2 +- arch/arm/mach-dove/include/mach/hardware.h | 7 - arch/arm/mach-dove/include/mach/memory.h | 10 - arch/arm/mach-dove/pcie.c | 5 +- arch/arm/mach-ebsa110/Makefile.boot | 2 +- arch/arm/mach-ebsa110/core.c | 2 +- arch/arm/mach-ebsa110/include/mach/debug-macro.S | 2 +- arch/arm/mach-ebsa110/include/mach/io.h | 2 - arch/arm/mach-ep93xx/Kconfig | 7 + arch/arm/mach-ep93xx/Makefile | 5 +- arch/arm/mach-ep93xx/Makefile.boot | 10 +- arch/arm/mach-ep93xx/adssphere.c | 2 +- arch/arm/mach-ep93xx/core.c | 35 +- arch/arm/mach-ep93xx/dma-m2p.c | 411 ----- arch/arm/mach-ep93xx/edb93xx.c | 23 +- arch/arm/mach-ep93xx/gesbc9312.c | 2 +- arch/arm/mach-ep93xx/gpio.c | 410 ----- arch/arm/mach-ep93xx/include/mach/clkdev.h | 11 - arch/arm/mach-ep93xx/include/mach/debug-macro.S | 2 +- arch/arm/mach-ep93xx/include/mach/dma.h | 190 +- arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 1 + arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h | 2 + arch/arm/mach-ep93xx/include/mach/gpio.h | 121 +- arch/arm/mach-ep93xx/include/mach/hardware.h | 2 - arch/arm/mach-ep93xx/include/mach/ts72xx.h | 26 +- arch/arm/mach-ep93xx/micro9.c | 8 +- arch/arm/mach-ep93xx/simone.c | 21 +- arch/arm/mach-ep93xx/snappercl15.c | 21 +- arch/arm/mach-ep93xx/ts72xx.c | 25 +- arch/arm/mach-footbridge/Kconfig | 2 + arch/arm/mach-footbridge/Makefile.boot | 2 +- arch/arm/mach-footbridge/cats-hw.c | 5 +- arch/arm/mach-footbridge/cats-pci.c | 2 +- arch/arm/mach-footbridge/common.c | 3 + arch/arm/mach-footbridge/dc21285-timer.c | 9 +- arch/arm/mach-footbridge/dc21285.c | 2 + arch/arm/mach-footbridge/ebsa285-pci.c | 2 +- arch/arm/mach-footbridge/ebsa285.c | 2 +- .../arm/mach-footbridge/include/mach/debug-macro.S | 4 +- arch/arm/mach-footbridge/include/mach/hardware.h | 7 +- arch/arm/mach-footbridge/include/mach/io.h | 2 - arch/arm/mach-footbridge/isa-timer.c | 59 +- arch/arm/mach-footbridge/netwinder-hw.c | 19 +- arch/arm/mach-footbridge/netwinder-leds.c | 10 +- arch/arm/mach-footbridge/netwinder-pci.c | 2 +- arch/arm/mach-footbridge/personal-pci.c | 3 +- arch/arm/mach-footbridge/personal.c | 2 +- arch/arm/mach-gemini/Makefile.boot | 4 +- arch/arm/mach-gemini/board-nas4220b.c | 2 +- arch/arm/mach-gemini/board-rut1xx.c | 2 +- arch/arm/mach-gemini/board-wbd111.c | 2 +- arch/arm/mach-gemini/board-wbd222.c | 2 +- arch/arm/mach-gemini/include/mach/debug-macro.S | 2 +- arch/arm/mach-gemini/include/mach/gpio.h | 5 - arch/arm/mach-gemini/include/mach/memory.h | 19 - arch/arm/mach-h720x/Makefile.boot | 2 +- arch/arm/mach-h720x/h7201-eval.c | 3 +- arch/arm/mach-h720x/h7202-eval.c | 3 +- arch/arm/mach-h720x/include/mach/debug-macro.S | 2 +- arch/arm/mach-h720x/include/mach/entry-macro.S | 3 - arch/arm/mach-h720x/include/mach/memory.h | 18 - arch/arm/mach-imx/Kconfig | 102 +- arch/arm/mach-imx/Makefile | 30 +- arch/arm/mach-imx/Makefile.boot | 38 +- arch/arm/mach-imx/cache-l2x0.c | 56 - arch/arm/mach-imx/clock-imx1.c | 6 +- arch/arm/mach-imx/clock-imx21.c | 8 +- arch/arm/mach-imx/clock-imx25.c | 36 +- arch/arm/mach-imx/clock-imx27.c | 21 +- arch/arm/mach-imx/clock-imx31.c | 21 +- arch/arm/mach-imx/clock-imx35.c | 41 +- arch/arm/mach-imx/cpu-imx27.c | 28 +- arch/arm/mach-imx/cpu-imx31.c | 49 +- arch/arm/mach-imx/cpu-imx35.c | 30 +- arch/arm/mach-imx/devices-imx27.h | 4 + arch/arm/mach-imx/devices-imx31.h | 4 + arch/arm/mach-imx/devices-imx35.h | 4 + arch/arm/mach-imx/dma-v1.c | 26 +- arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 23 +- arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 18 +- arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 16 +- arch/arm/mach-imx/iomux-imx31.c | 3 +- arch/arm/mach-imx/mach-apf9328.c | 10 +- arch/arm/mach-imx/mach-armadillo5x0.c | 23 +- arch/arm/mach-imx/mach-bug.c | 3 + arch/arm/mach-imx/mach-cpuimx27.c | 7 +- arch/arm/mach-imx/mach-cpuimx35.c | 17 +- arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 7 +- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 20 +- arch/arm/mach-imx/mach-imx27ipcam.c | 5 +- arch/arm/mach-imx/mach-imx27lite.c | 5 +- arch/arm/mach-imx/mach-kzm_arm11_01.c | 6 +- arch/arm/mach-imx/mach-mx1ads.c | 23 +- arch/arm/mach-imx/mach-mx21ads.c | 5 +- arch/arm/mach-imx/mach-mx25_3ds.c | 17 +- arch/arm/mach-imx/mach-mx27_3ds.c | 143 +- arch/arm/mach-imx/mach-mx27ads.c | 8 +- arch/arm/mach-imx/mach-mx31_3ds.c | 26 +- arch/arm/mach-imx/mach-mx31ads.c | 9 +- arch/arm/mach-imx/mach-mx31lilly.c | 8 +- arch/arm/mach-imx/mach-mx31lite.c | 9 +- arch/arm/mach-imx/mach-mx31moboard.c | 52 +- arch/arm/mach-imx/mach-mx35_3ds.c | 7 +- arch/arm/mach-imx/mach-mxt_td60.c | 5 +- arch/arm/mach-imx/mach-pca100.c | 5 +- arch/arm/mach-imx/mach-pcm037.c | 5 +- arch/arm/mach-imx/mach-pcm038.c | 12 +- arch/arm/mach-imx/mach-pcm043.c | 7 +- arch/arm/mach-imx/mach-qong.c | 11 +- arch/arm/mach-imx/mach-scb9328.c | 22 +- arch/arm/mach-imx/mach-vpr200.c | 5 +- arch/arm/mach-imx/mm-imx1.c | 21 +- arch/arm/mach-imx/mm-imx21.c | 24 +- arch/arm/mach-imx/mm-imx25.c | 42 +- arch/arm/mach-imx/mm-imx27.c | 25 +- arch/arm/mach-imx/mm-imx31.c | 66 - arch/arm/mach-imx/mm-imx35.c | 63 - arch/arm/mach-imx/mx31lite-db.c | 15 +- arch/arm/mach-imx/pm-imx27.c | 2 +- arch/arm/mach-integrator/Makefile.boot | 2 +- arch/arm/mach-integrator/core.c | 10 +- arch/arm/mach-integrator/include/mach/bits.h | 61 - .../arm/mach-integrator/include/mach/debug-macro.S | 2 +- arch/arm/mach-integrator/include/mach/hardware.h | 7 - arch/arm/mach-integrator/include/mach/io.h | 2 - arch/arm/mach-integrator/include/mach/platform.h | 12 - arch/arm/mach-integrator/integrator_ap.c | 90 +- arch/arm/mach-integrator/integrator_cp.c | 5 +- arch/arm/mach-integrator/pci.c | 2 +- arch/arm/mach-integrator/pci_v3.c | 17 +- arch/arm/mach-iop13xx/Makefile.boot | 2 +- arch/arm/mach-iop13xx/include/mach/debug-macro.S | 2 +- arch/arm/mach-iop13xx/include/mach/hardware.h | 7 - arch/arm/mach-iop13xx/iq81340mc.c | 4 +- arch/arm/mach-iop13xx/iq81340sc.c | 2 +- arch/arm/mach-iop13xx/pci.c | 8 +- arch/arm/mach-iop13xx/setup.c | 1 + arch/arm/mach-iop32x/Makefile.boot | 2 +- arch/arm/mach-iop32x/em7210.c | 4 +- arch/arm/mach-iop32x/glantank.c | 4 +- arch/arm/mach-iop32x/include/mach/debug-macro.S | 2 +- arch/arm/mach-iop32x/include/mach/hardware.h | 3 - arch/arm/mach-iop32x/include/mach/memory.h | 13 - arch/arm/mach-iop32x/iq31244.c | 8 +- arch/arm/mach-iop32x/iq80321.c | 4 +- arch/arm/mach-iop32x/n2100.c | 4 +- arch/arm/mach-iop33x/Makefile.boot | 2 +- arch/arm/mach-iop33x/include/mach/debug-macro.S | 2 +- arch/arm/mach-iop33x/include/mach/hardware.h | 3 - arch/arm/mach-iop33x/include/mach/memory.h | 13 - arch/arm/mach-iop33x/iq80331.c | 4 +- arch/arm/mach-iop33x/iq80332.c | 4 +- arch/arm/mach-ixp2000/Makefile.boot | 2 +- arch/arm/mach-ixp2000/core.c | 5 +- arch/arm/mach-ixp2000/enp2611.c | 5 +- arch/arm/mach-ixp2000/include/mach/debug-macro.S | 2 +- arch/arm/mach-ixp2000/include/mach/gpio.h | 48 - arch/arm/mach-ixp2000/include/mach/hardware.h | 8 - arch/arm/mach-ixp2000/ixdp2400.c | 5 +- arch/arm/mach-ixp2000/ixdp2800.c | 5 +- arch/arm/mach-ixp2000/ixdp2x00.c | 4 +- arch/arm/mach-ixp2000/ixdp2x01.c | 9 +- arch/arm/mach-ixp2000/pci.c | 5 + arch/arm/mach-ixp23xx/Makefile.boot | 2 +- arch/arm/mach-ixp23xx/espresso.c | 2 +- arch/arm/mach-ixp23xx/include/mach/debug-macro.S | 2 +- arch/arm/mach-ixp23xx/include/mach/hardware.h | 4 - arch/arm/mach-ixp23xx/ixdp2351.c | 4 +- arch/arm/mach-ixp23xx/pci.c | 5 + arch/arm/mach-ixp23xx/roadrunner.c | 5 +- arch/arm/mach-ixp4xx/Kconfig | 19 + arch/arm/mach-ixp4xx/Makefile | 4 + arch/arm/mach-ixp4xx/Makefile.boot | 2 +- arch/arm/mach-ixp4xx/avila-pci.c | 2 +- arch/arm/mach-ixp4xx/avila-setup.c | 10 +- arch/arm/mach-ixp4xx/common-pci.c | 43 +- arch/arm/mach-ixp4xx/common.c | 49 +- arch/arm/mach-ixp4xx/coyote-pci.c | 2 +- arch/arm/mach-ixp4xx/coyote-setup.c | 7 +- arch/arm/mach-ixp4xx/dsmg600-pci.c | 2 +- arch/arm/mach-ixp4xx/dsmg600-setup.c | 8 +- arch/arm/mach-ixp4xx/fsg-pci.c | 2 +- arch/arm/mach-ixp4xx/fsg-setup.c | 8 +- arch/arm/mach-ixp4xx/gateway7001-pci.c | 3 +- arch/arm/mach-ixp4xx/gateway7001-setup.c | 5 +- arch/arm/mach-ixp4xx/goramo_mlr.c | 7 +- arch/arm/mach-ixp4xx/gtwx5715-pci.c | 2 +- arch/arm/mach-ixp4xx/gtwx5715-setup.c | 5 +- arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 2 +- arch/arm/mach-ixp4xx/include/mach/gpio.h | 76 +- arch/arm/mach-ixp4xx/include/mach/hardware.h | 5 - arch/arm/mach-ixp4xx/include/mach/io.h | 2 - arch/arm/mach-ixp4xx/include/mach/memory.h | 21 - arch/arm/mach-ixp4xx/include/mach/uncompress.h | 3 +- arch/arm/mach-ixp4xx/ixdp425-pci.c | 2 +- arch/arm/mach-ixp4xx/ixdp425-setup.c | 20 +- arch/arm/mach-ixp4xx/ixdpg425-pci.c | 2 +- arch/arm/mach-ixp4xx/nas100d-pci.c | 2 +- arch/arm/mach-ixp4xx/nas100d-setup.c | 8 +- arch/arm/mach-ixp4xx/nslu2-pci.c | 2 +- arch/arm/mach-ixp4xx/nslu2-setup.c | 8 +- arch/arm/mach-ixp4xx/vulcan-pci.c | 2 +- arch/arm/mach-ixp4xx/vulcan-setup.c | 5 +- arch/arm/mach-ixp4xx/wg302v2-pci.c | 2 +- arch/arm/mach-ixp4xx/wg302v2-setup.c | 5 +- arch/arm/mach-kirkwood/Makefile.boot | 2 +- arch/arm/mach-kirkwood/common.c | 4 +- arch/arm/mach-kirkwood/cpuidle.c | 43 +- arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +- arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 +- arch/arm/mach-kirkwood/dockstar-setup.c | 2 +- arch/arm/mach-kirkwood/guruplug-setup.c | 2 +- arch/arm/mach-kirkwood/include/mach/debug-macro.S | 2 +- arch/arm/mach-kirkwood/include/mach/hardware.h | 7 - arch/arm/mach-kirkwood/include/mach/memory.h | 10 - arch/arm/mach-kirkwood/irq.c | 3 +- arch/arm/mach-kirkwood/mpp.c | 3 +- arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +- arch/arm/mach-kirkwood/netspace_v2-setup.c | 6 +- arch/arm/mach-kirkwood/netxbig_v2-setup.c | 4 +- arch/arm/mach-kirkwood/openrd-setup.c | 6 +- arch/arm/mach-kirkwood/pcie.c | 17 +- arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +- arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +- arch/arm/mach-kirkwood/sheevaplug-setup.c | 4 +- arch/arm/mach-kirkwood/t5325-setup.c | 2 +- arch/arm/mach-kirkwood/ts219-setup.c | 2 +- arch/arm/mach-kirkwood/ts41x-setup.c | 2 +- arch/arm/mach-ks8695/Makefile | 2 +- arch/arm/mach-ks8695/Makefile.boot | 2 +- arch/arm/mach-ks8695/board-acs5k.c | 6 +- arch/arm/mach-ks8695/board-dsm320.c | 8 +- arch/arm/mach-ks8695/board-micrel.c | 8 +- arch/arm/mach-ks8695/devices.c | 1 + arch/arm/mach-ks8695/gpio.c | 319 ---- arch/arm/mach-ks8695/include/mach/debug-macro.S | 2 +- arch/arm/mach-ks8695/include/mach/devices.h | 2 +- arch/arm/mach-ks8695/include/mach/gpio.h | 38 - arch/arm/mach-ks8695/include/mach/hardware.h | 9 - arch/arm/mach-ks8695/leds.c | 4 +- arch/arm/mach-ks8695/pci.c | 3 + arch/arm/mach-l7200/include/mach/debug-macro.S | 2 +- arch/arm/mach-lpc32xx/Makefile | 2 +- arch/arm/mach-lpc32xx/Makefile.boot | 2 +- arch/arm/mach-lpc32xx/clock.c | 2 +- arch/arm/mach-lpc32xx/common.c | 42 + arch/arm/mach-lpc32xx/common.h | 2 + arch/arm/mach-lpc32xx/gpiolib.c | 446 ----- arch/arm/mach-lpc32xx/include/mach/clkdev.h | 25 - arch/arm/mach-lpc32xx/include/mach/debug-macro.S | 2 +- arch/arm/mach-lpc32xx/include/mach/entry-macro.S | 4 - arch/arm/mach-lpc32xx/include/mach/gpio.h | 75 +- arch/arm/mach-lpc32xx/include/mach/memory.h | 27 - arch/arm/mach-lpc32xx/include/mach/vmalloc.h | 2 +- arch/arm/mach-lpc32xx/phy3250.c | 3 +- arch/arm/mach-mmp/Kconfig | 7 + arch/arm/mach-mmp/Makefile | 3 +- arch/arm/mach-mmp/Makefile.boot | 2 +- arch/arm/mach-mmp/aspenite.c | 11 +- arch/arm/mach-mmp/brownstone.c | 22 +- arch/arm/mach-mmp/clock.c | 15 + arch/arm/mach-mmp/clock.h | 9 +- arch/arm/mach-mmp/common.c | 4 +- arch/arm/mach-mmp/include/mach/addr-map.h | 10 +- arch/arm/mach-mmp/include/mach/clkdev.h | 7 - arch/arm/mach-mmp/include/mach/debug-macro.S | 2 +- arch/arm/mach-mmp/include/mach/gpio.h | 23 - arch/arm/mach-mmp/include/mach/memory.h | 14 - arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 56 +- arch/arm/mach-mmp/include/mach/mmp2.h | 15 +- arch/arm/mach-mmp/include/mach/pxa168.h | 15 + arch/arm/mach-mmp/include/mach/regs-apmu.h | 1 + arch/arm/mach-mmp/jasper.c | 3 +- arch/arm/mach-mmp/mmp2.c | 25 +- arch/arm/mach-mmp/pxa168.c | 55 +- arch/arm/mach-mmp/pxa910.c | 3 +- arch/arm/mach-mmp/tavorevb.c | 4 +- arch/arm/mach-mmp/time.c | 62 +- arch/arm/mach-mmp/ttc_dkb.c | 33 +- arch/arm/mach-msm/Kconfig | 23 +- arch/arm/mach-msm/Makefile | 12 +- arch/arm/mach-msm/Makefile.boot | 2 +- arch/arm/mach-msm/board-halibut.c | 6 +- arch/arm/mach-msm/board-mahimahi.c | 6 +- arch/arm/mach-msm/board-msm7x27.c | 11 +- arch/arm/mach-msm/board-msm7x30.c | 31 +- arch/arm/mach-msm/board-msm8960.c | 22 + arch/arm/mach-msm/board-msm8x60.c | 94 +- arch/arm/mach-msm/board-qsd8x50.c | 7 +- arch/arm/mach-msm/board-sapphire.c | 9 +- arch/arm/mach-msm/board-trout-mmc.c | 3 +- arch/arm/mach-msm/board-trout-panel.c | 3 +- arch/arm/mach-msm/board-trout.c | 6 +- arch/arm/mach-msm/clock.c | 2 +- arch/arm/mach-msm/devices-iommu.c | 1 + arch/arm/mach-msm/devices-msm7x00.c | 24 - arch/arm/mach-msm/devices-qsd8x50.c | 24 - arch/arm/mach-msm/gpio-v2.c | 433 ----- arch/arm/mach-msm/gpio.c | 376 ---- arch/arm/mach-msm/gpio_hw.h | 278 --- arch/arm/mach-msm/gpiomux.h | 17 +- arch/arm/mach-msm/hotplug.c | 2 +- arch/arm/mach-msm/include/mach/clkdev.h | 19 - arch/arm/mach-msm/include/mach/debug-macro.S | 4 +- arch/arm/mach-msm/include/mach/entry-macro-qgic.S | 73 +- arch/arm/mach-msm/include/mach/gpio.h | 27 +- arch/arm/mach-msm/include/mach/memory.h | 35 - arch/arm/mach-msm/include/mach/mmc.h | 9 +- arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 10 +- arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 10 +- arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 10 +- arch/arm/mach-msm/include/mach/msm_iomap.h | 2 + arch/arm/mach-msm/io.c | 13 +- arch/arm/mach-msm/iommu.c | 731 -------- arch/arm/mach-msm/iommu_dev.c | 422 ----- arch/arm/mach-msm/platsmp.c | 27 +- arch/arm/mach-msm/scm.c | 3 + arch/arm/mach-msm/timer.c | 69 +- arch/arm/mach-mv78xx0/Makefile.boot | 2 +- arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 2 +- arch/arm/mach-mv78xx0/common.c | 6 +- arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 2 +- arch/arm/mach-mv78xx0/include/mach/debug-macro.S | 2 +- arch/arm/mach-mv78xx0/include/mach/hardware.h | 7 - arch/arm/mach-mv78xx0/include/mach/memory.h | 10 - arch/arm/mach-mv78xx0/irq.c | 3 +- arch/arm/mach-mv78xx0/mpp.c | 3 +- arch/arm/mach-mv78xx0/pcie.c | 14 +- arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 2 +- arch/arm/mach-mx5/Kconfig | 66 +- arch/arm/mach-mx5/Makefile | 8 +- arch/arm/mach-mx5/Makefile.boot | 6 +- arch/arm/mach-mx5/board-cpuimx51.c | 36 +- arch/arm/mach-mx5/board-cpuimx51sd.c | 30 +- arch/arm/mach-mx5/board-mx50_rdp.c | 3 + arch/arm/mach-mx5/board-mx51_3ds.c | 9 +- arch/arm/mach-mx5/board-mx51_babbage.c | 100 +- arch/arm/mach-mx5/board-mx51_efikamx.c | 35 +- arch/arm/mach-mx5/board-mx51_efikasb.c | 60 +- arch/arm/mach-mx5/board-mx53_evk.c | 31 +- arch/arm/mach-mx5/board-mx53_loco.c | 74 +- arch/arm/mach-mx5/board-mx53_smd.c | 30 +- arch/arm/mach-mx5/clock-mx51-mx53.c | 157 +- arch/arm/mach-mx5/cpu.c | 79 +- arch/arm/mach-mx5/crm_regs.h | 4 +- arch/arm/mach-mx5/devices-imx51.h | 17 + arch/arm/mach-mx5/devices-imx53.h | 14 + arch/arm/mach-mx5/devices.c | 184 -- arch/arm/mach-mx5/devices.h | 5 - arch/arm/mach-mx5/ehci.c | 2 +- arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 25 +- arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 25 +- arch/arm/mach-mx5/mm-mx50.c | 72 - arch/arm/mach-mx5/mm.c | 145 +- arch/arm/mach-mx5/mx51_efika.c | 28 +- arch/arm/mach-mx5/system.c | 1 + arch/arm/mach-mxs/Kconfig | 26 + arch/arm/mach-mxs/Makefile | 7 +- arch/arm/mach-mxs/Makefile.boot | 2 +- arch/arm/mach-mxs/clock-mx28.c | 26 +- arch/arm/mach-mxs/devices-mx23.h | 2 + arch/arm/mach-mxs/devices-mx28.h | 5 + arch/arm/mach-mxs/devices.c | 11 + arch/arm/mach-mxs/devices/Kconfig | 6 + arch/arm/mach-mxs/devices/Makefile | 3 + arch/arm/mach-mxs/devices/platform-auart.c | 1 + arch/arm/mach-mxs/devices/platform-dma.c | 1 + arch/arm/mach-mxs/devices/platform-fec.c | 1 + arch/arm/mach-mxs/devices/platform-mxsfb.c | 1 + arch/arm/mach-mxs/gpio.c | 331 ---- arch/arm/mach-mxs/gpio.h | 34 - arch/arm/mach-mxs/include/mach/clkdev.h | 7 - arch/arm/mach-mxs/include/mach/debug-macro.S | 14 +- arch/arm/mach-mxs/include/mach/devices-common.h | 14 + arch/arm/mach-mxs/include/mach/dma.h | 2 + arch/arm/mach-mxs/include/mach/gpio.h | 36 +- arch/arm/mach-mxs/include/mach/memory.h | 24 - arch/arm/mach-mxs/include/mach/mx28.h | 4 +- arch/arm/mach-mxs/include/mach/mxs.h | 3 + arch/arm/mach-mxs/include/mach/uncompress.h | 1 + arch/arm/mach-mxs/mach-mx23evk.c | 4 +- arch/arm/mach-mxs/mach-mx28evk.c | 126 +- arch/arm/mach-mxs/mach-stmp378x_devb.c | 4 +- arch/arm/mach-mxs/mach-tx28.c | 22 +- arch/arm/mach-mxs/mm-mx23.c | 45 - arch/arm/mach-mxs/mm-mx28.c | 45 - arch/arm/mach-mxs/module-tx28.c | 4 +- arch/arm/mach-netx/Makefile.boot | 2 +- arch/arm/mach-netx/include/mach/debug-macro.S | 2 +- arch/arm/mach-netx/include/mach/memory.h | 26 - arch/arm/mach-netx/nxdb500.c | 2 +- arch/arm/mach-netx/nxdkn.c | 2 +- arch/arm/mach-netx/nxeb500hmi.c | 2 +- arch/arm/mach-netx/xc.c | 1 + arch/arm/mach-nomadik/Makefile.boot | 2 +- arch/arm/mach-nomadik/board-nhk8815.c | 3 +- arch/arm/mach-nomadik/cpu-8815.c | 2 +- arch/arm/mach-nomadik/i2c-8815nhk.c | 2 +- arch/arm/mach-nomadik/include/mach/clkdev.h | 7 - arch/arm/mach-nomadik/include/mach/debug-macro.S | 2 +- arch/arm/mach-nomadik/include/mach/gpio.h | 2 - arch/arm/mach-nomadik/include/mach/memory.h | 28 - arch/arm/mach-omap1/Kconfig | 8 - arch/arm/mach-omap1/Makefile | 2 +- arch/arm/mach-omap1/Makefile.boot | 2 +- arch/arm/mach-omap1/board-ams-delta.c | 22 +- arch/arm/mach-omap1/board-fsample.c | 83 +- arch/arm/mach-omap1/board-generic.c | 23 +- arch/arm/mach-omap1/board-h2-mmc.c | 3 +- arch/arm/mach-omap1/board-h2.c | 23 +- arch/arm/mach-omap1/board-h3-mmc.c | 3 +- arch/arm/mach-omap1/board-h3.c | 23 +- arch/arm/mach-omap1/board-htcherald.c | 17 +- arch/arm/mach-omap1/board-innovator.c | 43 +- arch/arm/mach-omap1/board-nokia770.c | 41 +- arch/arm/mach-omap1/board-osk.c | 23 +- arch/arm/mach-omap1/board-palmte.c | 23 +- arch/arm/mach-omap1/board-palmtt.c | 22 +- arch/arm/mach-omap1/board-palmz71.c | 25 +- arch/arm/mach-omap1/board-perseus2.c | 82 +- arch/arm/mach-omap1/board-sx1-mmc.c | 2 +- arch/arm/mach-omap1/board-sx1.c | 25 +- arch/arm/mach-omap1/board-voiceblue.c | 23 +- arch/arm/mach-omap1/clock.h | 3 +- arch/arm/mach-omap1/clock_data.c | 61 +- arch/arm/mach-omap1/devices.c | 8 +- arch/arm/mach-omap1/fpga.c | 2 +- arch/arm/mach-omap1/gpio15xx.c | 22 + arch/arm/mach-omap1/gpio16xx.c | 28 + arch/arm/mach-omap1/gpio7xx.c | 27 + arch/arm/mach-omap1/include/mach/clkdev.h | 5 - arch/arm/mach-omap1/include/mach/debug-macro.S | 48 +- arch/arm/mach-omap1/include/mach/memory.h | 53 +- arch/arm/mach-omap1/io.c | 58 +- arch/arm/mach-omap1/irq.c | 5 +- arch/arm/mach-omap1/leds-h2p2-debug.c | 2 +- arch/arm/mach-omap1/leds-osk.c | 3 +- arch/arm/mach-omap1/leds.c | 2 +- arch/arm/mach-omap1/mailbox.c | 1 + arch/arm/mach-omap1/mcbsp.c | 49 +- arch/arm/mach-omap1/pm.c | 4 +- arch/arm/mach-omap1/pm_bus.c | 15 +- arch/arm/mach-omap1/serial.c | 3 +- arch/arm/mach-omap1/time.c | 6 +- arch/arm/mach-omap1/timer32k.c | 4 - arch/arm/mach-omap2/Kconfig | 18 +- arch/arm/mach-omap2/Makefile | 123 +- arch/arm/mach-omap2/Makefile.boot | 2 +- arch/arm/mach-omap2/board-2430sdp.c | 102 +- arch/arm/mach-omap2/board-3430sdp.c | 111 +- arch/arm/mach-omap2/board-3630sdp.c | 17 +- arch/arm/mach-omap2/board-4430sdp.c | 553 ++++-- arch/arm/mach-omap2/board-am3517crane.c | 17 +- arch/arm/mach-omap2/board-am3517evm.c | 20 +- arch/arm/mach-omap2/board-apollon.c | 55 +- arch/arm/mach-omap2/board-cm-t35.c | 195 +-- arch/arm/mach-omap2/board-cm-t3517.c | 16 +- arch/arm/mach-omap2/board-devkit8000.c | 94 +- arch/arm/mach-omap2/board-flash.c | 9 - arch/arm/mach-omap2/board-flash.h | 19 + arch/arm/mach-omap2/board-generic.c | 175 +- arch/arm/mach-omap2/board-h4.c | 183 +- arch/arm/mach-omap2/board-igep0020.c | 104 +- arch/arm/mach-omap2/board-ldp.c | 157 +- arch/arm/mach-omap2/board-n8x0.c | 43 +- arch/arm/mach-omap2/board-omap3beagle.c | 221 +-- arch/arm/mach-omap2/board-omap3evm.c | 130 +- arch/arm/mach-omap2/board-omap3logic.c | 34 +- arch/arm/mach-omap2/board-omap3pandora.c | 134 +- arch/arm/mach-omap2/board-omap3stalker.c | 155 +- arch/arm/mach-omap2/board-omap3touchbook.c | 133 +- arch/arm/mach-omap2/board-omap4panda.c | 188 +- arch/arm/mach-omap2/board-overo.c | 104 +- arch/arm/mach-omap2/board-rm680.c | 39 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 205 ++- arch/arm/mach-omap2/board-rx51.c | 56 +- arch/arm/mach-omap2/board-ti8168evm.c | 21 +- arch/arm/mach-omap2/board-zoom-debugboard.c | 9 + arch/arm/mach-omap2/board-zoom-peripherals.c | 128 +- arch/arm/mach-omap2/board-zoom.c | 35 +- arch/arm/mach-omap2/clkt_dpll.c | 51 +- arch/arm/mach-omap2/clock.c | 28 +- arch/arm/mach-omap2/clock.h | 5 + arch/arm/mach-omap2/clock2420_data.c | 58 +- arch/arm/mach-omap2/clock2430_data.c | 68 +- arch/arm/mach-omap2/clock3xxx_data.c | 81 +- arch/arm/mach-omap2/clock44xx.h | 8 +- arch/arm/mach-omap2/clock44xx_data.c | 536 +++--- arch/arm/mach-omap2/clockdomain.c | 362 +++- arch/arm/mach-omap2/clockdomain.h | 33 +- arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 10 +- arch/arm/mach-omap2/clockdomain44xx.c | 15 +- arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c | 803 +-------- arch/arm/mach-omap2/clockdomains44xx_data.c | 469 ++--- arch/arm/mach-omap2/cm-regbits-44xx.h | 659 +++---- arch/arm/mach-omap2/cm1_44xx.h | 64 +- arch/arm/mach-omap2/cm2_44xx.h | 73 +- arch/arm/mach-omap2/cm44xx.h | 8 +- arch/arm/mach-omap2/cminst44xx.c | 150 +- arch/arm/mach-omap2/cminst44xx.h | 33 +- arch/arm/mach-omap2/common-board-devices.c | 27 +- arch/arm/mach-omap2/common-board-devices.h | 26 +- arch/arm/mach-omap2/common.c | 62 +- arch/arm/mach-omap2/control.c | 24 +- arch/arm/mach-omap2/control.h | 6 +- arch/arm/mach-omap2/cpuidle34xx.c | 134 +- arch/arm/mach-omap2/devices.c | 119 +- arch/arm/mach-omap2/display.c | 261 ++- arch/arm/mach-omap2/dma.c | 25 +- arch/arm/mach-omap2/dpll3xxx.c | 9 +- arch/arm/mach-omap2/dpll44xx.c | 69 + arch/arm/mach-omap2/dsp.c | 1 + arch/arm/mach-omap2/gpio.c | 54 +- arch/arm/mach-omap2/gpmc-nand.c | 10 +- arch/arm/mach-omap2/gpmc-onenand.c | 1 + arch/arm/mach-omap2/hsmmc.c | 55 +- arch/arm/mach-omap2/hwspinlock.c | 21 +- arch/arm/mach-omap2/i2c.c | 68 + arch/arm/mach-omap2/id.c | 247 ++- arch/arm/mach-omap2/include/mach/clkdev.h | 5 - arch/arm/mach-omap2/include/mach/debug-macro.S | 81 +- arch/arm/mach-omap2/include/mach/entry-macro.S | 17 +- arch/arm/mach-omap2/include/mach/memory.h | 5 - arch/arm/mach-omap2/io.c | 169 +- arch/arm/mach-omap2/io.h | 7 - arch/arm/mach-omap2/iommu2.c | 35 +- arch/arm/mach-omap2/irq.c | 36 +- arch/arm/mach-omap2/mailbox.c | 1 + arch/arm/mach-omap2/mcbsp.c | 120 +- arch/arm/mach-omap2/mux.c | 20 +- arch/arm/mach-omap2/omap-iommu.c | 6 +- arch/arm/mach-omap2/omap-smp.c | 25 +- arch/arm/mach-omap2/omap4-common.c | 10 +- arch/arm/mach-omap2/omap_hwmod.c | 409 ++++- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 909 ++-------- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 994 ++--------- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 918 ++++------ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 1069 ++++++----- arch/arm/mach-omap2/omap_hwmod_common_data.c | 22 +- arch/arm/mach-omap2/omap_hwmod_common_data.h | 97 +- arch/arm/mach-omap2/omap_l3_noc.c | 158 +- arch/arm/mach-omap2/omap_l3_noc.h | 224 ++- arch/arm/mach-omap2/omap_l3_smx.c | 91 +- arch/arm/mach-omap2/omap_l3_smx.h | 164 +- arch/arm/mach-omap2/omap_twl.c | 107 +- arch/arm/mach-omap2/opp.c | 5 +- arch/arm/mach-omap2/pm-debug.c | 372 +--- arch/arm/mach-omap2/pm.c | 119 +- arch/arm/mach-omap2/pm.h | 38 +- arch/arm/mach-omap2/pm24xx.c | 29 - arch/arm/mach-omap2/pm34xx.c | 158 +- arch/arm/mach-omap2/powerdomain-common.c | 7 +- arch/arm/mach-omap2/powerdomain.c | 123 +- arch/arm/mach-omap2/powerdomain.h | 21 +- arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | 2 +- arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c | 21 +- arch/arm/mach-omap2/powerdomains2xxx_data.c | 48 +- arch/arm/mach-omap2/powerdomains3xxx_data.c | 97 +- arch/arm/mach-omap2/powerdomains44xx_data.c | 63 +- arch/arm/mach-omap2/prcm.c | 22 +- arch/arm/mach-omap2/prcm_mpu44xx.h | 69 +- arch/arm/mach-omap2/prm-regbits-44xx.h | 8 + arch/arm/mach-omap2/prm2xxx_3xxx.c | 56 + arch/arm/mach-omap2/prm2xxx_3xxx.h | 12 + arch/arm/mach-omap2/prm44xx.c | 182 +- arch/arm/mach-omap2/prm44xx.h | 52 +- arch/arm/mach-omap2/prminst44xx.c | 112 +- arch/arm/mach-omap2/prminst44xx.h | 12 +- arch/arm/mach-omap2/sdrc.c | 13 +- arch/arm/mach-omap2/serial.c | 38 +- arch/arm/mach-omap2/sleep34xx.S | 518 ++---- arch/arm/mach-omap2/smartreflex-class3.c | 4 +- arch/arm/mach-omap2/smartreflex.c | 73 +- arch/arm/mach-omap2/sr_device.c | 19 +- arch/arm/mach-omap2/timer-gp.c | 266 --- arch/arm/mach-omap2/timer-gp.h | 16 - arch/arm/mach-omap2/usb-musb.c | 77 +- arch/arm/mach-omap2/usb-tusb6010.c | 2 + arch/arm/mach-omap2/vc.h | 88 +- arch/arm/mach-omap2/vc3xxx_data.c | 31 +- arch/arm/mach-omap2/vc44xx_data.c | 44 +- arch/arm/mach-omap2/voltage.c | 1089 +++--------- arch/arm/mach-omap2/voltage.h | 150 +- arch/arm/mach-omap2/voltagedomains3xxx_data.c | 83 +- arch/arm/mach-omap2/voltagedomains44xx_data.c | 99 +- arch/arm/mach-omap2/vp.h | 133 +- arch/arm/mach-omap2/vp3xxx_data.c | 35 +- arch/arm/mach-omap2/vp44xx_data.c | 47 +- arch/arm/mach-orion5x/Makefile.boot | 2 +- arch/arm/mach-orion5x/common.c | 7 +- arch/arm/mach-orion5x/common.h | 6 +- arch/arm/mach-orion5x/d2net-setup.c | 4 +- arch/arm/mach-orion5x/db88f5281-setup.c | 8 +- arch/arm/mach-orion5x/dns323-setup.c | 7 +- arch/arm/mach-orion5x/edmini_v2-setup.c | 2 +- arch/arm/mach-orion5x/include/mach/debug-macro.S | 2 +- arch/arm/mach-orion5x/include/mach/hardware.h | 7 - arch/arm/mach-orion5x/include/mach/memory.h | 12 - arch/arm/mach-orion5x/irq.c | 3 +- arch/arm/mach-orion5x/kurobox_pro-setup.c | 10 +- arch/arm/mach-orion5x/ls-chl-setup.c | 2 +- arch/arm/mach-orion5x/ls_hgl-setup.c | 2 +- arch/arm/mach-orion5x/lsmini-setup.c | 2 +- arch/arm/mach-orion5x/mpp.c | 2 +- arch/arm/mach-orion5x/mss2-setup.c | 4 +- arch/arm/mach-orion5x/mv2120-setup.c | 5 +- arch/arm/mach-orion5x/net2big-setup.c | 2 +- arch/arm/mach-orion5x/pci.c | 5 +- arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 7 +- arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 7 +- arch/arm/mach-orion5x/rd88f5182-setup.c | 8 +- arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 5 +- arch/arm/mach-orion5x/terastation_pro2-setup.c | 7 +- arch/arm/mach-orion5x/ts209-setup.c | 8 +- arch/arm/mach-orion5x/ts409-setup.c | 8 +- arch/arm/mach-orion5x/ts78xx-setup.c | 4 +- arch/arm/mach-orion5x/wnr854t-setup.c | 8 +- arch/arm/mach-orion5x/wrt350n-v2-setup.c | 8 +- arch/arm/mach-pnx4008/Makefile.boot | 2 +- arch/arm/mach-pnx4008/core.c | 2 +- arch/arm/mach-pnx4008/gpio.c | 3 +- arch/arm/mach-pnx4008/include/mach/clkdev.h | 7 - arch/arm/mach-pnx4008/include/mach/debug-macro.S | 2 +- arch/arm/mach-pnx4008/include/mach/entry-macro.S | 5 - arch/arm/mach-pnx4008/include/mach/gpio.h | 241 --- arch/arm/mach-pnx4008/include/mach/memory.h | 21 - arch/arm/mach-pnx4008/serial.c | 3 +- arch/arm/mach-pxa/Kconfig | 38 +- arch/arm/mach-pxa/Makefile | 2 +- arch/arm/mach-pxa/Makefile.boot | 2 +- arch/arm/mach-pxa/balloon3.c | 13 +- arch/arm/mach-pxa/capc7117.c | 3 +- arch/arm/mach-pxa/clock.c | 15 + arch/arm/mach-pxa/clock.h | 1 + arch/arm/mach-pxa/cm-x255.c | 1 - arch/arm/mach-pxa/cm-x2xx-pci.c | 7 +- arch/arm/mach-pxa/cm-x2xx.c | 14 +- arch/arm/mach-pxa/cm-x300.c | 62 +- arch/arm/mach-pxa/colibri-pxa270.c | 7 +- arch/arm/mach-pxa/colibri-pxa300.c | 3 +- arch/arm/mach-pxa/colibri-pxa320.c | 6 +- arch/arm/mach-pxa/colibri-pxa3xx.c | 5 +- arch/arm/mach-pxa/corgi.c | 11 +- arch/arm/mach-pxa/csb726.c | 6 +- arch/arm/mach-pxa/em-x270.c | 6 +- arch/arm/mach-pxa/eseries.c | 23 +- arch/arm/mach-pxa/eseries.h | 4 +- arch/arm/mach-pxa/ezx.c | 18 +- arch/arm/mach-pxa/generic.c | 2 +- arch/arm/mach-pxa/generic.h | 13 - arch/arm/mach-pxa/gumstix.c | 3 +- arch/arm/mach-pxa/h5000.c | 4 +- arch/arm/mach-pxa/himalaya.c | 6 +- arch/arm/mach-pxa/hx4700.c | 75 +- arch/arm/mach-pxa/icontrol.c | 3 +- arch/arm/mach-pxa/idp.c | 1 + arch/arm/mach-pxa/include/mach/addr-map.h | 8 +- arch/arm/mach-pxa/include/mach/balloon3.h | 2 +- arch/arm/mach-pxa/include/mach/clkdev.h | 7 - arch/arm/mach-pxa/include/mach/corgi.h | 2 +- arch/arm/mach-pxa/include/mach/debug-macro.S | 2 +- arch/arm/mach-pxa/include/mach/gpio.h | 110 +- arch/arm/mach-pxa/include/mach/hardware.h | 12 +- arch/arm/mach-pxa/include/mach/irqs.h | 12 + arch/arm/mach-pxa/include/mach/littleton.h | 2 +- arch/arm/mach-pxa/include/mach/lpd270.h | 4 +- arch/arm/mach-pxa/include/mach/magician.h | 3 +- arch/arm/mach-pxa/include/mach/memory.h | 24 - arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | 3 + arch/arm/mach-pxa/include/mach/mtd-xip.h | 1 - arch/arm/mach-pxa/include/mach/palm27x.h | 2 +- arch/arm/mach-pxa/include/mach/palmtx.h | 6 +- arch/arm/mach-pxa/include/mach/pm.h | 4 +- arch/arm/mach-pxa/include/mach/pxa25x.h | 9 + arch/arm/mach-pxa/include/mach/pxa27x-udc.h | 4 +- arch/arm/mach-pxa/include/mach/pxa27x.h | 7 + arch/arm/mach-pxa/include/mach/pxa300.h | 3 +- arch/arm/mach-pxa/include/mach/pxa320.h | 3 +- arch/arm/mach-pxa/include/mach/pxa930.h | 3 +- arch/arm/mach-pxa/include/mach/pxafb.h | 13 + arch/arm/mach-pxa/include/mach/regs-intc.h | 30 - arch/arm/mach-pxa/include/mach/smemc.h | 2 +- arch/arm/mach-pxa/include/mach/zeus.h | 4 +- arch/arm/mach-pxa/include/mach/zylonite.h | 4 +- arch/arm/mach-pxa/irq.c | 45 +- arch/arm/mach-pxa/littleton.c | 8 +- arch/arm/mach-pxa/lpd270.c | 8 +- arch/arm/mach-pxa/lubbock.c | 3 +- arch/arm/mach-pxa/magician.c | 60 +- arch/arm/mach-pxa/mainstone.c | 6 +- arch/arm/mach-pxa/mfp-pxa2xx.c | 4 +- arch/arm/mach-pxa/mioa701.c | 73 +- arch/arm/mach-pxa/mp900.c | 3 +- arch/arm/mach-pxa/mxm8x10.c | 9 +- arch/arm/mach-pxa/palmld.c | 3 +- arch/arm/mach-pxa/palmt5.c | 3 +- arch/arm/mach-pxa/palmtc.c | 6 +- arch/arm/mach-pxa/palmte2.c | 5 +- arch/arm/mach-pxa/palmtreo.c | 14 +- arch/arm/mach-pxa/palmtx.c | 11 +- arch/arm/mach-pxa/palmz72.c | 4 +- arch/arm/mach-pxa/pcm027.c | 3 +- arch/arm/mach-pxa/pcm990-baseboard.c | 7 +- arch/arm/mach-pxa/pm.c | 1 - arch/arm/mach-pxa/poodle.c | 8 +- arch/arm/mach-pxa/pxa25x.c | 8 +- arch/arm/mach-pxa/pxa27x.c | 20 +- arch/arm/mach-pxa/pxa3xx-ulpi.c | 2 + arch/arm/mach-pxa/pxa3xx.c | 24 +- arch/arm/mach-pxa/pxa95x.c | 4 +- arch/arm/mach-pxa/raumfeld.c | 21 +- arch/arm/mach-pxa/reset.c | 8 +- arch/arm/mach-pxa/saar.c | 5 +- arch/arm/mach-pxa/saarb.c | 10 +- arch/arm/mach-pxa/sleep.S | 55 +- arch/arm/mach-pxa/spitz.c | 10 +- arch/arm/mach-pxa/stargate2.c | 6 +- arch/arm/mach-pxa/tavorevb.c | 3 +- arch/arm/mach-pxa/tavorevb3.c | 3 +- arch/arm/mach-pxa/tosa.c | 107 +- arch/arm/mach-pxa/trizeps4.c | 7 +- arch/arm/mach-pxa/viper.c | 3 +- arch/arm/mach-pxa/vpac270.c | 3 +- arch/arm/mach-pxa/xcep.c | 9 +- arch/arm/mach-pxa/z2.c | 21 +- arch/arm/mach-pxa/zeus.c | 17 +- arch/arm/mach-pxa/zylonite.c | 10 +- arch/arm/mach-realview/Kconfig | 1 + arch/arm/mach-realview/Makefile.boot | 4 +- arch/arm/mach-realview/core.c | 3 +- arch/arm/mach-realview/core.h | 4 +- arch/arm/mach-realview/hotplug.c | 2 +- arch/arm/mach-realview/include/mach/board-pb1176.h | 1 + arch/arm/mach-realview/include/mach/debug-macro.S | 19 +- arch/arm/mach-realview/include/mach/gpio.h | 7 +- arch/arm/mach-realview/include/mach/memory.h | 4 - arch/arm/mach-realview/include/mach/system.h | 1 + arch/arm/mach-realview/platsmp.c | 18 +- arch/arm/mach-realview/realview_eb.c | 5 +- arch/arm/mach-realview/realview_pb1176.c | 53 +- arch/arm/mach-realview/realview_pb11mp.c | 5 +- arch/arm/mach-realview/realview_pba8.c | 5 +- arch/arm/mach-realview/realview_pbx.c | 11 +- arch/arm/mach-rpc/Makefile.boot | 2 +- arch/arm/mach-rpc/include/mach/debug-macro.S | 2 +- arch/arm/mach-rpc/include/mach/hardware.h | 25 +- arch/arm/mach-rpc/include/mach/io.h | 193 +- arch/arm/mach-rpc/riscpc.c | 4 +- arch/arm/mach-s3c2410/Kconfig | 7 - arch/arm/mach-s3c2410/Makefile | 1 - arch/arm/mach-s3c2410/Makefile.boot | 4 +- arch/arm/mach-s3c2410/dma.c | 14 - arch/arm/mach-s3c2410/gpio.c | 72 - arch/arm/mach-s3c2410/h1940-bluetooth.c | 1 - arch/arm/mach-s3c2410/include/mach/debug-macro.S | 14 +- arch/arm/mach-s3c2410/include/mach/dma.h | 20 +- arch/arm/mach-s3c2410/include/mach/entry-macro.S | 4 +- arch/arm/mach-s3c2410/include/mach/fb.h | 75 +- arch/arm/mach-s3c2410/include/mach/gpio-fns.h | 105 +- arch/arm/mach-s3c2410/include/mach/gpio-nrs.h | 2 +- arch/arm/mach-s3c2410/include/mach/gpio-track.h | 6 +- arch/arm/mach-s3c2410/include/mach/gpio.h | 6 - arch/arm/mach-s3c2410/include/mach/h1940-latch.h | 2 +- arch/arm/mach-s3c2410/include/mach/io.h | 2 - arch/arm/mach-s3c2410/include/mach/irqs.h | 4 +- arch/arm/mach-s3c2410/include/mach/map.h | 53 +- arch/arm/mach-s3c2410/include/mach/memory.h | 16 - arch/arm/mach-s3c2410/include/mach/pm-core.h | 3 + arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 241 --- arch/arm/mach-s3c2410/include/mach/regs-mem.h | 28 - .../mach-s3c2410/include/mach/regs-s3c2443-clock.h | 2 + arch/arm/mach-s3c2410/include/mach/spi-gpio.h | 28 - arch/arm/mach-s3c2410/mach-amlm5900.c | 2 +- arch/arm/mach-s3c2410/mach-bast.c | 2 +- arch/arm/mach-s3c2410/mach-h1940.c | 9 +- arch/arm/mach-s3c2410/mach-n30.c | 4 +- arch/arm/mach-s3c2410/mach-otom.c | 2 +- arch/arm/mach-s3c2410/mach-qt2410.c | 37 +- arch/arm/mach-s3c2410/mach-smdk2410.c | 2 +- arch/arm/mach-s3c2410/mach-tct_hammer.c | 2 +- arch/arm/mach-s3c2410/mach-vr1000.c | 2 +- arch/arm/mach-s3c2410/pm-h1940.S | 2 +- arch/arm/mach-s3c2410/s3c2410.c | 6 +- arch/arm/mach-s3c2410/sleep.S | 12 +- arch/arm/mach-s3c2412/Kconfig | 3 +- arch/arm/mach-s3c2412/Makefile | 1 - arch/arm/mach-s3c2412/clock.c | 36 +- arch/arm/mach-s3c2412/dma.c | 22 +- arch/arm/mach-s3c2412/gpio.c | 2 +- arch/arm/mach-s3c2412/mach-jive.c | 43 +- arch/arm/mach-s3c2412/mach-smdk2413.c | 9 +- arch/arm/mach-s3c2412/mach-vstms.c | 7 +- arch/arm/mach-s3c2412/pm.c | 6 +- arch/arm/mach-s3c2412/s3c2412.c | 2 + arch/arm/mach-s3c2412/sleep.S | 12 +- arch/arm/mach-s3c2416/Kconfig | 1 - arch/arm/mach-s3c2416/clock.c | 60 +- arch/arm/mach-s3c2416/mach-smdk2416.c | 2 +- arch/arm/mach-s3c2416/pm.c | 6 +- arch/arm/mach-s3c2416/s3c2416.c | 9 +- arch/arm/mach-s3c2416/setup-sdhci.c | 37 - arch/arm/mach-s3c2440/Kconfig | 4 - arch/arm/mach-s3c2440/clock.c | 5 +- arch/arm/mach-s3c2440/dma.c | 17 - arch/arm/mach-s3c2440/mach-anubis.c | 2 +- arch/arm/mach-s3c2440/mach-at2440evb.c | 2 +- arch/arm/mach-s3c2440/mach-gta02.c | 3 +- arch/arm/mach-s3c2440/mach-mini2440.c | 2 +- arch/arm/mach-s3c2440/mach-nexcoder.c | 2 +- arch/arm/mach-s3c2440/mach-osiris.c | 2 +- arch/arm/mach-s3c2440/mach-rx1950.c | 3 +- arch/arm/mach-s3c2440/mach-rx3715.c | 2 +- arch/arm/mach-s3c2440/mach-smdk2440.c | 2 +- arch/arm/mach-s3c2440/s3c2440.c | 6 +- arch/arm/mach-s3c2440/s3c2442.c | 8 +- arch/arm/mach-s3c2440/s3c244x-clock.c | 2 +- arch/arm/mach-s3c2443/Kconfig | 1 - arch/arm/mach-s3c2443/clock.c | 176 +- arch/arm/mach-s3c2443/dma.c | 27 - arch/arm/mach-s3c2443/mach-smdk2443.c | 2 +- arch/arm/mach-s3c2443/s3c2443.c | 7 +- arch/arm/mach-s3c24a0/include/mach/debug-macro.S | 27 - arch/arm/mach-s3c24a0/include/mach/io.h | 18 - arch/arm/mach-s3c24a0/include/mach/irqs.h | 117 -- arch/arm/mach-s3c24a0/include/mach/map.h | 86 - arch/arm/mach-s3c24a0/include/mach/memory.h | 21 - arch/arm/mach-s3c24a0/include/mach/regs-clock.h | 88 - arch/arm/mach-s3c24a0/include/mach/regs-irq.h | 25 - arch/arm/mach-s3c24a0/include/mach/system.h | 25 - arch/arm/mach-s3c24a0/include/mach/tick.h | 15 - arch/arm/mach-s3c24a0/include/mach/timex.h | 18 - arch/arm/mach-s3c24a0/include/mach/vmalloc.h | 17 - crypto/async_tx/async_memcpy.c | 1 + crypto/async_tx/async_pq.c | 1 + crypto/async_tx/async_raid6_recov.c | 1 + crypto/async_tx/async_tx.c | 1 + crypto/async_tx/async_xor.c | 1 + crypto/async_tx/raid6test.c | 2 + drivers/acpi/acpica/acglobal.h | 6 + drivers/acpi/acpica/acmacros.h | 10 +- drivers/acpi/acpica/acpredef.h | 1 + drivers/acpi/acpica/dsopcode.c | 4 +- drivers/acpi/acpica/evregion.c | 4 +- drivers/acpi/acpica/evxface.c | 1 + drivers/acpi/acpica/evxfevnt.c | 1 + drivers/acpi/acpica/evxfgpe.c | 1 + drivers/acpi/acpica/evxfregn.c | 1 + drivers/acpi/acpica/exdump.c | 4 +- drivers/acpi/acpica/exfldio.c | 10 +- drivers/acpi/acpica/exregion.c | 8 +- drivers/acpi/acpica/hwregs.c | 11 +- drivers/acpi/acpica/hwsleep.c | 1 + drivers/acpi/acpica/hwtimer.c | 1 + drivers/acpi/acpica/hwvalid.c | 16 +- drivers/acpi/acpica/hwxface.c | 1 + drivers/acpi/acpica/nsdump.c | 12 +- drivers/acpi/acpica/nspredef.c | 18 +- drivers/acpi/acpica/nsxfeval.c | 1 + drivers/acpi/acpica/nsxfname.c | 1 + drivers/acpi/acpica/nsxfobj.c | 1 + drivers/acpi/acpica/rsxface.c | 1 + drivers/acpi/acpica/tbinstal.c | 31 +- drivers/acpi/acpica/tbutils.c | 21 +- drivers/acpi/acpica/tbxface.c | 1 + drivers/acpi/acpica/tbxfroot.c | 7 +- drivers/acpi/acpica/utdebug.c | 1 + drivers/acpi/acpica/utdecode.c | 1 + drivers/acpi/acpica/utglobal.c | 1 + drivers/acpi/acpica/utxface.c | 11 +- drivers/acpi/acpica/utxferror.c | 1 + drivers/acpi/apei/Kconfig | 11 +- drivers/acpi/apei/apei-base.c | 35 +- drivers/acpi/apei/apei-internal.h | 15 +- drivers/acpi/apei/einj.c | 43 +- drivers/acpi/apei/erst-dbg.c | 6 +- drivers/acpi/apei/erst.c | 67 +- drivers/acpi/apei/ghes.c | 451 ++++- drivers/acpi/apei/hest.c | 17 +- drivers/amba/bus.c | 68 +- drivers/ata/Kconfig | 13 +- drivers/ata/Makefile | 2 +- drivers/ata/acard-ahci.c | 27 +- drivers/ata/ahci.c | 333 +++- drivers/ata/ahci.h | 2 + drivers/ata/ahci_platform.c | 56 +- drivers/ata/ata_generic.c | 5 +- drivers/ata/ata_piix.c | 231 +-- drivers/ata/libahci.c | 174 +- drivers/ata/libata-acpi.c | 70 +- drivers/ata/libata-core.c | 507 ++++-- drivers/ata/libata-eh.c | 179 +- drivers/ata/libata-pmp.c | 168 +- drivers/ata/libata-scsi.c | 86 +- drivers/ata/libata-sff.c | 205 ++- drivers/ata/libata-transport.c | 16 +- drivers/ata/pata_acpi.c | 8 +- drivers/ata/pata_ali.c | 10 +- drivers/ata/pata_amd.c | 8 +- drivers/ata/pata_arasan_cf.c | 6 +- drivers/ata/pata_artop.c | 112 +- drivers/ata/pata_at91.c | 7 +- drivers/ata/pata_atiixp.c | 35 +- drivers/ata/pata_atp867x.c | 13 +- drivers/ata/pata_bf54x.c | 4 +- drivers/ata/pata_cmd64x.c | 44 +- drivers/ata/pata_cs5520.c | 3 +- drivers/ata/pata_cs5535.c | 16 +- drivers/ata/pata_efar.c | 27 +- drivers/ata/pata_hpt366.c | 35 +- drivers/ata/pata_hpt3x3.c | 4 +- drivers/ata/pata_icside.c | 4 +- drivers/ata/pata_it8213.c | 29 +- drivers/ata/pata_it821x.c | 16 +- drivers/ata/pata_ixp4xx_cf.c | 4 +- drivers/ata/pata_legacy.c | 131 +- drivers/ata/pata_macio.c | 10 +- drivers/ata/pata_mpc52xx.c | 2 +- drivers/ata/pata_mpiix.c | 4 +- drivers/ata/pata_netcell.c | 5 +- drivers/ata/pata_ns87410.c | 2 +- drivers/ata/pata_ns87415.c | 5 +- drivers/ata/pata_octeon_cf.c | 8 +- drivers/ata/pata_of_platform.c | 8 +- drivers/ata/pata_oldpiix.c | 5 +- drivers/ata/pata_opti.c | 4 +- drivers/ata/pata_optidma.c | 4 +- drivers/ata/pata_pcmcia.c | 5 +- drivers/ata/pata_pdc2027x.c | 36 +- drivers/ata/pata_platform.c | 2 +- drivers/ata/pata_qdi.c | 366 ---- drivers/ata/pata_radisys.c | 5 +- drivers/ata/pata_rdc.c | 21 +- drivers/ata/pata_rz1000.c | 4 +- drivers/ata/pata_samsung_cf.c | 2 +- drivers/ata/pata_sc1200.c | 14 +- drivers/ata/pata_scc.c | 35 +- drivers/ata/pata_sch.c | 5 +- drivers/ata/pata_serverworks.c | 140 +- drivers/ata/pata_sil680.c | 98 +- drivers/ata/pata_sis.c | 159 +- drivers/ata/pata_sl82c105.c | 43 +- drivers/ata/pata_triflex.c | 4 +- drivers/ata/pata_via.c | 59 +- drivers/ata/pdc_adma.c | 10 +- drivers/ata/sata_dwc_460ex.c | 64 +- drivers/ata/sata_fsl.c | 45 +- drivers/ata/sata_inic162x.c | 31 +- drivers/ata/sata_mv.c | 110 +- drivers/ata/sata_nv.c | 79 +- drivers/ata/sata_promise.c | 6 +- drivers/ata/sata_qstor.c | 13 +- drivers/ata/sata_sil.c | 24 +- drivers/ata/sata_sil24.c | 49 +- drivers/ata/sata_sis.c | 28 +- drivers/ata/sata_svw.c | 4 +- drivers/ata/sata_sx4.c | 4 +- drivers/ata/sata_uli.c | 4 +- drivers/ata/sata_via.c | 42 +- drivers/ata/sata_vsc.c | 9 +- drivers/atm/ambassador.c | 15 +- drivers/atm/ambassador.h | 4 - drivers/atm/atmtcp.c | 2 +- drivers/atm/eni.c | 7 +- drivers/atm/eni.h | 3 +- drivers/atm/firestream.c | 3 +- drivers/atm/fore200e.c | 2 +- drivers/atm/horizon.c | 3 +- drivers/atm/idt77252.c | 18 +- drivers/atm/iphase.c | 268 +-- drivers/atm/iphase.h | 395 ++--- drivers/atm/lanai.c | 12 +- drivers/atm/nicstar.c | 2 +- drivers/atm/suni.c | 2 +- drivers/atm/uPD98402.c | 2 +- drivers/atm/zatm.c | 3 +- drivers/auxdisplay/ks0108.c | 1 + drivers/bcma/Kconfig | 24 + drivers/bcma/Makefile | 5 +- drivers/bcma/bcma_private.h | 30 +- drivers/bcma/core.c | 78 +- drivers/bcma/driver_chipcommon.c | 70 +- drivers/bcma/driver_chipcommon_pmu.c | 200 ++- drivers/bcma/driver_pci.c | 79 +- drivers/bcma/host_pci.c | 94 + drivers/bcma/main.c | 113 +- drivers/bcma/scan.c | 348 ++-- drivers/cdrom/cdrom.c | 8 +- drivers/char/agp/backend.c | 3 +- drivers/char/agp/hp-agp.c | 6 +- drivers/char/agp/intel-agp.h | 1 + drivers/char/agp/intel-gtt.c | 35 +- drivers/char/hw_random/Kconfig | 40 + drivers/char/hw_random/Makefile | 2 + drivers/char/hw_random/core.c | 2 +- drivers/char/hw_random/n2-drv.c | 29 +- drivers/char/hw_random/n2rng.h | 2 +- drivers/char/hw_random/nomadik-rng.c | 3 +- drivers/char/hw_random/omap-rng.c | 6 +- drivers/char/hw_random/timeriomem-rng.c | 3 +- drivers/char/hw_random/virtio-rng.c | 1 + drivers/char/ipmi/ipmi_bt_sm.c | 2 +- drivers/char/ipmi/ipmi_watchdog.c | 76 +- drivers/char/tpm/Kconfig | 2 +- drivers/char/tpm/tpm.c | 154 +- drivers/char/tpm/tpm.h | 10 + drivers/char/tpm/tpm_nsc.c | 16 +- drivers/char/tpm/tpm_tis.c | 213 ++- drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +- drivers/clk/Kconfig | 3 + drivers/clocksource/Kconfig | 27 + drivers/clocksource/Makefile | 4 +- drivers/clocksource/i8253.c | 114 +- drivers/clocksource/sh_cmt.c | 35 +- drivers/clocksource/sh_mtu2.c | 1 + drivers/clocksource/sh_tmu.c | 1 + drivers/connector/cn_proc.c | 147 +- drivers/connector/connector.c | 7 +- drivers/crypto/caam/caamalg.c | 1848 +++++++++++++++----- drivers/crypto/caam/compat.h | 1 + drivers/crypto/caam/ctrl.c | 30 +- drivers/crypto/caam/desc_constr.h | 58 +- drivers/crypto/caam/error.c | 10 +- drivers/dca/dca-core.c | 81 +- drivers/dca/dca-sysfs.c | 1 + drivers/dma/Kconfig | 15 +- drivers/dma/Makefile | 1 + drivers/dma/TODO | 1 - drivers/dma/amba-pl08x.c | 857 +++++---- drivers/dma/at_hdmac.c | 168 +- drivers/dma/at_hdmac_regs.h | 24 + drivers/dma/coh901318.c | 20 +- drivers/dma/dmaengine.c | 13 +- drivers/dma/dmatest.c | 24 +- drivers/dma/dw_dmac.c | 5 +- drivers/dma/imx-dma.c | 5 +- drivers/dma/imx-sdma.c | 141 +- drivers/dma/intel_mid_dma.c | 12 +- drivers/dma/ioat/dma.c | 62 +- drivers/dma/ioat/dma.h | 7 +- drivers/dma/ioat/dma_v2.c | 19 +- drivers/dma/ioat/dma_v3.c | 19 +- drivers/dma/ioat/pci.c | 11 + drivers/dma/ipu/ipu_idmac.c | 73 +- drivers/dma/ipu/ipu_irq.c | 48 +- drivers/dma/mpc512x_dma.c | 1 - drivers/dma/mv_xor.c | 84 +- drivers/dma/mv_xor.h | 1 + drivers/dma/mxs-dma.c | 58 +- drivers/dma/pch_dma.c | 5 +- drivers/dma/pl330.c | 298 +++- drivers/dma/shdma.c | 211 ++- drivers/dma/shdma.h | 11 + drivers/dma/ste_dma40.c | 318 ++-- drivers/dma/ste_dma40_ll.h | 3 - drivers/dma/timb_dma.c | 5 +- drivers/eisa/pci_eisa.c | 39 +- drivers/firewire/core-card.c | 2 +- drivers/firewire/core-cdev.c | 3 +- drivers/firewire/core-device.c | 2 +- drivers/firewire/core-iso.c | 1 + drivers/firewire/core-topology.c | 2 +- drivers/firewire/core-transaction.c | 4 +- drivers/firewire/core.h | 2 +- drivers/firewire/net.c | 26 +- drivers/firewire/nosy.c | 2 +- drivers/firewire/ohci.c | 306 +++- drivers/firewire/sbp2.c | 260 ++- net/bluetooth/af_bluetooth.c | 72 +- net/bluetooth/bnep/core.c | 13 +- net/bluetooth/bnep/netdev.c | 2 +- net/bluetooth/cmtp/capi.c | 3 +- net/bluetooth/cmtp/cmtp.h | 1 + net/bluetooth/cmtp/core.c | 30 +- net/bluetooth/hci_conn.c | 115 +- net/bluetooth/hci_core.c | 61 +- net/bluetooth/hci_event.c | 97 +- net/bluetooth/hci_sock.c | 22 +- net/bluetooth/hci_sysfs.c | 3 + net/bluetooth/hidp/core.c | 13 +- net/bluetooth/l2cap_core.c | 548 +++--- net/bluetooth/l2cap_sock.c | 10 +- net/bluetooth/mgmt.c | 215 ++- net/bluetooth/rfcomm/core.c | 25 +- net/bluetooth/rfcomm/sock.c | 13 +- net/bluetooth/sco.c | 71 +- net/bluetooth/smp.c | 444 +++-- 1251 files changed, 22864 insertions(+), 29545 deletions(-) delete mode 100644 arch/arm/mach-at91/board-usb-a9260.c delete mode 100644 arch/arm/mach-at91/board-usb-a9263.c delete mode 100644 arch/arm/mach-at91/include/mach/at91_mci.h delete mode 100644 arch/arm/mach-at91/include/mach/at91_wdt.h delete mode 100644 arch/arm/mach-at91/include/mach/clkdev.h delete mode 100644 arch/arm/mach-bcmring/include/mach/clkdev.h delete mode 100644 arch/arm/mach-bcmring/include/mach/memory.h delete mode 100644 arch/arm/mach-cns3xxx/include/mach/hardware.h delete mode 100644 arch/arm/mach-cns3xxx/include/mach/memory.h delete mode 100644 arch/arm/mach-davinci/gpio-tnetv107x.c delete mode 100644 arch/arm/mach-davinci/gpio.c delete mode 100644 arch/arm/mach-davinci/include/mach/clkdev.h delete mode 100644 arch/arm/mach-davinci/include/mach/memory.h delete mode 100644 arch/arm/mach-dove/include/mach/memory.h delete mode 100644 arch/arm/mach-ep93xx/dma-m2p.c delete mode 100644 arch/arm/mach-ep93xx/gpio.c delete mode 100644 arch/arm/mach-ep93xx/include/mach/clkdev.h delete mode 100644 arch/arm/mach-gemini/include/mach/memory.h delete mode 100644 arch/arm/mach-h720x/include/mach/memory.h delete mode 100644 arch/arm/mach-imx/cache-l2x0.c delete mode 100644 arch/arm/mach-imx/mm-imx31.c delete mode 100644 arch/arm/mach-imx/mm-imx35.c delete mode 100644 arch/arm/mach-integrator/include/mach/bits.h delete mode 100644 arch/arm/mach-iop32x/include/mach/memory.h delete mode 100644 arch/arm/mach-iop33x/include/mach/memory.h delete mode 100644 arch/arm/mach-ixp2000/include/mach/gpio.h delete mode 100644 arch/arm/mach-ixp4xx/include/mach/memory.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/memory.h delete mode 100644 arch/arm/mach-ks8695/gpio.c delete mode 100644 arch/arm/mach-lpc32xx/gpiolib.c delete mode 100644 arch/arm/mach-lpc32xx/include/mach/clkdev.h delete mode 100644 arch/arm/mach-lpc32xx/include/mach/memory.h delete mode 100644 arch/arm/mach-mmp/include/mach/clkdev.h delete mode 100644 arch/arm/mach-mmp/include/mach/memory.h delete mode 100644 arch/arm/mach-msm/gpio-v2.c delete mode 100644 arch/arm/mach-msm/gpio.c delete mode 100644 arch/arm/mach-msm/gpio_hw.h delete mode 100644 arch/arm/mach-msm/include/mach/clkdev.h delete mode 100644 arch/arm/mach-msm/include/mach/memory.h delete mode 100644 arch/arm/mach-msm/iommu.c delete mode 100644 arch/arm/mach-msm/iommu_dev.c delete mode 100644 arch/arm/mach-mv78xx0/include/mach/memory.h delete mode 100644 arch/arm/mach-mx5/devices.c delete mode 100644 arch/arm/mach-mx5/devices.h delete mode 100644 arch/arm/mach-mx5/mm-mx50.c delete mode 100644 arch/arm/mach-mxs/gpio.c delete mode 100644 arch/arm/mach-mxs/gpio.h delete mode 100644 arch/arm/mach-mxs/include/mach/clkdev.h delete mode 100644 arch/arm/mach-mxs/include/mach/memory.h delete mode 100644 arch/arm/mach-mxs/mm-mx23.c delete mode 100644 arch/arm/mach-mxs/mm-mx28.c delete mode 100644 arch/arm/mach-netx/include/mach/memory.h delete mode 100644 arch/arm/mach-nomadik/include/mach/clkdev.h delete mode 100644 arch/arm/mach-nomadik/include/mach/memory.h delete mode 100644 arch/arm/mach-omap1/include/mach/clkdev.h delete mode 100644 arch/arm/mach-omap2/include/mach/clkdev.h delete mode 100644 arch/arm/mach-omap2/include/mach/memory.h delete mode 100644 arch/arm/mach-omap2/io.h delete mode 100644 arch/arm/mach-omap2/timer-gp.c delete mode 100644 arch/arm/mach-omap2/timer-gp.h delete mode 100644 arch/arm/mach-orion5x/include/mach/memory.h delete mode 100644 arch/arm/mach-pnx4008/include/mach/clkdev.h delete mode 100644 arch/arm/mach-pnx4008/include/mach/gpio.h delete mode 100644 arch/arm/mach-pnx4008/include/mach/memory.h delete mode 100644 arch/arm/mach-pxa/include/mach/clkdev.h delete mode 100644 arch/arm/mach-pxa/include/mach/memory.h delete mode 100644 arch/arm/mach-pxa/include/mach/regs-intc.h delete mode 100644 arch/arm/mach-s3c2410/gpio.c delete mode 100644 arch/arm/mach-s3c2410/include/mach/memory.h delete mode 100644 arch/arm/mach-s3c2410/include/mach/spi-gpio.h delete mode 100644 arch/arm/mach-s3c24a0/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-s3c24a0/include/mach/io.h delete mode 100644 arch/arm/mach-s3c24a0/include/mach/irqs.h delete mode 100644 arch/arm/mach-s3c24a0/include/mach/map.h delete mode 100644 arch/arm/mach-s3c24a0/include/mach/memory.h delete mode 100644 arch/arm/mach-s3c24a0/include/mach/regs-clock.h delete mode 100644 arch/arm/mach-s3c24a0/include/mach/regs-irq.h delete mode 100644 arch/arm/mach-s3c24a0/include/mach/system.h delete mode 100644 arch/arm/mach-s3c24a0/include/mach/tick.h delete mode 100644 arch/arm/mach-s3c24a0/include/mach/timex.h delete mode 100644 arch/arm/mach-s3c24a0/include/mach/vmalloc.h delete mode 100644 drivers/ata/pata_qdi.c diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 2248467..d111c3e9 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -182,6 +182,11 @@ config MACH_ECO920 help Select this if you are using the eco920 board +config MACH_RSI_EWS + bool "RSI Embedded Webserver" + depends on ARCH_AT91RM9200 + help + Select this if you are using RSIs EWS board. endif # ---------------------------------------------------------- @@ -190,12 +195,6 @@ if ARCH_AT91SAM9260 comment "AT91SAM9260 Variants" -config ARCH_AT91SAM9260_SAM9XE - bool "AT91SAM9XE" - help - Select this if you are using Atmel's AT91SAM9XE System-on-Chip. - They are basically AT91SAM9260s with various sizes of embedded Flash. - comment "AT91SAM9260 / AT91SAM9XE Board Type" config MACH_AT91SAM9260EK @@ -381,6 +380,14 @@ config MACH_GSIA18S This enables support for the GS_IA18_S board produced by GeoSIG Ltd company. This is an internet accelerograph. + +config MACH_USB_A9G20 + bool "CALAO USB-A9G20" + depends on ARCH_AT91SAM9G20 + help + Select this if you are using a Calao Systems USB-A9G20. + + endif if (ARCH_AT91SAM9260 || ARCH_AT91SAM9G20) @@ -442,6 +449,17 @@ endif # ---------------------------------------------------------- +comment "Generic Board Type" + +config MACH_AT91SAM_DT + bool "Atmel AT91SAM Evaluation Kits with device-tree support" + select USE_OF + help + Select this if you want to experiment device-tree with + an Atmel Evaluation Kit. + +# ---------------------------------------------------------- + comment "AT91 Board Options" config MTD_AT91_DATAFLASH_CARD diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 9696623..242174f 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -2,7 +2,7 @@ # Makefile for the linux kernel. # -obj-y := irq.o gpio.o +obj-y := irq.o gpio.o setup.o obj-m := obj-n := obj- := @@ -36,12 +36,13 @@ obj-$(CONFIG_MACH_ECBAT91) += board-ecbat91.o obj-$(CONFIG_MACH_YL9200) += board-yl-9200.o obj-$(CONFIG_MACH_CPUAT91) += board-cpuat91.o obj-$(CONFIG_MACH_ECO920) += board-eco920.o +obj-$(CONFIG_MACH_RSI_EWS) += board-rsi-ews.o # AT91SAM9260 board-specific support obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o obj-$(CONFIG_MACH_CAM60) += board-cam60.o obj-$(CONFIG_MACH_SAM9_L9260) += board-sam9-l9260.o -obj-$(CONFIG_MACH_USB_A9260) += board-usb-a9260.o +obj-$(CONFIG_MACH_USB_A9260) += board-usb-a926x.o obj-$(CONFIG_MACH_QIL_A9260) += board-qil-a9260.o obj-$(CONFIG_MACH_AFEB9260) += board-afeb-9260v1.o obj-$(CONFIG_MACH_CPU9260) += board-cpu9krea.o @@ -53,7 +54,7 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += board-sam9261ek.o # AT91SAM9263 board-specific support obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o -obj-$(CONFIG_MACH_USB_A9263) += board-usb-a9263.o +obj-$(CONFIG_MACH_USB_A9263) += board-usb-a926x.o obj-$(CONFIG_MACH_NEOCORE926) += board-neocore926.o # AT91SAM9RL board-specific support @@ -67,6 +68,7 @@ obj-$(CONFIG_MACH_STAMP9G20) += board-stamp9g20.o obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o obj-$(CONFIG_MACH_PCONTROL_G20) += board-pcontrol-g20.o board-stamp9g20.o obj-$(CONFIG_MACH_GSIA18S) += board-gsia18s.o board-stamp9g20.o +obj-$(CONFIG_MACH_USB_A9G20) += board-usb-a926x.o # AT91SAM9260/AT91SAM9G20 board-specific support obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o @@ -74,6 +76,9 @@ obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o # AT91SAM9G45 board-specific support obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o +# AT91SAM board with device-tree +obj-$(CONFIG_MACH_AT91SAM_DT) += board-dt.o + # AT91CAP9 board-specific support obj-$(CONFIG_MACH_AT91CAP9ADK) += board-cap9adk.o diff --git a/arch/arm/mach-at91/Makefile.boot b/arch/arm/mach-at91/Makefile.boot index 3462b81..8ddafad 100644 --- a/arch/arm/mach-at91/Makefile.boot +++ b/arch/arm/mach-at91/Makefile.boot @@ -4,15 +4,17 @@ # INITRD_PHYS must be in RAM ifeq ($(CONFIG_ARCH_AT91CAP9),y) - zreladdr-y := 0x70008000 + zreladdr-y += 0x70008000 params_phys-y := 0x70000100 initrd_phys-y := 0x70410000 else ifeq ($(CONFIG_ARCH_AT91SAM9G45),y) - zreladdr-y := 0x70008000 + zreladdr-y += 0x70008000 params_phys-y := 0x70000100 initrd_phys-y := 0x70410000 else - zreladdr-y := 0x20008000 + zreladdr-y += 0x20008000 params_phys-y := 0x20000100 initrd_phys-y := 0x20410000 endif + +dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9m10g45ek.dtb usb_a9g20.dtb diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c index f1013d0..ecdd54d 100644 --- a/arch/arm/mach-at91/at91cap9.c +++ b/arch/arm/mach-at91/at91cap9.c @@ -25,23 +25,10 @@ #include #include +#include "soc.h" #include "generic.h" #include "clock.h" -static struct map_desc at91cap9_io_desc[] __initdata = { - { - .virtual = AT91_VA_BASE_SYS, - .pfn = __phys_to_pfn(AT91_BASE_SYS), - .length = SZ_16K, - .type = MT_DEVICE, - }, { - .virtual = AT91_IO_VIRT_BASE - AT91CAP9_SRAM_SIZE, - .pfn = __phys_to_pfn(AT91CAP9_SRAM_BASE), - .length = AT91CAP9_SRAM_SIZE, - .type = MT_DEVICE, - }, -}; - /* -------------------------------------------------------------------- * Clocks * -------------------------------------------------------------------- */ @@ -232,6 +219,8 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), + /* fake hclk clock */ + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk), }; static struct clk_lookup usart_clocks_lookups[] = { @@ -339,24 +328,17 @@ static void at91cap9_poweroff(void) * AT91CAP9 processor initialization * -------------------------------------------------------------------- */ -void __init at91cap9_map_io(void) +static void __init at91cap9_map_io(void) { - /* Map peripherals */ - iotable_init(at91cap9_io_desc, ARRAY_SIZE(at91cap9_io_desc)); + at91_init_sram(0, AT91CAP9_SRAM_BASE, AT91CAP9_SRAM_SIZE); } -void __init at91cap9_initialize(unsigned long main_clock) +static void __init at91cap9_initialize(void) { at91_arch_reset = at91cap9_reset; pm_power_off = at91cap9_poweroff; at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1); - /* Init clock subsystem */ - at91_clock_init(main_clock); - - /* Register the processor-specific clocks */ - at91cap9_register_clocks(); - /* Register GPIO subsystem */ at91_gpio_init(at91cap9_gpio, 4); @@ -409,14 +391,9 @@ static unsigned int at91cap9_default_irq_priority[NR_AIC_IRQS] __initdata = { 0, /* Advanced Interrupt Controller (IRQ1) */ }; -void __init at91cap9_init_interrupts(unsigned int priority[NR_AIC_IRQS]) -{ - if (!priority) - priority = at91cap9_default_irq_priority; - - /* Initialize the AIC interrupt controller */ - at91_aic_init(priority); - - /* Enable GPIO interrupts */ - at91_gpio_irq_setup(); -} +struct at91_init_soc __initdata at91cap9_soc = { + .map_io = at91cap9_map_io, + .default_irq_priority = at91cap9_default_irq_priority, + .register_clocks = at91cap9_register_clocks, + .init = at91cap9_initialize, +}; diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c index dba0d8d..adad70d 100644 --- a/arch/arm/mach-at91/at91cap9_devices.c +++ b/arch/arm/mach-at91/at91cap9_devices.c @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -23,7 +24,6 @@ #include #include -#include #include #include #include @@ -80,6 +80,12 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) at91_set_gpio_output(data->vbus_pin[i], 0); } + /* Enable overcurrent notification */ + for (i = 0; i < data->ports; i++) { + if (data->overcurrent_pin[i]) + at91_set_gpio_input(data->overcurrent_pin[i], 1); + } + usbh_data = *data; platform_device_register(&at91_usbh_device); } @@ -92,7 +98,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} * USB HS Device (Gadget) * -------------------------------------------------------------------- */ -#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE) +#if defined(CONFIG_USB_ATMEL_USBA) || defined(CONFIG_USB_ATMEL_USBA_MODULE) static struct resource usba_udc_resources[] = { [0] = { @@ -1015,8 +1021,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} #if defined(CONFIG_SERIAL_ATMEL) static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -1029,7 +1035,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, /* DBGU not capable of receive DMA */ - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index 83a1a3f..713d3bd 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c @@ -20,25 +20,16 @@ #include #include +#include "soc.h" #include "generic.h" #include "clock.h" static struct map_desc at91rm9200_io_desc[] __initdata = { { - .virtual = AT91_VA_BASE_SYS, - .pfn = __phys_to_pfn(AT91_BASE_SYS), - .length = SZ_4K, - .type = MT_DEVICE, - }, { .virtual = AT91_VA_BASE_EMAC, .pfn = __phys_to_pfn(AT91RM9200_BASE_EMAC), .length = SZ_16K, .type = MT_DEVICE, - }, { - .virtual = AT91_IO_VIRT_BASE - AT91RM9200_SRAM_SIZE, - .pfn = __phys_to_pfn(AT91RM9200_SRAM_BASE), - .length = AT91RM9200_SRAM_SIZE, - .type = MT_DEVICE, }, }; @@ -202,6 +193,8 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), + /* fake hclk clock */ + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk), }; static struct clk_lookup usart_clocks_lookups[] = { @@ -304,24 +297,17 @@ static void at91rm9200_reset(void) at91_sys_write(AT91_ST_CR, AT91_ST_WDRST); } -int rm9200_type; -EXPORT_SYMBOL(rm9200_type); - -void __init at91rm9200_set_type(int type) -{ - rm9200_type = type; -} - /* -------------------------------------------------------------------- * AT91RM9200 processor initialization * -------------------------------------------------------------------- */ -void __init at91rm9200_map_io(void) +static void __init at91rm9200_map_io(void) { /* Map peripherals */ + at91_init_sram(0, AT91RM9200_SRAM_BASE, AT91RM9200_SRAM_SIZE); iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc)); } -void __init at91rm9200_initialize(unsigned long main_clock) +static void __init at91rm9200_initialize(void) { at91_arch_reset = at91rm9200_reset; at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1) @@ -329,12 +315,6 @@ void __init at91rm9200_initialize(unsigned long main_clock) | (1 << AT91RM9200_ID_IRQ4) | (1 << AT91RM9200_ID_IRQ5) | (1 << AT91RM9200_ID_IRQ6); - /* Init clock subsystem */ - at91_clock_init(main_clock); - - /* Register the processor-specific clocks */ - at91rm9200_register_clocks(); - /* Initialize GPIO subsystem */ at91_gpio_init(at91rm9200_gpio, cpu_is_at91rm9200_bga() ? AT91RM9200_BGA : AT91RM9200_PQFP); @@ -383,14 +363,9 @@ static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = { 0 /* Advanced Interrupt Controller (IRQ6) */ }; -void __init at91rm9200_init_interrupts(unsigned int priority[NR_AIC_IRQS]) -{ - if (!priority) - priority = at91rm9200_default_irq_priority; - - /* Initialize the AIC interrupt controller */ - at91_aic_init(priority); - - /* Enable GPIO interrupts */ - at91_gpio_irq_setup(); -} +struct at91_init_soc __initdata at91rm9200_soc = { + .map_io = at91rm9200_map_io, + .default_irq_priority = at91rm9200_default_irq_priority, + .register_clocks = at91rm9200_register_clocks, + .init = at91rm9200_initialize, +}; diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index 871a818..929fd91 100644 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c @@ -14,11 +14,11 @@ #include #include +#include #include #include #include -#include #include #include @@ -60,9 +60,17 @@ static struct platform_device at91rm9200_usbh_device = { void __init at91_add_device_usbh(struct at91_usbh_data *data) { + int i; + if (!data) return; + /* Enable overcurrent notification */ + for (i = 0; i < data->ports; i++) { + if (data->overcurrent_pin[i]) + at91_set_gpio_input(data->overcurrent_pin[i], 1); + } + usbh_data = *data; platform_device_register(&at91rm9200_usbh_device); } @@ -75,7 +83,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} * USB Device (Gadget) * -------------------------------------------------------------------- */ -#ifdef CONFIG_USB_GADGET_AT91 +#if defined(CONFIG_USB_AT91) || defined(CONFIG_USB_AT91_MODULE) static struct at91_udc_data udc_data; static struct resource udc_resources[] = { @@ -869,8 +877,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} #if defined(CONFIG_SERIAL_ATMEL) static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -883,7 +891,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, /* DBGU not capable of receive DMA */ - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index eeb9478..0d20677 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c @@ -17,58 +17,16 @@ #include #include #include +#include #include #include #include #include +#include "soc.h" #include "generic.h" #include "clock.h" -static struct map_desc at91sam9260_io_desc[] __initdata = { - { - .virtual = AT91_VA_BASE_SYS, - .pfn = __phys_to_pfn(AT91_BASE_SYS), - .length = SZ_16K, - .type = MT_DEVICE, - } -}; - -static struct map_desc at91sam9260_sram_desc[] __initdata = { - { - .virtual = AT91_IO_VIRT_BASE - AT91SAM9260_SRAM0_SIZE, - .pfn = __phys_to_pfn(AT91SAM9260_SRAM0_BASE), - .length = AT91SAM9260_SRAM0_SIZE, - .type = MT_DEVICE, - }, { - .virtual = AT91_IO_VIRT_BASE - AT91SAM9260_SRAM0_SIZE - AT91SAM9260_SRAM1_SIZE, - .pfn = __phys_to_pfn(AT91SAM9260_SRAM1_BASE), - .length = AT91SAM9260_SRAM1_SIZE, - .type = MT_DEVICE, - } -}; - -static struct map_desc at91sam9g20_sram_desc[] __initdata = { - { - .virtual = AT91_IO_VIRT_BASE - AT91SAM9G20_SRAM0_SIZE, - .pfn = __phys_to_pfn(AT91SAM9G20_SRAM0_BASE), - .length = AT91SAM9G20_SRAM0_SIZE, - .type = MT_DEVICE, - }, { - .virtual = AT91_IO_VIRT_BASE - AT91SAM9G20_SRAM0_SIZE - AT91SAM9G20_SRAM1_SIZE, - .pfn = __phys_to_pfn(AT91SAM9G20_SRAM1_BASE), - .length = AT91SAM9G20_SRAM1_SIZE, - .type = MT_DEVICE, - } -}; - -static struct map_desc at91sam9xe_sram_desc[] __initdata = { - { - .pfn = __phys_to_pfn(AT91SAM9XE_SRAM_BASE), - .type = MT_DEVICE, - } -}; - /* -------------------------------------------------------------------- * Clocks * -------------------------------------------------------------------- */ @@ -241,6 +199,16 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk), CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk), + /* more usart lookup table for DT entries */ + CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck), + CLKDEV_CON_DEV_ID("usart", "fffb0000.serial", &usart0_clk), + CLKDEV_CON_DEV_ID("usart", "fffb4000.serial", &usart1_clk), + CLKDEV_CON_DEV_ID("usart", "fffb8000.serial", &usart2_clk), + CLKDEV_CON_DEV_ID("usart", "fffd0000.serial", &usart3_clk), + CLKDEV_CON_DEV_ID("usart", "fffd4000.serial", &usart4_clk), + CLKDEV_CON_DEV_ID("usart", "fffd8000.serial", &usart5_clk), + /* fake hclk clock */ + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk), }; static struct clk_lookup usart_clocks_lookups[] = { @@ -330,11 +298,9 @@ static void at91sam9260_poweroff(void) static void __init at91sam9xe_map_io(void) { - unsigned long cidr, sram_size; - - cidr = at91_sys_read(AT91_DBGU_CIDR); + unsigned long sram_size; - switch (cidr & AT91_CIDR_SRAMSIZ) { + switch (at91_soc_initdata.cidr & AT91_CIDR_SRAMSIZ) { case AT91_CIDR_SRAMSIZ_32K: sram_size = 2 * SZ_16K; break; @@ -343,38 +309,29 @@ static void __init at91sam9xe_map_io(void) sram_size = SZ_16K; } - at91sam9xe_sram_desc->virtual = AT91_IO_VIRT_BASE - sram_size; - at91sam9xe_sram_desc->length = sram_size; - - iotable_init(at91sam9xe_sram_desc, ARRAY_SIZE(at91sam9xe_sram_desc)); + at91_init_sram(0, AT91SAM9XE_SRAM_BASE, sram_size); } -void __init at91sam9260_map_io(void) +static void __init at91sam9260_map_io(void) { - /* Map peripherals */ - iotable_init(at91sam9260_io_desc, ARRAY_SIZE(at91sam9260_io_desc)); - - if (cpu_is_at91sam9xe()) + if (cpu_is_at91sam9xe()) { at91sam9xe_map_io(); - else if (cpu_is_at91sam9g20()) - iotable_init(at91sam9g20_sram_desc, ARRAY_SIZE(at91sam9g20_sram_desc)); - else - iotable_init(at91sam9260_sram_desc, ARRAY_SIZE(at91sam9260_sram_desc)); + } else if (cpu_is_at91sam9g20()) { + at91_init_sram(0, AT91SAM9G20_SRAM0_BASE, AT91SAM9G20_SRAM0_SIZE); + at91_init_sram(1, AT91SAM9G20_SRAM1_BASE, AT91SAM9G20_SRAM1_SIZE); + } else { + at91_init_sram(0, AT91SAM9260_SRAM0_BASE, AT91SAM9260_SRAM0_SIZE); + at91_init_sram(1, AT91SAM9260_SRAM1_BASE, AT91SAM9260_SRAM1_SIZE); + } } -void __init at91sam9260_initialize(unsigned long main_clock) +static void __init at91sam9260_initialize(void) { at91_arch_reset = at91sam9_alt_reset; pm_power_off = at91sam9260_poweroff; at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1) | (1 << AT91SAM9260_ID_IRQ2); - /* Init clock subsystem */ - at91_clock_init(main_clock); - - /* Register the processor-specific clocks */ - at91sam9260_register_clocks(); - /* Register GPIO subsystem */ at91_gpio_init(at91sam9260_gpio, 3); } @@ -421,14 +378,9 @@ static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = { 0, /* Advanced Interrupt Controller */ }; -void __init at91sam9260_init_interrupts(unsigned int priority[NR_AIC_IRQS]) -{ - if (!priority) - priority = at91sam9260_default_irq_priority; - - /* Initialize the AIC interrupt controller */ - at91_aic_init(priority); - - /* Enable GPIO interrupts */ - at91_gpio_irq_setup(); -} +struct at91_init_soc __initdata at91sam9260_soc = { + .map_io = at91sam9260_map_io, + .default_irq_priority = at91sam9260_default_irq_priority, + .register_clocks = at91sam9260_register_clocks, + .init = at91sam9260_initialize, +}; diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 89a8414..465e026 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -13,11 +13,11 @@ #include #include +#include #include #include #include -#include #include #include #include @@ -61,9 +61,17 @@ static struct platform_device at91_usbh_device = { void __init at91_add_device_usbh(struct at91_usbh_data *data) { + int i; + if (!data) return; + /* Enable overcurrent notification */ + for (i = 0; i < data->ports; i++) { + if (data->overcurrent_pin[i]) + at91_set_gpio_input(data->overcurrent_pin[i], 1); + } + usbh_data = *data; platform_device_register(&at91_usbh_device); } @@ -76,7 +84,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} * USB Device (Gadget) * -------------------------------------------------------------------- */ -#ifdef CONFIG_USB_GADGET_AT91 +#if defined(CONFIG_USB_AT91) || defined(CONFIG_USB_AT91_MODULE) static struct at91_udc_data udc_data; static struct resource udc_resources[] = { @@ -319,7 +327,7 @@ void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data) if (!data) return; - for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) { + for (i = 0; i < ATMCI_MAX_NR_SLOTS; i++) { if (data->slot[i].bus_width) { /* input/irq */ if (data->slot[i].detect_pin) { @@ -829,8 +837,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {} #if defined(CONFIG_SERIAL_ATMEL) static struct resource dbgu_resources[] = { [0] = { - .start = AT91_VA_BASE_SYS + AT91_DBGU, - .end = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1, + .start = AT91_BASE_SYS + AT91_DBGU, + .end = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1, .flags = IORESOURCE_MEM, }, [1] = { @@ -843,7 +851,6 @@ static struct resource dbgu_resources[] = { static struct atmel_uart_data dbgu_data = { .use_dma_tx = 0, .use_dma_rx = 0, /* DBGU not capable of receive DMA */ - .regs = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU), }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index c148316..658a518 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c @@ -22,36 +22,10 @@ #include #include +#include "soc.h" #include "generic.h" #include "clock.h" -static struct map_desc at91sam9261_io_desc[] __initdata = { - { - .virtual = AT91_VA_BASE_SYS, - .pfn = __phys_to_pfn(AT91_BASE_SYS), - .length = SZ_16K, - .type = MT_DEVICE, - }, -}; - -static struct map_desc at91sam9261_sram_desc[] __initdata = { - { - .virtual = AT91_IO_VIRT_BASE - AT91SAM9261_SRAM_SIZE, - .pfn = __phys_to_pfn(AT91SAM9261_SRAM_BASE), - .length = AT91SAM9261_SRAM_SIZE, - .type = MT_DEVICE, - }, -}; - -static struct map_desc at91sam9g10_sram_desc[] __initdata = { - { - .virtual = AT91_IO_VIRT_BASE - AT91SAM9G10_SRAM_SIZE, - .pfn = __phys_to_pfn(AT91SAM9G10_SRAM_BASE), - .length = AT91SAM9G10_SRAM_SIZE, - .type = MT_DEVICE, - }, -}; - /* -------------------------------------------------------------------- * Clocks * -------------------------------------------------------------------- */ @@ -155,6 +129,20 @@ static struct clk lcdc_clk = { .type = CLK_TYPE_PERIPHERAL, }; +/* HClocks */ +static struct clk hck0 = { + .name = "hck0", + .pmc_mask = AT91_PMC_HCK0, + .type = CLK_TYPE_SYSTEM, + .id = 0, +}; +static struct clk hck1 = { + .name = "hck1", + .pmc_mask = AT91_PMC_HCK1, + .type = CLK_TYPE_SYSTEM, + .id = 1, +}; + static struct clk *periph_clocks[] __initdata = { &pioA_clk, &pioB_clk, @@ -183,10 +171,11 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk), CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk), - CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc1_clk), + CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), + CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0), }; static struct clk_lookup usart_clocks_lookups[] = { @@ -225,20 +214,6 @@ static struct clk pck3 = { .id = 3, }; -/* HClocks */ -static struct clk hck0 = { - .name = "hck0", - .pmc_mask = AT91_PMC_HCK0, - .type = CLK_TYPE_SYSTEM, - .id = 0, -}; -static struct clk hck1 = { - .name = "hck1", - .pmc_mask = AT91_PMC_HCK1, - .type = CLK_TYPE_SYSTEM, - .id = 1, -}; - static void __init at91sam9261_register_clocks(void) { int i; @@ -302,30 +277,21 @@ static void at91sam9261_poweroff(void) * AT91SAM9261 processor initialization * -------------------------------------------------------------------- */ -void __init at91sam9261_map_io(void) +static void __init at91sam9261_map_io(void) { - /* Map peripherals */ - iotable_init(at91sam9261_io_desc, ARRAY_SIZE(at91sam9261_io_desc)); - if (cpu_is_at91sam9g10()) - iotable_init(at91sam9g10_sram_desc, ARRAY_SIZE(at91sam9g10_sram_desc)); + at91_init_sram(0, AT91SAM9G10_SRAM_BASE, AT91SAM9G10_SRAM_SIZE); else - iotable_init(at91sam9261_sram_desc, ARRAY_SIZE(at91sam9261_sram_desc)); + at91_init_sram(0, AT91SAM9261_SRAM_BASE, AT91SAM9261_SRAM_SIZE); } -void __init at91sam9261_initialize(unsigned long main_clock) +static void __init at91sam9261_initialize(void) { at91_arch_reset = at91sam9_alt_reset; pm_power_off = at91sam9261_poweroff; at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1) | (1 << AT91SAM9261_ID_IRQ2); - /* Init clock subsystem */ - at91_clock_init(main_clock); - - /* Register the processor-specific clocks */ - at91sam9261_register_clocks(); - /* Register GPIO subsystem */ at91_gpio_init(at91sam9261_gpio, 3); } @@ -372,14 +338,9 @@ static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = { 0, /* Advanced Interrupt Controller */ }; -void __init at91sam9261_init_interrupts(unsigned int priority[NR_AIC_IRQS]) -{ - if (!priority) - priority = at91sam9261_default_irq_priority; - - /* Initialize the AIC interrupt controller */ - at91_aic_init(priority); - - /* Enable GPIO interrupts */ - at91_gpio_irq_setup(); -} +struct at91_init_soc __initdata at91sam9261_soc = { + .map_io = at91sam9261_map_io, + .default_irq_priority = at91sam9261_default_irq_priority, + .register_clocks = at91sam9261_register_clocks, + .init = at91sam9261_initialize, +}; diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 5d43cf4..d6d1e76 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -21,7 +22,6 @@ #include