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

Pull "ARM: global cleanups" from Arnd Bergmann:
 "Quite a bit of code gets removed, and some stuff moved around, mostly
  the old samsung s3c24xx stuff.  There should be no functional changes
  in this series otherwise.  Some cleanups have dependencies on other
  arm-soc branches and will be sent in the second round.

  Signed-off-by: Arnd Bergmann <arnd@arndb.de>"
Fixed up trivial conflicts mainly due to #include's being changes on
both sides.

* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (121 commits)
  ep93xx: Remove unnecessary includes of ep93xx-regs.h
  ep93xx: Move EP93XX_SYSCON defines to SoC private header
  ep93xx: Move crunch code to mach-ep93xx directory
  ep93xx: Make syscon access functions private to SoC
  ep93xx: Configure GPIO ports in core code
  ep93xx: Move peripheral defines to local SoC header
  ep93xx: Convert the watchdog driver into a platform device.
  ep93xx: Use ioremap for backlight driver
  ep93xx: Move GPIO defines to gpio-ep93xx.h
  ep93xx: Don't use system controller defines in audio drivers
  ep93xx: Move PHYS_BASE defines to local SoC header file
  ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver
  ARM: EXYNOS: add clock registers for exynos4x12-cpufreq
  PM / devfreq: update the name of EXYNOS clock registers that were omitted
  PM / devfreq: update the name of EXYNOS clock register
  ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock
  ARM: EXYNOS: use static declaration on regarding clock
  ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs
  ARM: OMAP2+: Fix build error after merge
  ARM: S3C24XX: remove call to s3c24xx_setup_clocks
  ...

diff --cc Documentation/feature-removal-schedule.txt
index 4bfd982f8080f31458d5e06cba3ac3e1f3e7486b,1bea46a54b1ca252b5390c422f291dafe41a7c32..0cad4803ffacd2c021f33407f21e9ead735c9bac
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -510,36 -510,3 +510,22 @@@ Why:     The pci_scan_bus_parented() interf
        convert to using pci_scan_root_bus() so they can supply a list of
        bus resources when the bus is created.
  Who:  Bjorn Helgaas <bhelgaas@google.com>
- What: The CAP9 SoC family will be removed
- When: 3.4
- Files:        arch/arm/mach-at91/at91cap9.c
-       arch/arm/mach-at91/at91cap9_devices.c
-       arch/arm/mach-at91/include/mach/at91cap9.h
-       arch/arm/mach-at91/include/mach/at91cap9_matrix.h
-       arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h
-       arch/arm/mach-at91/board-cap9adk.c
- Why:  The code is not actively maintained and platforms are now hard to find.
- Who:  Nicolas Ferre <nicolas.ferre@atmel.com>
-       Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- 
- ----------------------------
- 
 +
 +----------------------------
 +
 +What: Low Performance USB Block driver ("CONFIG_BLK_DEV_UB")
 +When: 3.6
 +Why:  This driver provides support for USB storage devices like "USB
 +      sticks". As of now, it is deactivated in Debian, Fedora and
 +        Ubuntu. All current users can switch over to usb-storage
 +        (CONFIG_USB_STORAGE) which only drawback is the additional SCSI
 +        stack.
 +Who:  Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
 +
 +----------------------------
 +
 +What: kmap_atomic(page, km_type)
 +When: 3.5
 +Why:  The old kmap_atomic() with two arguments is deprecated, we only
 +      keep it for backward compatibility for few cycles and then drop it.
 +Who:  Cong Wang <amwang@redhat.com>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-exynos/Makefile
Simple merge

diff --cc arch/arm/mach-exynos/common.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-origen.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-universal_c210.c
Simple merge

diff --cc arch/arm/mach-omap1/board-ams-delta.c
index e0e8245f3c9fd9c8510b772c4ddf44f0de752b2f,ac65d7d7c7a1c4aad18f8a7de1c3e4347357e627..83eac744ddb9658fbc8e777a296ef1fd1af39cab
--- 1/arch/arm/mach-omap1/board-ams-delta.c
--- 2/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@@ -20,7 -20,7 +20,8 @@@
  #include <linux/platform_device.h>
  #include <linux/serial_8250.h>
  #include <linux/export.h>
 +#include <linux/omapfb.h>
+ #include <linux/io.h>
  
  #include <media/soc_camera.h>
  

