Commit ff8fa4e2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'remove-nondt-exynos-3' of... 

Merge tag 'remove-nondt-exynos-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc

From Kukjin Kim:

cleanup and removing dead code for only support DT for exynos
- remove board file for exynos
- remove legacy files which are not used anymore
- decouple ARCH_EXYNOS from PLAT_S5P

* tag 'remove-nondt-exynos-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

: (35 commits)
  ARM: EXYNOS: Remove remaining dead code after non-DT support removal
  ARM: EXYNOS: Remove legacy L2X0 initialization
  ARM: EXYNOS: Use exynos_init_io() as map_io callback
  ARM: EXYNOS: Remove custom init_irq callbacks
  ARM: EXYNOS: Remove mach/regs-usb-phy.h header
  thermal: exynos: Support both EXYNOS4X12 SoCs
  ARM: EXYNOS: Remove unused base addresses from mach/map.h header
  ARM: EXYNOS: Remove mach/irqs.h header
  ARM: EXYNOS: Select SPARSE_IRQ for Exynos
  ARM: SAMSUNG: Make legacy MFC support code depend on SAMSUNG_ATAGS
  ARM: EXYNOS: Remove mach/regs-gpio.h header
  ARM: EXYNOS: Remove mach/gpio.h
  ARM: EXYNOS: Remove setup-i2c0.c
  ARM: EXYNOS: Do not select legacy Kconfig symbols any more
  ARM: SAMSUNG: Include most of mach/ headers conditionally
  ARM: EXYNOS: Decouple ARCH_EXYNOS from PLAT_S5P
  USB: Check for ARCH_EXYNOS separately
  platform: Check for ARCH_EXYNOS separately
  ARM: SAMSUNG: Compile legacy IRQ and GPIO PM code only with ATAGS support
  ARM: EXYNOS: Provide compatibility stubs for PM code in pm-core.h header
  ...

Conflicts:
	arch/arm/mach-exynos/Kconfig

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 402bf90d 564d06b1

arch/arm/Kconfig

+14 −1
Original line number Diff line number Diff line
@@ -697,6 +697,7 @@ config ARCH_S3C24XX 
	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -704,6 +705,7 @@ config ARCH_S3C24XX 
	select MULTI_IRQ_HANDLER

	select NEED_MACH_GPIO_H

	select NEED_MACH_IO_H

	select SAMSUNG_ATAGS

	help

	  Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443

	  and S3C2450 SoCs based systems, such as the Simtec Electronics BAST
@@ -719,6 +721,7 @@ config ARCH_S3C64XX 
	select CLKSRC_MMIO

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -728,6 +731,7 @@ config ARCH_S3C64XX 
	select PLAT_SAMSUNG

	select S3C_DEV_NAND

	select S3C_GPIO_TRACK

	select SAMSUNG_ATAGS

	select SAMSUNG_CLKSRC

	select SAMSUNG_GPIOLIB_4BIT

	select SAMSUNG_IRQ_VIC_TIMER
@@ -741,11 +745,13 @@ config ARCH_S5P64X0 
	select CLKSRC_MMIO

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK

	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

	help

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

	  SMDK6450.
@@ -757,11 +763,13 @@ config ARCH_S5PC100 
	select CLKSRC_MMIO

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK

	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

	help

	  Samsung S5PC100 series based systems
@@ -774,12 +782,14 @@ config ARCH_S5PV210 
	select CLKSRC_MMIO

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK

	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 NEED_MACH_MEMORY_H

	select SAMSUNG_ATAGS

	help

	  Samsung S5PV210/S5PC110 series based systems
@@ -787,7 +797,9 @@ config ARCH_EXYNOS 
	bool "Samsung EXYNOS"

	select ARCH_HAS_CPUFREQ

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_SPARSEMEM_ENABLE

	select ARM_GIC

	select CLKDEV_LOOKUP

	select COMMON_CLK

	select CPU_V7
@@ -796,8 +808,9 @@ config ARCH_EXYNOS 
	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 NEED_MACH_MEMORY_H

	select SPARSE_IRQ

	select USE_OF

	help

	  Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5)

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ machine-$(CONFIG_ARCH_KEYSTONE) += keystone 


# Platform directory name.  This list is sorted alphanumerically

# by CONFIG_* macro name.

plat-$(CONFIG_ARCH_EXYNOS)	+= samsung

plat-$(CONFIG_ARCH_OMAP)	+= omap

