Merge branch 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/kernel...

From Kukjin Kim:
This is 4th cleanup for Samsung S3C24XX stuff, and removes plat-s3c24xx
directory.

* 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C24XX: header mach/regs-mem.h local
  ARM: S3C24XX: header mach/regs-power.h local
  ARM: S3C24XX: header mach/regs-s3c2412-mem.h local
  ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/

diff --combined arch/arm/Kconfig
index 17f49ccb8326578b16cc27be726b23d0b6f6ea58,221dda1e2662a62c176851be53240566aecdc3f1..42e263a8d3534710b571ae9d5ab72aa895aeb9c3
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -344,10 -344,10 +344,10 @@@ config ARCH_BCM283
        select ARM_ERRATA_411920
        select ARM_TIMER_SP804
        select CLKDEV_LOOKUP
 +      select CLKSRC_OF
        select COMMON_CLK
        select CPU_V6
        select GENERIC_CLOCKEVENTS
 -      select GENERIC_GPIO
        select MULTI_IRQ_HANDLER
        select PINCTRL
        select PINCTRL_BCM2835
@@@ -371,6 -371,7 +371,6 @@@ config ARCH_CNS3XX
  config ARCH_CLPS711X
        bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
        select ARCH_REQUIRE_GPIOLIB
 -      select ARCH_USES_GETTIMEOFFSET
        select AUTO_ZRELADDR
        select CLKDEV_LOOKUP
        select COMMON_CLK
@@@ -642,9 -643,9 +642,9 @@@ config ARCH_TEGR
        select ARCH_HAS_CPUFREQ
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
 +      select CLKSRC_OF
        select COMMON_CLK
        select GENERIC_CLOCKEVENTS
 -      select GENERIC_GPIO
        select HAVE_CLK
        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0
@@@ -744,6 -745,7 +744,6 @@@ config ARCH_S3C24X
        select ARCH_HAS_CPUFREQ
        select ARCH_USES_GETTIMEOFFSET
        select CLKDEV_LOOKUP
 -      select GENERIC_GPIO
        select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@@ -786,6 -788,7 +786,6 @@@ config ARCH_S5P64X
        select CLKSRC_MMIO
        select CPU_V6
        select GENERIC_CLOCKEVENTS
 -      select GENERIC_GPIO
        select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@@ -800,6 -803,7 +800,6 @@@ config ARCH_S5PC10
        select ARCH_USES_GETTIMEOFFSET
        select CLKDEV_LOOKUP
        select CPU_V7
 -      select GENERIC_GPIO
        select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@@ -817,6 -821,7 +817,6 @@@ config ARCH_S5PV21
        select CLKSRC_MMIO
        select CPU_V7
        select GENERIC_CLOCKEVENTS
 -      select GENERIC_GPIO
        select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@@ -834,6 -839,7 +834,6 @@@ config ARCH_EXYNO
        select CLKDEV_LOOKUP
        select CPU_V7
        select GENERIC_CLOCKEVENTS
 -      select GENERIC_GPIO
        select HAVE_CLK
        select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@@ -868,6 -874,7 +868,6 @@@ config ARCH_U30
        select COMMON_CLK
        select CPU_ARM926T
        select GENERIC_CLOCKEVENTS
 -      select GENERIC_GPIO
        select HAVE_TCM
        select SPARSE_IRQ
        help
@@@ -951,6 -958,7 +951,6 @@@ config ARCH_VT8500_SINGL
        select COMMON_CLK
        select CPU_ARM926T
        select GENERIC_CLOCKEVENTS
 -      select GENERIC_GPIO
        select HAVE_CLK
        select MULTI_IRQ_HANDLER
        select SPARSE_IRQ
@@@ -1079,7 -1087,6 +1079,6 @@@ source "arch/arm/mach-realview/Kconfig
  source "arch/arm/mach-sa1100/Kconfig"
  
  source "arch/arm/plat-samsung/Kconfig"
