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

ARM: s5pv210: don't imply CONFIG_PLAT_SAMSUNG 



The plat-samsung directory and mach-s5pv210 can be build
completely independently, so split the two Kconfig symbols
CONFIG_PLAT_SAMSUNG and CONFIG_ARCH_S5PV210.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarThierry Reding <thierry.reding@gmail.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20200806182059.2431-18-krzk@kernel.org


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

arch/arm/Kconfig.debug

+3 −3
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 || ARCH_EXYNOS

		depends on PLAT_SAMSUNG || ARCH_S5PV210 || 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 || ARCH_EXYNOS

		depends on PLAT_SAMSUNG || ARCH_S5PV210 || 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 || ARCH_EXYNOS

		depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		select DEBUG_S3C24XX_UART if ARCH_S3C24XX

		select DEBUG_S3C64XX_UART if ARCH_S3C64XX

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -234,7 +234,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear 
# by CONFIG_* macro name.

plat-$(CONFIG_ARCH_OMAP)	+= omap

plat-$(CONFIG_ARCH_S3C64XX)	+= samsung

plat-$(CONFIG_ARCH_S5PV210)	+= samsung

plat-$(CONFIG_PLAT_ORION)	+= orion

plat-$(CONFIG_PLAT_PXA)		+= pxa

plat-$(CONFIG_PLAT_S3C24XX)	+= samsung

arch/arm/plat-samsung/Kconfig

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


config PLAT_SAMSUNG

	bool

	depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210

	depends on PLAT_S3C24XX || ARCH_S3C64XX

	default y

	select GENERIC_IRQ_CHIP

	select NO_IOPORT_MAP

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 || ARCH_EXYNOS)

	depends on MMC_SDHCI && (PLAT_SAMSUNG || ARCH_S5PV210 || 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

drivers/pwm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ config PWM_ROCKCHIP 


config PWM_SAMSUNG

	tristate "Samsung PWM support"

	depends on PLAT_SAMSUNG || ARCH_EXYNOS || COMPILE_TEST

	depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST

	help

	  Generic PWM framework driver for Samsung.