plat-$(CONFIG_ARCH_S3C64XX)	+= samsung

plat-$(CONFIG_PLAT_IOP)		+= iop

arch/arm/mach-exynos/Kconfig

+2 −338
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ menu "SAMSUNG EXYNOS SoCs Support" 
config ARCH_EXYNOS4

	bool "SAMSUNG EXYNOS4"

	default y

	select GIC_NON_BANKED

	select HAVE_ARM_SCU if SMP

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0
@@ -89,329 +90,11 @@ config SOC_EXYNOS5440 
	help

	  Enable EXYNOS5440 SoC support



config EXYNOS_ATAGS

	bool "ATAGS based boot for EXYNOS (deprecated)"

	depends on !ARCH_MULTIPLATFORM

	depends on ATAGS

	default y

	help

	  The EXYNOS platform is moving towards being completely probed

	  through device tree. This enables support for board files using

	  the traditional ATAGS boot format.

	  Note that this option is not available for multiplatform builds.



if EXYNOS_ATAGS



config EXYNOS_DEV_DMA

	bool

	help

	  Compile in amba device definitions for DMA controller



config EXYNOS4_DEV_AHCI

	bool

	help

	  Compile in platform device definitions for AHCI



config EXYNOS4_SETUP_FIMD0

	bool

	help

	  Common setup code for FIMD0.



config EXYNOS4_DEV_USB_OHCI

	bool

	help

	  Compile in platform device definition for USB OHCI



config EXYNOS4_SETUP_I2C1

	bool

	help

	  Common setup code for i2c bus 1.



config EXYNOS4_SETUP_I2C2

	bool

	help

	  Common setup code for i2c bus 2.



config EXYNOS4_SETUP_I2C3

	bool

	help

	  Common setup code for i2c bus 3.



config EXYNOS4_SETUP_I2C4

	bool

	help

	  Common setup code for i2c bus 4.



config EXYNOS4_SETUP_I2C5

	bool

	help

	  Common setup code for i2c bus 5.



config EXYNOS4_SETUP_I2C6

	bool

	help

	  Common setup code for i2c bus 6.



config EXYNOS4_SETUP_I2C7

	bool

	help

	  Common setup code for i2c bus 7.



config EXYNOS4_SETUP_KEYPAD

	bool

	help

	  Common setup code for keypad.



config EXYNOS4_SETUP_SDHCI

	bool

	select EXYNOS4_SETUP_SDHCI_GPIO

	help

	  Internal helper functions for EXYNOS4 based SDHCI systems.



config EXYNOS4_SETUP_SDHCI_GPIO

	bool

	help

	  Common setup code for SDHCI gpio.



config EXYNOS4_SETUP_FIMC

	bool

	help

	  Common setup code for the camera interfaces.



config EXYNOS4_SETUP_USB_PHY

	bool

	help

	  Common setup code for USB PHY controller



config EXYNOS_SETUP_SPI

	bool

	help

	  Common setup code for SPI GPIO configurations.



# machine support



if ARCH_EXYNOS4



comment "EXYNOS4210 Boards"



config MACH_SMDKC210

	bool "SMDKC210"

	select MACH_SMDKV310

	help

	  Machine support for Samsung SMDKC210



config MACH_SMDKV310

	bool "SMDKV310"

	select CPU_EXYNOS4210

	select EXYNOS4_DEV_AHCI

	select EXYNOS4_DEV_USB_OHCI

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_KEYPAD

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_SYSMMU

	select S3C24XX_PWM

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select S3C_DEV_I2C1

	select S3C_DEV_RTC

	select S3C_DEV_USB_HSOTG

	select S3C_DEV_WDT

	select S5P_DEV_FIMC0

	select S5P_DEV_FIMC1

	select S5P_DEV_FIMC2

	select S5P_DEV_FIMC3

	select S5P_DEV_FIMD0

	select S5P_DEV_G2D

	select S5P_DEV_I2C_HDMIPHY

	select S5P_DEV_JPEG

	select S5P_DEV_MFC

	select S5P_DEV_TV

	select S5P_DEV_USB_EHCI

	select SAMSUNG_DEV_BACKLIGHT

	select SAMSUNG_DEV_KEYPAD

	select SAMSUNG_DEV_PWM

	help

	  Machine support for Samsung SMDKV310