- source "arch/arm/plat-s3c24xx/Kconfig"
  
  source "arch/arm/mach-socfpga/Kconfig"
  
@@@ -1218,7 -1225,6 +1217,7 @@@ config ARM_ERRATA_43097
  config ARM_ERRATA_458693
        bool "ARM errata: Processor deadlock when a false hazard is created"
        depends on CPU_V7
 +      depends on !ARCH_MULTIPLATFORM
        help
          This option enables the workaround for the 458693 Cortex-A8 (r2p0)
          erratum. For very specific sequences of memory operations, it is
@@@ -1232,7 -1238,6 +1231,7 @@@
  config ARM_ERRATA_460075
        bool "ARM errata: Data written to the L2 cache can be overwritten with stale data"
        depends on CPU_V7
 +      depends on !ARCH_MULTIPLATFORM
        help
          This option enables the workaround for the 460075 Cortex-A8 (r2p0)
          erratum. Any asynchronous access to the L2 cache may encounter a
@@@ -1245,7 -1250,6 +1244,7 @@@
  config ARM_ERRATA_742230
        bool "ARM errata: DMB operation may be faulty"
        depends on CPU_V7 && SMP
 +      depends on !ARCH_MULTIPLATFORM
        help
          This option enables the workaround for the 742230 Cortex-A9
          (r1p0..r2p2) erratum. Under rare circumstances, a DMB instruction
@@@ -1258,7 -1262,6 +1257,7 @@@
  config ARM_ERRATA_742231
        bool "ARM errata: Incorrect hazard handling in the SCU may lead to data corruption"
        depends on CPU_V7 && SMP
 +      depends on !ARCH_MULTIPLATFORM
        help
          This option enables the workaround for the 742231 Cortex-A9
          (r2p0..r2p2) erratum. Under certain conditions, specific to the
@@@ -1309,7 -1312,6 +1308,7 @@@ config PL310_ERRATA_72791
  config ARM_ERRATA_743622
        bool "ARM errata: Faulty hazard checking in the Store Buffer may lead to data corruption"
        depends on CPU_V7
 +      depends on !ARCH_MULTIPLATFORM
        help
          This option enables the workaround for the 743622 Cortex-A9
          (r2p*) erratum. Under very rare conditions, a faulty
@@@ -1323,7 -1325,6 +1322,7 @@@
  config ARM_ERRATA_751472
        bool "ARM errata: Interrupted ICIALLUIS may prevent completion of broadcasted operation"
        depends on CPU_V7
 +      depends on !ARCH_MULTIPLATFORM
        help
          This option enables the workaround for the 751472 Cortex-A9 (prior
          to r3p0) erratum. An interrupted ICIALLUIS operation may prevent the

diff --combined arch/arm/mach-s3c24xx/mach-anubis.c
index 3c4b6e30c7426b169e2808fa6328b75c2b840ccc,3767d518456fd43d31ab20ed90a40162baaeb818..bb595f15ce36c8f2788621462eec2aa010b8f565
--- 1/arch/arm/mach-s3c24xx/mach-anubis.c
--- 2/arch/arm/mach-s3c24xx/mach-anubis.c
+++ b/arch/arm/mach-s3c24xx/mach-anubis.c
@@@ -34,7 -34,6 +34,6 @@@
  
  #include <plat/regs-serial.h>
  #include <mach/regs-gpio.h>
- #include <mach/regs-mem.h>
  #include <mach/regs-lcd.h>
  #include <linux/platform_data/mtd-nand-s3c2410.h>
  #include <linux/platform_data/i2c-s3c2410.h>
