| Message ID | 20191010203043.1241612-11-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: samsung platform cleanup | expand |
On Thu, Oct 10, 2019 at 10:29:55PM +0200, Arnd Bergmann wrote: > These can be build completely independently, so split > the two Kconfig symbols. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> I'd mention the two symbols' names you're working on in the commit log. I guess it's about PLAT_SAMSUNG and ARCH_S5PV210. And I wouldn't call it "split" which IMHO suggests there was only one symbol before. Maybe: Don't imply PLAT_SAMSUNG if ARCH_S5PV210 is enabled would be a better subject line? > --- > arch/arm/Kconfig.debug | 6 +++--- > arch/arm/Makefile | 1 - > arch/arm/plat-samsung/Kconfig | 2 +- > drivers/mmc/host/Kconfig | 2 +- > drivers/pwm/Kconfig | 2 +- > drivers/spi/Kconfig | 2 +- > drivers/tty/serial/Kconfig | 2 +- > sound/soc/samsung/Kconfig | 2 +- > 8 files changed, 9 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug > index 9c4f2d6deb06..4c4e97ae4fcb 100644 > --- a/arch/arm/Kconfig.debug > +++ b/arch/arm/Kconfig.debug > @@ -998,7 +998,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 > @@ -1010,7 +1010,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 > @@ -1022,7 +1022,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 > diff --git a/arch/arm/Makefile b/arch/arm/Makefile > index f492d7c338fe..a1bc15cda751 100644 > --- a/arch/arm/Makefile > +++ b/arch/arm/Makefile > @@ -235,7 +235,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 Would it make more sense to make this plat-$(PLAT_SAMSUNG) += samsung (in a separate patch)? Hmm, it seems there is no plat-y for PLAT_S3C24XX=y builds. Is this intended? If yes, the directory name containing "samsung" suggests something that seems untrue. Best regards Uwe
On Thu, 10 Oct 2019 at 22:38, Arnd Bergmann <arnd@arndb.de> wrote: > > These can be build completely independently, so split > the two Kconfig symbols. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/arm/Kconfig.debug | 6 +++--- > arch/arm/Makefile | 1 - > arch/arm/plat-samsung/Kconfig | 2 +- > drivers/mmc/host/Kconfig | 2 +- > drivers/pwm/Kconfig | 2 +- > drivers/spi/Kconfig | 2 +- > drivers/tty/serial/Kconfig | 2 +- > sound/soc/samsung/Kconfig | 2 +- > 8 files changed, 9 insertions(+), 10 deletions(-) For the mmc parts: Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Kind regards Uffe > > diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug > index 9c4f2d6deb06..4c4e97ae4fcb 100644 > --- a/arch/arm/Kconfig.debug > +++ b/arch/arm/Kconfig.debug > @@ -998,7 +998,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 > @@ -1010,7 +1010,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 > @@ -1022,7 +1022,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 > diff --git a/arch/arm/Makefile b/arch/arm/Makefile > index f492d7c338fe..a1bc15cda751 100644 > --- a/arch/arm/Makefile > +++ b/arch/arm/Makefile > @@ -235,7 +235,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 > diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig > index 740bdb23f38a..1530946cc672 100644 > --- a/arch/arm/plat-samsung/Kconfig > +++ b/arch/arm/plat-samsung/Kconfig > @@ -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 > diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig > index 400a581c918c..16a0e5430b44 100644 > --- a/drivers/mmc/host/Kconfig > +++ b/drivers/mmc/host/Kconfig > @@ -275,7 +275,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 > diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig > index e3a2518503ed..8eb738cac0c7 100644 > --- a/drivers/pwm/Kconfig > +++ b/drivers/pwm/Kconfig > @@ -394,7 +394,7 @@ config PWM_ROCKCHIP > > config PWM_SAMSUNG > tristate "Samsung PWM support" > - depends on PLAT_SAMSUNG || ARCH_EXYNOS > + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS > help > Generic PWM framework driver for Samsung. > > diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig > index 6f7fdcbb9151..355391ee643d 100644 > --- a/drivers/spi/Kconfig > +++ b/drivers/spi/Kconfig > @@ -625,7 +625,7 @@ config SPI_S3C24XX_FIQ > > config SPI_S3C64XX > tristate "Samsung S3C64XX series type SPI" > - depends on (PLAT_SAMSUNG || ARCH_EXYNOS || COMPILE_TEST) > + depends on (PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST) > help > SPI driver for Samsung S3C64XX and newer SoCs. > > diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig > index 4789b5d62f63..17f01cf3009c 100644 > --- a/drivers/tty/serial/Kconfig > +++ b/drivers/tty/serial/Kconfig > @@ -237,7 +237,7 @@ config SERIAL_CLPS711X_CONSOLE > > config SERIAL_SAMSUNG > tristate "Samsung SoC serial support" > - depends on PLAT_SAMSUNG || ARCH_EXYNOS > + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS > select SERIAL_CORE > help > Support for the on-chip UARTs on the Samsung S3C24XX series CPUs, > diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig > index 638983123d8f..7a0035dd9995 100644 > --- a/sound/soc/samsung/Kconfig > +++ b/sound/soc/samsung/Kconfig > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0-only > menuconfig SND_SOC_SAMSUNG > tristate "ASoC support for Samsung" > - depends on PLAT_SAMSUNG || ARCH_EXYNOS || COMPILE_TEST > + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST > depends on COMMON_CLK > select SND_SOC_GENERIC_DMAENGINE_PCM > ---help--- > -- > 2.20.0 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Thu, Oct 10, 2019 at 10:29:55PM +0200, Arnd Bergmann wrote: [...] > diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig > index e3a2518503ed..8eb738cac0c7 100644 > --- a/drivers/pwm/Kconfig > +++ b/drivers/pwm/Kconfig > @@ -394,7 +394,7 @@ config PWM_ROCKCHIP > > config PWM_SAMSUNG > tristate "Samsung PWM support" > - depends on PLAT_SAMSUNG || ARCH_EXYNOS > + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS > help > Generic PWM framework driver for Samsung. > Acked-by: Thierry Reding <thierry.reding@gmail.com>
On Fri, Oct 11, 2019 at 7:51 AM Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > > On Thu, Oct 10, 2019 at 10:29:55PM +0200, Arnd Bergmann wrote: > > These can be build completely independently, so split > > the two Kconfig symbols. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > I'd mention the two symbols' names you're working on in the commit log. > I guess it's about PLAT_SAMSUNG and ARCH_S5PV210. And I wouldn't call it > "split" which IMHO suggests there was only one symbol before. > > Maybe: > > Don't imply PLAT_SAMSUNG if ARCH_S5PV210 is enabled > > would be a better subject line? Ok, changed to ARM: s5pv210: don't imply CONFIG_PLAT_SAMSUNG > > @@ -235,7 +235,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 > > Would it make more sense to make this > > plat-$(PLAT_SAMSUNG) += samsung > > (in a separate patch)? Hmm, it seems there is no plat-y for > PLAT_S3C24XX=y builds. Is this intended? If yes, the directory name > containing "samsung" suggests something that seems untrue. By the end of the series, the plat-samsung directory is completely removed (folded into mach-s3c), so that would only add more churn for the same result I think. Arnd
Hello, On Tue, Oct 22, 2019 at 04:01:12PM +0200, Arnd Bergmann wrote: > > > @@ -235,7 +235,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 > > > > Would it make more sense to make this > > > > plat-$(PLAT_SAMSUNG) += samsung > > > > (in a separate patch)? Hmm, it seems there is no plat-y for > > PLAT_S3C24XX=y builds. Is this intended? If yes, the directory name > > containing "samsung" suggests something that seems untrue. > > By the end of the series, the plat-samsung directory is completely > removed (folded into mach-s3c), so that would only add more > churn for the same result I think. fine for me. The background of my question was me wondering if builds for PLAT_S3C24XX=y (before your patch series) don't need plat-samsung. Best regards Uwe
On Tue, Oct 22, 2019 at 5:53 PM Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > The background of my question was me wondering if builds > for PLAT_S3C24XX=y (before your patch series) don't need plat-samsung. What I found is that the DT-based platforms (exynos and s5p) need almost nothing from plat-samsung, while the board files and the s3c24xx/s3c64xx power management needs almost all of it. Arnd
On Thu, Oct 10, 2019 at 10:29:55PM +0200, Arnd Bergmann wrote: > These can be build completely independently, so split > the two Kconfig symbols. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/arm/Kconfig.debug | 6 +++--- > arch/arm/Makefile | 1 - > arch/arm/plat-samsung/Kconfig | 2 +- > drivers/mmc/host/Kconfig | 2 +- > drivers/pwm/Kconfig | 2 +- > drivers/spi/Kconfig | 2 +- > drivers/tty/serial/Kconfig | 2 +- > sound/soc/samsung/Kconfig | 2 +- > 8 files changed, 9 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug > index 9c4f2d6deb06..4c4e97ae4fcb 100644 > --- a/arch/arm/Kconfig.debug > +++ b/arch/arm/Kconfig.debug > @@ -998,7 +998,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 How are you going to select DEBUG_S5PV210_UART now? Best regards, Krzysztof > select DEBUG_EXYNOS_UART if ARCH_EXYNOS > select DEBUG_S3C24XX_UART if ARCH_S3C24XX > select DEBUG_S3C64XX_UART if ARCH_S3C64XX > @@ -1010,7 +1010,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 > @@ -1022,7 +1022,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 > diff --git a/arch/arm/Makefile b/arch/arm/Makefile > index f492d7c338fe..a1bc15cda751 100644 > --- a/arch/arm/Makefile > +++ b/arch/arm/Makefile > @@ -235,7 +235,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 > diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig > index 740bdb23f38a..1530946cc672 100644 > --- a/arch/arm/plat-samsung/Kconfig > +++ b/arch/arm/plat-samsung/Kconfig > @@ -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 > diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig > index 400a581c918c..16a0e5430b44 100644 > --- a/drivers/mmc/host/Kconfig > +++ b/drivers/mmc/host/Kconfig > @@ -275,7 +275,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 > diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig > index e3a2518503ed..8eb738cac0c7 100644 > --- a/drivers/pwm/Kconfig > +++ b/drivers/pwm/Kconfig > @@ -394,7 +394,7 @@ config PWM_ROCKCHIP > > config PWM_SAMSUNG > tristate "Samsung PWM support" > - depends on PLAT_SAMSUNG || ARCH_EXYNOS > + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS > help > Generic PWM framework driver for Samsung. > > diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig > index 6f7fdcbb9151..355391ee643d 100644 > --- a/drivers/spi/Kconfig > +++ b/drivers/spi/Kconfig > @@ -625,7 +625,7 @@ config SPI_S3C24XX_FIQ > > config SPI_S3C64XX > tristate "Samsung S3C64XX series type SPI" > - depends on (PLAT_SAMSUNG || ARCH_EXYNOS || COMPILE_TEST) > + depends on (PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST) > help > SPI driver for Samsung S3C64XX and newer SoCs. > > diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig > index 4789b5d62f63..17f01cf3009c 100644 > --- a/drivers/tty/serial/Kconfig > +++ b/drivers/tty/serial/Kconfig > @@ -237,7 +237,7 @@ config SERIAL_CLPS711X_CONSOLE > > config SERIAL_SAMSUNG > tristate "Samsung SoC serial support" > - depends on PLAT_SAMSUNG || ARCH_EXYNOS > + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS > select SERIAL_CORE > help > Support for the on-chip UARTs on the Samsung S3C24XX series CPUs, > diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig > index 638983123d8f..7a0035dd9995 100644 > --- a/sound/soc/samsung/Kconfig > +++ b/sound/soc/samsung/Kconfig > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0-only > menuconfig SND_SOC_SAMSUNG > tristate "ASoC support for Samsung" > - depends on PLAT_SAMSUNG || ARCH_EXYNOS || COMPILE_TEST > + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST > depends on COMMON_CLK > select SND_SOC_GENERIC_DMAENGINE_PCM > ---help--- > -- > 2.20.0 >
On Wed, Oct 23, 2019 at 2:15 PM Krzysztof Kozlowski <krzk@kernel.org> wrote: > On Thu, Oct 10, 2019 at 10:29:55PM +0200, Arnd Bergmann wrote: > > These can be build completely independently, so split > > the two Kconfig symbols. > > config DEBUG_S3C_UART0 > > - depends on PLAT_SAMSUNG || ARCH_EXYNOS > > + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS > > How are you going to select DEBUG_S5PV210_UART now? I don't see a problem here, the patch should not change the behavior at all. The whole entry now looks like: config DEBUG_S3C_UART0 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 select DEBUG_S5PV210_UART if ARCH_S5PV210 bool "Use Samsung S3C UART 0 for low-level debug" so this will work as before with any of ARCH_EXYNOS, ARCH_S3C24XX, ARCH_S3C64XX and ARCH_S5PV210. What am I missing? Arnd
On Wed, Oct 23, 2019 at 03:17:35PM +0200, Arnd Bergmann wrote: > On Wed, Oct 23, 2019 at 2:15 PM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > On Thu, Oct 10, 2019 at 10:29:55PM +0200, Arnd Bergmann wrote: > > > These can be build completely independently, so split > > > the two Kconfig symbols. > > > config DEBUG_S3C_UART0 > > > - depends on PLAT_SAMSUNG || ARCH_EXYNOS > > > + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS > > > > How are you going to select DEBUG_S5PV210_UART now? > > I don't see a problem here, the patch should not change the behavior at all. > > The whole entry now looks like: > > config DEBUG_S3C_UART0 > 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 > select DEBUG_S5PV210_UART if ARCH_S5PV210 > bool "Use Samsung S3C UART 0 for low-level debug" > > so this will work as before with any of ARCH_EXYNOS, ARCH_S3C24XX, > ARCH_S3C64XX and ARCH_S5PV210. > > What am I missing? Ah, everything is OK, I mixed up removed with added line so it looked reversed (removal of ARCH_S5PV210). Looks good. Best regards, Krzysztof
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 9c4f2d6deb06..4c4e97ae4fcb 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -998,7 +998,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 @@ -1010,7 +1010,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 @@ -1022,7 +1022,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 diff --git a/arch/arm/Makefile b/arch/arm/Makefile index f492d7c338fe..a1bc15cda751 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -235,7 +235,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 diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 740bdb23f38a..1530946cc672 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -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 diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 400a581c918c..16a0e5430b44 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -275,7 +275,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 diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig index e3a2518503ed..8eb738cac0c7 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -394,7 +394,7 @@ config PWM_ROCKCHIP config PWM_SAMSUNG tristate "Samsung PWM support" - depends on PLAT_SAMSUNG || ARCH_EXYNOS + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS help Generic PWM framework driver for Samsung. diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 6f7fdcbb9151..355391ee643d 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -625,7 +625,7 @@ config SPI_S3C24XX_FIQ config SPI_S3C64XX tristate "Samsung S3C64XX series type SPI" - depends on (PLAT_SAMSUNG || ARCH_EXYNOS || COMPILE_TEST) + depends on (PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST) help SPI driver for Samsung S3C64XX and newer SoCs. diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 4789b5d62f63..17f01cf3009c 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -237,7 +237,7 @@ config SERIAL_CLPS711X_CONSOLE config SERIAL_SAMSUNG tristate "Samsung SoC serial support" - depends on PLAT_SAMSUNG || ARCH_EXYNOS + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS select SERIAL_CORE help Support for the on-chip UARTs on the Samsung S3C24XX series CPUs, diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 638983123d8f..7a0035dd9995 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only menuconfig SND_SOC_SAMSUNG tristate "ASoC support for Samsung" - depends on PLAT_SAMSUNG || ARCH_EXYNOS || COMPILE_TEST + depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST depends on COMMON_CLK select SND_SOC_GENERIC_DMAENGINE_PCM ---help---
These can be build completely independently, so split the two Kconfig symbols. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/Kconfig.debug | 6 +++--- arch/arm/Makefile | 1 - arch/arm/plat-samsung/Kconfig | 2 +- drivers/mmc/host/Kconfig | 2 +- drivers/pwm/Kconfig | 2 +- drivers/spi/Kconfig | 2 +- drivers/tty/serial/Kconfig | 2 +- sound/soc/samsung/Kconfig | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-)