diff --cc arch/arm/mach-omap1/board-fsample.c
index 7afaf3c5bdc6f8bb0b99afc8609b1892015e9620,079292cca58463d4a55aea327a40737895842d52..80bd43c7f4ec9563b3599f84ca9f51d614170cb8
--- 1/arch/arm/mach-omap1/board-fsample.c
--- 2/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@@ -21,9 -21,7 +21,8 @@@
  #include <linux/mtd/physmap.h>
  #include <linux/input.h>
  #include <linux/smc91x.h>
 +#include <linux/omapfb.h>
  
- #include <mach/hardware.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>

diff --cc arch/arm/mach-omap1/board-h2.c
index af2be8c12c072ab5fd69948183b4b88814f2c960,03e0050a89612d2d4975b39b7e48016c159f0319..c3068622fdcbe8f06377a6f38984af5c39e77656
--- 1/arch/arm/mach-omap1/board-h2.c
--- 2/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@@ -30,10 -30,7 +30,8 @@@
  #include <linux/input.h>
  #include <linux/i2c/tps65010.h>
  #include <linux/smc91x.h>
 +#include <linux/omapfb.h>
  
- #include <mach/hardware.h>
- 
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>

diff --cc arch/arm/mach-omap1/board-h3.c
Simple merge

diff --cc arch/arm/mach-omap1/board-htcherald.c
Simple merge

diff --cc arch/arm/mach-omap1/board-innovator.c
index 1d5ab6606b9f28c89830e0de61172e3df45a8e7e,74de3e39a10de3ab6b3fab1ca028abb2cb01e175..61219182d16a5def3427d5b65c7812a36f8ba044
--- 1/arch/arm/mach-omap1/board-innovator.c
--- 2/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@@ -25,9 -25,7 +25,8 @@@
  #include <linux/mtd/physmap.h>
  #include <linux/input.h>
  #include <linux/smc91x.h>
 +#include <linux/omapfb.h>
  
- #include <mach/hardware.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>

diff --cc arch/arm/mach-omap1/board-nokia770.c
index 9b6332a31fb6e3769a861ef5fe1295e375705a47,abdbdb08644ffc694092e9ca7924a3033f12c2ac..fe95ec5f6f03f3597511be1a54c8cf8b90d464c8
--- 1/arch/arm/mach-omap1/board-nokia770.c
--- 2/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@@ -30,7 -29,7 +29,6 @@@
  #include <plat/usb.h>
  #include <plat/board.h>
  #include <plat/keypad.h>
- #include "common.h"
 -#include <plat/hwa742.h>
  #include <plat/lcd_mipid.h>
  #include <plat/mmc.h>
  #include <plat/clock.h>

diff --cc arch/arm/mach-omap1/board-osk.c
index ef874655fbd3bd835068aa7324aa36d957ebe1fd,e2d7ae4418f2b25f782a3b2d06d5d5b73797d728..1fe347396f4d05a4b694f0e9476445c81a908417
--- 1/arch/arm/mach-omap1/board-osk.c
--- 2/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@@ -34,8 -34,6 +34,7 @@@
  #include <linux/i2c.h>
  #include <linux/leds.h>
  #include <linux/smc91x.h>
- 
 +#include <linux/omapfb.h>
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
  #include <linux/mtd/physmap.h>

diff --cc arch/arm/mach-omap1/board-palmte.c
index 612342cb2a2d2598a41e2a8be4e787e7b9ae16c2,04efa7e611497ca00d1213955ef76194389586b4..0863d8e2bdf147ed70467bb8a7fb5748e5b6c701
--- 1/arch/arm/mach-omap1/board-palmte.c
--- 2/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@@ -27,9 -27,7 +27,8 @@@
  #include <linux/spi/spi.h>
  #include <linux/interrupt.h>
  #include <linux/apm-emulation.h>
 +#include <linux/omapfb.h>
  
- #include <mach/hardware.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>

diff --cc arch/arm/mach-omap1/board-palmtt.c
index b63350bc88fd2c6f90f062597804a033ab083cdb,acd1f3645ba027d0ca8e0ba8d5c87a0ed98d828b..4ff699c509c0ebbce98a5c600e067e3a50ecc54b
--- 1/arch/arm/mach-omap1/board-palmtt.c
--- 2/arch/arm/mach-omap1/board-palmtt.c
+++ b/arch/arm/mach-omap1/board-palmtt.c
@@@ -24,9 -24,9 +24,10 @@@
  #include <linux/mtd/partitions.h>
  #include <linux/mtd/physmap.h>
  #include <linux/leds.h>
 +#include <linux/omapfb.h>
+ #include <linux/spi/spi.h>
+ #include <linux/spi/ads7846.h>
  
- #include <mach/hardware.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>

diff --cc arch/arm/mach-omap1/board-palmz71.c
index 9924c70af09f1c13fe3ab8a37e663af7b288264a,c1cd0f2d6866d309b31ff6f804835b9b95d7f1dd..abcbbd339aeb1df2baed04bbc34e8df47ed05cc8
--- 1/arch/arm/mach-omap1/board-palmz71.c
--- 2/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@@ -27,9 -27,9 +27,10 @@@
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
  #include <linux/mtd/physmap.h>
 +#include <linux/omapfb.h>
+ #include <linux/spi/spi.h>
+ #include <linux/spi/ads7846.h>
  
- #include <mach/hardware.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>

diff --cc arch/arm/mach-omap1/board-perseus2.c
index 8e0153447c6d3aabc3df97049e14405899023980,83f5b765c5b69a187d47b103fb209886d9ed2865..76d4ee05a814783c9b12ecfb47bcfe9e5d43dc05
--- 1/arch/arm/mach-omap1/board-perseus2.c
--- 2/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@@ -21,9 -21,7 +21,8 @@@
  #include <linux/mtd/physmap.h>
  #include <linux/input.h>
  #include <linux/smc91x.h>
 +#include <linux/omapfb.h>
  
- #include <mach/hardware.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>

diff --cc arch/arm/mach-omap1/board-sx1.c
index 0c76e12337d92a780bd6ee7d600f867c9bd2dbb1,fed4435f5d43f02acf4d8bf455d7ede0d770017c..f34cb74a9f41d12cbe3983dcd121fa11f4ccb5cd
--- 1/arch/arm/mach-omap1/board-sx1.c
--- 2/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@@ -27,9 -27,7 +27,8 @@@
  #include <linux/i2c.h>
  #include <linux/errno.h>
  #include <linux/export.h>
 +#include <linux/omapfb.h>
  
- #include <mach/hardware.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>

diff --cc arch/arm/mach-omap1/devices.c
index 187b2fe132e98c08d0fd822532e8d7dfb2ac99c1,d06c7140392c194909a82f202113ebe19f6e374e..dcd8ddbec2bbc92b7577bc6f143d4085e3ec426f
--- 1/arch/arm/mach-omap1/devices.c
--- 2/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@@ -28,7 -24,12 +24,11 @@@
  #include <plat/mux.h>
  #include <plat/mmc.h>
  #include <plat/omap7xx.h>
 -#include <plat/mcbsp.h>
  
+ #include <mach/camera.h>
+ #include <mach/hardware.h>
+ 
+ #include "common.h"
  #include "clock.h"
  
  /*-------------------------------------------------------------------------*/

diff --cc arch/arm/mach-omap1/io.c
Simple merge

diff --cc arch/arm/mach-omap1/lcd_dma.c
Simple merge

diff --cc arch/arm/mach-omap1/mcbsp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-n8x0.c
Simple merge

diff --cc arch/arm/mach-omap2/board-zoom-display.c
Simple merge

diff --cc arch/arm/mach-omap2/common-board-devices.c
Simple merge

diff --cc arch/arm/mach-omap2/control.h
Simple merge

diff --cc arch/arm/mach-omap2/devices.c
index 881dab64ef6afa0f4475b9a35224526cf6a7ff9e,71e7df8c413a29de2969a727697a51b13655d311..e4336035c0ea85f94ce4e9d4e6b1cd0752e1f5e4
--- 1/arch/arm/mach-omap2/devices.c
--- 2/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -25,8 -24,9 +25,8 @@@
  #include <asm/mach/map.h>
  #include <asm/pmu.h>
  
- #include <plat/tc.h>
+ #include "iomap.h"
  #include <plat/board.h>
 -#include <plat/mcbsp.h>
  #include <plat/mmc.h>
  #include <plat/dma.h>
  #include <plat/omap_hwmod.h>

diff --cc arch/arm/mach-omap2/io.c
index 2d19efbbc52d9f868fd74007105941abd8a9bf49,0b73d3153604fbfa862b93b2fadca9a92865004a..cd47a71297b988db44ccf3be60f1aa78ae91c8bd
--- 1/arch/arm/mach-omap2/io.c
--- 2/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@@ -21,9 -21,9 +21,8 @@@
  #include <linux/init.h>
  #include <linux/io.h>
  #include <linux/clk.h>
 -#include <linux/omapfb.h>
  
  #include <asm/tlb.h>
- 
  #include <asm/mach/map.h>
  
  #include <plat/sram.h>

diff --cc arch/arm/mach-omap2/omap-mpuss-lowpower.c
Simple merge

diff --cc arch/arm/mach-omap2/pm.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/simtec-pm.c
Simple merge

diff --cc arch/arm/mach-tegra/Kconfig
Simple merge

diff --cc arch/arm/mach-tegra/usb_phy.c
Simple merge

diff --cc arch/arm/plat-omap/dma.c
Simple merge

diff --cc arch/arm/plat-omap/dmtimer.c
Simple merge

diff --cc arch/arm/plat-omap/sram.c
Simple merge

diff --cc drivers/devfreq/exynos4_bus.c
Simple merge

diff --cc drivers/input/touchscreen/Kconfig
index 97b31a0e0525446ab1dd6fd6a6f777fff8c991af,b3061684252edabc9c04ff4c5d666fc59eca1be0..2a2141915aa04939a4a1f9f9f96b0ef9a58072b6
--- 1/drivers/input/touchscreen/Kconfig
--- 2/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@@ -243,24 -213,9 +243,24 @@@ config TOUCHSCREEN_FUJITS
          To compile this driver as a module, choose M here: the
          module will be called fujitsu-ts.
  
 +config TOUCHSCREEN_ILI210X
 +      tristate "Ilitek ILI210X based touchscreen"
 +      depends on I2C
 +      help
 +        Say Y here if you have a ILI210X based touchscreen
 +        controller. This driver supports models ILI2102,
 +        ILI2102s, ILI2103, ILI2103s and ILI2105.
 +        Such kind of chipsets can be found in Amazon Kindle Fire
 +        touchscreens.
 +
 +        If unsure, say N.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called ili210x.
 +
  config TOUCHSCREEN_S3C2410
        tristate "Samsung S3C2410/generic touchscreen input driver"
-       depends on ARCH_S3C2410 || SAMSUNG_DEV_TS
+       depends on ARCH_S3C24XX || SAMSUNG_DEV_TS
        select S3C_ADC
        help
          Say Y here if you have the s3c2410 touchscreen.

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc drivers/mtd/nand/Kconfig
Simple merge

diff --cc drivers/rtc/Kconfig
Simple merge

diff --cc drivers/rtc/rtc-sa1100.c
Simple merge

diff --cc drivers/spi/Kconfig
index 0b06e360628a98f0e5e77c8ee163aa3cdf45bc38,ac92194f894eb9f2e7746b03921e7c4a52d02b99..3ed748355b98f629619bdb5ff9e0eae4dbf2bf32
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@ -285,15 -279,9 +285,15 @@@ config SPI_PXA2X
  config SPI_PXA2XX_PCI
        def_bool SPI_PXA2XX && X86_32 && PCI
  
 +config SPI_RSPI
 +      tristate "Renesas RSPI controller"
 +      depends on SUPERH
 +      help
 +        SPI driver for Renesas RSPI blocks.
 +
  config SPI_S3C24XX
        tristate "Samsung S3C24XX series SPI"
-       depends on ARCH_S3C2410 && EXPERIMENTAL
+       depends on ARCH_S3C24XX && EXPERIMENTAL
        select SPI_BITBANG
        help
          SPI driver for Samsung S3C24XX series ARM SoCs

diff --cc drivers/usb/Kconfig
Simple merge

diff --cc drivers/usb/gadget/Kconfig
Simple merge

diff --cc drivers/usb/host/ohci-hcd.c
Simple merge

diff --cc drivers/video/Kconfig
Simple merge

diff --cc drivers/video/omap2/dss/dispc.c
Simple merge

diff --cc drivers/video/omap2/dss/dss.c
Simple merge

diff --cc drivers/watchdog/Kconfig
Simple merge