config MACH_ARMLEX4210

	bool "ARMLEX4210"

	select CPU_EXYNOS4210

	select EXYNOS4_DEV_AHCI

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS_DEV_DMA

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select S3C_DEV_RTC

	select S3C_DEV_WDT

	help

	  Machine support for Samsung ARMLEX4210 based on EXYNOS4210



config MACH_UNIVERSAL_C210

	bool "Mobile UNIVERSAL_C210 Board"

	select CLKSRC_MMIO

	select CLKSRC_SAMSUNG_PWM

	select CPU_EXYNOS4210

	select EXYNOS4_SETUP_FIMC

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_I2C3

	select EXYNOS4_SETUP_I2C5

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_SYSMMU

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select S3C_DEV_I2C1

	select S3C_DEV_I2C3

	select S3C_DEV_I2C5

	select S3C_DEV_USB_HSOTG

	select S5P_DEV_CSIS0

	select S5P_DEV_FIMC0

	select S5P_DEV_FIMC1

	select S5P_DEV_FIMC2

	select S5P_DEV_FIMC3

	select S5P_DEV_FIMD0

	select S5P_DEV_G2D

	select S5P_DEV_I2C_HDMIPHY

	select S5P_DEV_JPEG

	select S5P_DEV_MFC

	select S5P_DEV_ONENAND

	select S5P_DEV_TV

	select S5P_GPIO_INT

	select S5P_SETUP_MIPIPHY

	help

	  Machine support for Samsung Mobile Universal S5PC210 Reference

	  Board.



config MACH_NURI

	bool "Mobile NURI Board"

	select CPU_EXYNOS4210

	select EXYNOS4_SETUP_FIMC

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_I2C3

	select EXYNOS4_SETUP_I2C5

	select EXYNOS4_SETUP_I2C6

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select EXYNOS_DEV_DMA

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select S3C_DEV_I2C1

	select S3C_DEV_I2C3

	select S3C_DEV_I2C5

	select S3C_DEV_I2C6

	select S3C_DEV_RTC

	select S3C_DEV_USB_HSOTG

	select S3C_DEV_WDT

	select S5P_DEV_CSIS0

	select S5P_DEV_FIMC0

	select S5P_DEV_FIMC1

	select S5P_DEV_FIMC2

	select S5P_DEV_FIMC3

	select S5P_DEV_FIMD0

	select S5P_DEV_G2D

	select S5P_DEV_JPEG

	select S5P_DEV_MFC

	select S5P_DEV_USB_EHCI

	select S5P_GPIO_INT

	select S5P_SETUP_MIPIPHY

	select SAMSUNG_DEV_ADC

	select SAMSUNG_DEV_PWM

	help

	  Machine support for Samsung Mobile NURI Board.



config MACH_ORIGEN

	bool "ORIGEN"

	select CPU_EXYNOS4210

	select EXYNOS4_DEV_USB_OHCI

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_SYSMMU

	select S3C24XX_PWM

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC2

	select S3C_DEV_RTC

	select S3C_DEV_USB_HSOTG

	select S3C_DEV_WDT

	select S5P_DEV_FIMC0

	select S5P_DEV_FIMC1

	select S5P_DEV_FIMC2

	select S5P_DEV_FIMC3

	select S5P_DEV_FIMD0

	select S5P_DEV_G2D

	select S5P_DEV_I2C_HDMIPHY

	select S5P_DEV_JPEG

	select S5P_DEV_MFC

	select S5P_DEV_TV

	select S5P_DEV_USB_EHCI

	select SAMSUNG_DEV_BACKLIGHT

	select SAMSUNG_DEV_PWM

	help

	  Machine support for ORIGEN based on Samsung EXYNOS4210



comment "EXYNOS4212 Boards"



config MACH_SMDK4212

	bool "SMDK4212"

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_I2C3

	select EXYNOS4_SETUP_I2C7

	select EXYNOS4_SETUP_KEYPAD

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select EXYNOS_DEV_DMA

	select EXYNOS_DEV_SYSMMU

	select S3C24XX_PWM

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select S3C_DEV_I2C1

	select S3C_DEV_I2C3

	select S3C_DEV_I2C7

	select S3C_DEV_RTC

	select S3C_DEV_USB_HSOTG

	select S3C_DEV_WDT

	select S5P_DEV_FIMC0

	select S5P_DEV_FIMC1

	select S5P_DEV_FIMC2

	select S5P_DEV_FIMC3

	select S5P_DEV_FIMD0

	select S5P_DEV_MFC

	select SAMSUNG_DEV_BACKLIGHT

	select SAMSUNG_DEV_KEYPAD

	select SAMSUNG_DEV_PWM

	select SOC_EXYNOS4212

	help

	  Machine support for Samsung SMDK4212



