Commit cb6c0301 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Krzysztof Kozlowski
Browse files

ARM: exynos: stop selecting PLAT_SAMSUNG 



Now that no code in arch/arm is shared between mach-exynos and the
others, make the split formal.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20200806182059.2431-15-krzk@kernel.org


Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent edaff7e1

arch/arm/Kconfig.debug

+4 −4
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ choice 
		  via SCIFA4 on Renesas SH-Mobile AG5 (SH73A0).



	config DEBUG_S3C_UART0

		depends on PLAT_SAMSUNG

		depends on PLAT_SAMSUNG || ARCH_EXYNOS

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		select DEBUG_S3C24XX_UART if ARCH_S3C24XX

		select DEBUG_S3C64XX_UART if ARCH_S3C64XX
@@ -1017,7 +1017,7 @@ choice 
		  by the boot-loader before use.



	config DEBUG_S3C_UART1

		depends on PLAT_SAMSUNG

		depends on PLAT_SAMSUNG || ARCH_EXYNOS

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		select DEBUG_S3C24XX_UART if ARCH_S3C24XX

		select DEBUG_S3C64XX_UART if ARCH_S3C64XX
@@ -1029,7 +1029,7 @@ choice 
		  by the boot-loader before use.



	config DEBUG_S3C_UART2

		depends on PLAT_SAMSUNG

		depends on PLAT_SAMSUNG || ARCH_EXYNOS

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		select DEBUG_S3C24XX_UART if ARCH_S3C24XX

		select DEBUG_S3C64XX_UART if ARCH_S3C64XX
@@ -1041,7 +1041,7 @@ choice 
		  by the boot-loader before use.



	config DEBUG_S3C_UART3

		depends on PLAT_SAMSUNG && (ARCH_EXYNOS || ARCH_S5PV210)

		depends on ARCH_EXYNOS || ARCH_S5PV210

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		select DEBUG_S3C64XX_UART if ARCH_S3C64XX

		select DEBUG_S5PV210_UART if ARCH_S5PV210

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear 


# 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_ARCH_S5PV210)	+= samsung

arch/arm/mach-exynos/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -3,10 +3,6 @@ 
# Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.

#		http://www.samsung.com/



ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include



# Core



obj-$(CONFIG_ARCH_EXYNOS)	+= exynos.o exynos-smc.o firmware.o



obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm.o sleep.o

arch/arm/plat-samsung/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


config PLAT_SAMSUNG

	bool

	depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_EXYNOS || ARCH_S5PV210

	depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210

	default y

	select GENERIC_IRQ_CHIP

	select NO_IOPORT_MAP
@@ -240,7 +240,7 @@ config SAMSUNG_PM_DEBUG 
	bool "Samsung PM Suspend debug"

	depends on PM && DEBUG_KERNEL

	depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210

	depends on DEBUG_EXYNOS_UART || DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART

	depends on DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART

	help

	  Say Y here if you want verbose debugging from the PM Suspend and

	  Resume code. See <file:Documentation/arm/samsung-s3c24xx/suspend.rst>

drivers/mmc/host/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ config MMC_SDHCI_TEGRA 


config MMC_SDHCI_S3C

	tristate "SDHCI support on Samsung S3C SoC"

	depends on MMC_SDHCI && PLAT_SAMSUNG

	depends on MMC_SDHCI && (PLAT_SAMSUNG || ARCH_EXYNOS)

	help

	  This selects the Secure Digital Host Controller Interface (SDHCI)

	  often referrered to as the HSMMC block in some of the Samsung S3C