Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db6d842b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 's5p-cleanup-v2' of... 

Merge tag 's5p-cleanup-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

Merge "Samsung cleanup 2nd version for S5P SoCs for 3.17" from Kukjin Kim:

Cleanup S5P SoCs for 3.17
- removing s5p64x0 SoCs and s5pc100 SoC in mainline because
  no more user and if it is required next time, it will be
  supported with DT.

* tag 's5p-cleanup-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  video: fbdev: s3c-fb: remove s5pc100 related fimd and fb codes
  mtd: onenand: remove s5pc100 related onenand codes
  spi: s3c64xx: remove s5pc100 related spi codes
  gpio: samsung: remov s5pc100 related gpio codes
  ARM: S5PC100: no more support S5PC100 SoC
  video: fbdev: s3c-fb: remove s5p64x0 related fimd codes
  spi: s3c64xx: remove s5p64x0 related spi codes
  gpio: samsung: remove s5p64x0 related gpio codes
  ARM: S5P64X0: no more support S5P6440 and S5P6450 SoCs

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c3df5133 f86e0add

Documentation/arm/Samsung/Overview.txt

+0 −11
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ Introduction 


  - S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list

  - S3C64XX: S3C6400 and S3C6410

  - S5P6440

  - S5PC100

  - S5PC110 / S5PV210
@@ -34,8 +32,6 @@ Configuration 
  A number of configurations are supplied, as there is no current way of

  unifying all the SoCs into one kernel.



  s5p6440_defconfig - S5P6440 specific default configuration

  s5pc100_defconfig - S5PC100 specific default configuration

  s5pc110_defconfig - S5PC110 specific default configuration

  s5pv210_defconfig - S5PV210 specific default configuration
@@ -67,13 +63,6 @@ Layout changes 
  where to simplify the include and dependency issues involved with having

  so many different platform directories.



  It was decided to remove plat-s5pc1xx as some of the support was already

  in plat-s5p or plat-samsung, with the S5PC110 support added with S5PV210

  the only user was the S5PC100. The S5PC100 specific items where moved to

  arch/arm/mach-s5pc100.









Port Contributors

-----------------

Documentation/arm/Samsung/clksrc-change-registers.awk

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ BEGIN { 


    while (getline line < ARGV[1] > 0) {

	if (line ~ /\#define.*_MASK/ &&

	    !(line ~ /S5PC100_EPLL_MASK/) &&

	    !(line ~ /USB_SIG_MASK/)) {

	    splitdefine(line, fields)

	    name = fields[0]

Documentation/devicetree/bindings/spi/spi-samsung.txt

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ Required SoC Specific Properties: 
- compatible: should be one of the following.

    - samsung,s3c2443-spi: for s3c2443, s3c2416 and s3c2450 platforms

    - samsung,s3c6410-spi: for s3c6410 platforms

    - samsung,s5p6440-spi: for s5p6440 and s5p6450 platforms

    - samsung,s5pv210-spi: for s5pv210 and s5pc110 platforms

    - samsung,exynos4210-spi: for exynos4 and exynos5 platforms

Documentation/devicetree/bindings/video/samsung-fimd.txt

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ Required properties: 
- compatible: value should be one of the following

		"samsung,s3c2443-fimd"; /* for S3C24XX SoCs */

		"samsung,s3c6400-fimd"; /* for S3C64XX SoCs */

		"samsung,s5p6440-fimd"; /* for S5P64X0 SoCs */

		"samsung,s5pc100-fimd"; /* for S5PC100 SoC  */

		"samsung,s5pv210-fimd"; /* for S5PV210 SoC */

		"samsung,exynos4210-fimd"; /* for Exynos4 SoCs */

		"samsung,exynos5250-fimd"; /* for Exynos5 SoCs */

arch/arm/Kconfig

+1 −42
Original line number Diff line number Diff line
@@ -757,42 +757,6 @@ config ARCH_S3C64XX 
	help

	  Samsung S3C64XX series based systems



config ARCH_S5P64X0

	bool "Samsung S5P6440 S5P6450"

	select ATAGS

	select CLKDEV_LOOKUP

	select CLKSRC_SAMSUNG_PWM

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS

	select NEED_MACH_GPIO_H

	select SAMSUNG_ATAGS

	select SAMSUNG_WDT_RESET

	help

	  Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,

	  SMDK6450.



config ARCH_S5PC100

	bool "Samsung S5PC100"

	select ARCH_REQUIRE_GPIOLIB

	select ATAGS

	select CLKDEV_LOOKUP

	select CLKSRC_SAMSUNG_PWM

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS

	select NEED_MACH_GPIO_H

	select SAMSUNG_ATAGS

	select SAMSUNG_WDT_RESET

	help

	  Samsung S5PC100 series based systems



config ARCH_S5PV210

	bool "Samsung S5PV210/S5PC110"

	select ARCH_HAS_HOLES_MEMORYMODEL
@@ -1003,10 +967,6 @@ source "arch/arm/mach-s3c24xx/Kconfig" 


source "arch/arm/mach-s3c64xx/Kconfig"



source "arch/arm/mach-s5p64x0/Kconfig"



source "arch/arm/mach-s5pc100/Kconfig"



source "arch/arm/mach-s5pv210/Kconfig"



source "arch/arm/mach-exynos/Kconfig"
@@ -1568,7 +1528,7 @@ source kernel/Kconfig.preempt 


config HZ_FIXED

	int

	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \

	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || \

		ARCH_S5PV210 || ARCH_EXYNOS4

	default AT91_TIMER_HZ if ARCH_AT91

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY
@@ -2193,7 +2153,6 @@ menu "Power management options" 
source "kernel/power/Kconfig"



config ARCH_SUSPEND_POSSIBLE

	depends on !ARCH_S5PC100

	depends on CPU_ARM920T || CPU_ARM926T || CPU_FEROCEON || CPU_SA1100 || \

		CPU_V6 || CPU_V6K || CPU_V7 || CPU_V7M || CPU_XSC3 || CPU_XSCALE || CPU_MOHAWK

	def_bool y