@@@ -445,6 -444,6 +444,6 @@@ MACHINE_START(ANUBIS, "Simtec-Anubis"
        .map_io         = anubis_map_io,
        .init_machine   = anubis_init,
        .init_irq       = s3c24xx_init_irq,
 -      .timer          = &s3c24xx_timer,
 +      .init_time      = s3c24xx_timer_init,
        .restart        = s3c244x_restart,
  MACHINE_END

diff --combined arch/arm/mach-s3c24xx/mach-at2440evb.c
index cdcd784e30c522a3768e30d484c1c6ed8fb161c4,2fa05173499dcd73c9d93cd6a43543c108d60075..b4bc60c78ebb89f06bb4af29066b71638b031608
--- 1/arch/arm/mach-s3c24xx/mach-at2440evb.c
--- 2/arch/arm/mach-s3c24xx/mach-at2440evb.c
+++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c
@@@ -35,7 -35,6 +35,6 @@@
  
  #include <plat/regs-serial.h>
  #include <mach/regs-gpio.h>
- #include <mach/regs-mem.h>
  #include <mach/regs-lcd.h>
  #include <linux/platform_data/mtd-nand-s3c2410.h>
  #include <linux/platform_data/i2c-s3c2410.h>
@@@ -211,6 -210,6 +210,6 @@@ MACHINE_START(AT2440EVB, "AT2440EVB"
        .map_io         = at2440evb_map_io,
        .init_machine   = at2440evb_init,
        .init_irq       = s3c24xx_init_irq,
 -      .timer          = &s3c24xx_timer,
 +      .init_time      = s3c24xx_timer_init,
        .restart        = s3c244x_restart,
  MACHINE_END

diff --combined arch/arm/mach-s3c24xx/mach-bast.c
index 5c1e3dfb9ab39f1251d2116e4e4952d998986d8d,00d57f334b71c18f3cb92040dfa929b70e696873..ca661808104171a6ec13683868aa71bc69ecacf8
--- 1/arch/arm/mach-s3c24xx/mach-bast.c
--- 2/arch/arm/mach-s3c24xx/mach-bast.c
+++ b/arch/arm/mach-s3c24xx/mach-bast.c
@@@ -48,7 -48,6 +48,6 @@@
  #include <mach/hardware.h>
  #include <mach/regs-gpio.h>
  #include <mach/regs-lcd.h>
- #include <mach/regs-mem.h>
  
  #include <plat/clock.h>
  #include <plat/cpu.h>
@@@ -606,6 -605,6 +605,6 @@@ MACHINE_START(BAST, "Simtec-BAST"
        .map_io         = bast_map_io,
        .init_irq       = s3c24xx_init_irq,
        .init_machine   = bast_init,
 -      .timer          = &s3c24xx_timer,
 +      .init_time      = s3c24xx_timer_init,
        .restart        = s3c2410_restart,
  MACHINE_END

diff --combined arch/arm/mach-s3c24xx/mach-gta02.c
index b9782ac2237a74840023bad78315c909a147d406,fa9bbe6f344638267580fac83d9f40e651e33cb4..a25e8c5a7b4c9a3fe236af761e08814c97234267
--- 1/arch/arm/mach-s3c24xx/mach-gta02.c
--- 2/arch/arm/mach-s3c24xx/mach-gta02.c
+++ b/arch/arm/mach-s3c24xx/mach-gta02.c
@@@ -75,7 -75,6 +75,6 @@@
  #include <mach/hardware.h>
  #include <mach/regs-gpio.h>
  #include <mach/regs-irq.h>
- #include <mach/regs-mem.h>
  
  #include <plat/cpu.h>
  #include <plat/devs.h>
@@@ -590,6 -589,6 +589,6 @@@ MACHINE_START(NEO1973_GTA02, "GTA02"
        .map_io         = gta02_map_io,
        .init_irq       = s3c24xx_init_irq,
        .init_machine   = gta02_machine_init,
 -      .timer          = &s3c24xx_timer,
 +      .init_time      = s3c24xx_timer_init,
        .restart        = s3c244x_restart,
  MACHINE_END

diff --combined arch/arm/mach-s3c24xx/mach-jive.c
index d7a17255523873dd3f801875185a5c44eb4281cf,ceaaf0b41332932fa1a4549299ede4669fbfdef0..54e83c1f780c569358c820046afccea0f41f62de
--- 1/arch/arm/mach-s3c24xx/mach-jive.c
--- 2/arch/arm/mach-s3c24xx/mach-jive.c
+++ b/arch/arm/mach-s3c24xx/mach-jive.c
@@@ -35,9 -35,7 +35,7 @@@
  #include <linux/platform_data/mtd-nand-s3c2410.h>
  #include <linux/platform_data/i2c-s3c2410.h>
  
- #include <mach/regs-power.h>
  #include <mach/regs-gpio.h>
- #include <mach/regs-mem.h>
  #include <mach/regs-lcd.h>
  #include <mach/fb.h>
  
@@@ -56,6 -54,8 +54,8 @@@
  #include <plat/pm.h>
  #include <linux/platform_data/usb-s3c2410_udc.h>
  
+ #include "s3c2412-power.h"
+ 
  static struct map_desc jive_iodesc[] __initdata = {
  };
  
@@@ -661,6 -661,6 +661,6 @@@ MACHINE_START(JIVE, "JIVE"
        .init_irq       = s3c24xx_init_irq,
        .map_io         = jive_map_io,
        .init_machine   = jive_machine_init,
 -      .timer          = &s3c24xx_timer,
 +      .init_time      = s3c24xx_timer_init,
        .restart        = s3c2412_restart,
  MACHINE_END

diff --combined arch/arm/mach-s3c24xx/mach-mini2440.c
index 2db09ade9b50aef758f34f43d00e92be6e2f9263,64494ff73ad83f4aa7a41bce979965b1b482b61d..2865e5919f2cb8a176a54d9d463afdeda4c8731f
--- 1/arch/arm/mach-s3c24xx/mach-mini2440.c
--- 2/arch/arm/mach-s3c24xx/mach-mini2440.c
+++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
@@@ -40,7 -40,6 +40,6 @@@
  #include <plat/regs-serial.h>
  #include <mach/regs-gpio.h>
  #include <linux/platform_data/leds-s3c24xx.h>
- #include <mach/regs-mem.h>
  #include <mach/regs-lcd.h>
  #include <mach/irqs.h>
  #include <linux/platform_data/mtd-nand-s3c2410.h>
@@@ -688,6 -687,6 +687,6 @@@ MACHINE_START(MINI2440, "MINI2440"
        .map_io         = mini2440_map_io,
        .init_machine   = mini2440_init,
        .init_irq       = s3c24xx_init_irq,
 -      .timer          = &s3c24xx_timer,
 +      .init_time      = s3c24xx_timer_init,
        .restart        = s3c244x_restart,
  MACHINE_END

diff --combined arch/arm/mach-s3c24xx/mach-osiris.c
index 4b57f9aa0a8f3c845b38d0fa8f81e925769847a2,572f1c811adf851a268884a9f60391e2ef61631e..f60f749d709cda07c4668f95575d938dbe1df6f4
--- 1/arch/arm/mach-s3c24xx/mach-osiris.c
--- 2/arch/arm/mach-s3c24xx/mach-osiris.c
+++ b/arch/arm/mach-s3c24xx/mach-osiris.c
@@@ -47,11 -47,11 +47,11 @@@
  
  #include <mach/hardware.h>
  #include <mach/regs-gpio.h>
- #include <mach/regs-mem.h>
  #include <mach/regs-lcd.h>
  
  #include "common.h"
  #include "osiris.h"
+ #include "regs-mem.h"
  
  /* onboard perihperal map */
  
@@@ -425,6 -425,6 +425,6 @@@ MACHINE_START(OSIRIS, "Simtec-OSIRIS"
        .map_io         = osiris_map_io,
        .init_irq       = s3c24xx_init_irq,
        .init_machine   = osiris_init,
 -      .timer          = &s3c24xx_timer,
 +      .init_time      = s3c24xx_timer_init,
        .restart        = s3c244x_restart,
  MACHINE_END