comment "EXYNOS4412 Boards"



config MACH_SMDK4412

	bool "SMDK4412"

	select MACH_SMDK4212

	select SOC_EXYNOS4412

	help

	  Machine support for Samsung SMDK4412

endif



endif



comment "Flattened Device Tree based board for EXYNOS SoCs"



config MACH_EXYNOS4_DT

	bool "Samsung Exynos4 Machine using device tree"

	default y

	depends on ARCH_EXYNOS4

	select ARM_AMBA

	select CLKSRC_OF
@@ -419,7 +102,6 @@ config MACH_EXYNOS4_DT 
	select CPU_EXYNOS4210

	select KEYBOARD_SAMSUNG if INPUT_KEYBOARD

	select S5P_DEV_MFC

	select USE_OF

	help

	  Machine support for Samsung Exynos4 machine with device tree enabled.

	  Select this if a fdt blob is available for the Exynos4 SoC based board.
@@ -433,28 +115,10 @@ config MACH_EXYNOS5_DT 
	select ARM_AMBA

	select CLKSRC_OF

	select USB_ARCH_HAS_XHCI

	select USE_OF

	help

	  Machine support for Samsung EXYNOS5 machine with device tree enabled.

	  Select this if a fdt blob is available for the EXYNOS5 SoC based board.



if ARCH_EXYNOS4



comment "Configuration for HSMMC 8-bit bus width"



config EXYNOS4_SDHCI_CH0_8BIT

	bool "Channel 0 with 8-bit bus"

	help

	  Support HSMMC Channel 0 8-bit bus.

	  If selected, Channel 1 is disabled.



config EXYNOS4_SDHCI_CH2_8BIT

	bool "Channel 2 with 8-bit bus"

	help

	  Support HSMMC Channel 2 8-bit bus.

	  If selected, Channel 3 is disabled.

endif



endmenu



endif

arch/arm/mach-exynos/Makefile

+0 −33
Original line number Diff line number Diff line
@@ -32,38 +32,5 @@ AFLAGS_exynos-smc.o :=-Wa,-march=armv7-a$(plus_sec) 


# machine support



obj-$(CONFIG_MACH_SMDKC210)		+= mach-smdkv310.o

obj-$(CONFIG_MACH_SMDKV310)		+= mach-smdkv310.o

obj-$(CONFIG_MACH_ARMLEX4210)		+= mach-armlex4210.o

obj-$(CONFIG_MACH_UNIVERSAL_C210)	+= mach-universal_c210.o

obj-$(CONFIG_MACH_NURI)			+= mach-nuri.o

obj-$(CONFIG_MACH_ORIGEN)		+= mach-origen.o



obj-$(CONFIG_MACH_SMDK4212)		+= mach-smdk4x12.o

obj-$(CONFIG_MACH_SMDK4412)		+= mach-smdk4x12.o



obj-$(CONFIG_MACH_EXYNOS4_DT)		+= mach-exynos4-dt.o

obj-$(CONFIG_MACH_EXYNOS5_DT)		+= mach-exynos5-dt.o
 


# device support



obj-y					+= dev-uart.o

obj-$(CONFIG_ARCH_EXYNOS4)		+= dev-audio.o

obj-$(CONFIG_EXYNOS4_DEV_AHCI)		+= dev-ahci.o

obj-$(CONFIG_EXYNOS_DEV_DMA)		+= dma.o

obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)	+= dev-ohci.o



obj-$(CONFIG_ARCH_EXYNOS)		+= setup-i2c0.o

obj-$(CONFIG_EXYNOS4_SETUP_FIMC)	+= setup-fimc.o

obj-$(CONFIG_EXYNOS4_SETUP_FIMD0)	+= setup-fimd0.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C1)	+= setup-i2c1.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C2)	+= setup-i2c2.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C3)	+= setup-i2c3.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C4)	+= setup-i2c4.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C5)	+= setup-i2c5.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C6)	+= setup-i2c6.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C7)	+= setup-i2c7.o

obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD)	+= setup-keypad.o

obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o

obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY)	+= setup-usb-phy.o

obj-$(CONFIG_EXYNOS_SETUP_SPI)		+= setup-spi.o

arch/arm/mach-exynos/common.c

+9 −538

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE