From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 699ADCA9EB7 for ; Wed, 23 Oct 2019 10:57:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 34A34214B2 for ; Wed, 23 Oct 2019 10:57:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571828244; bh=mbTySTDT5cWvrH4ForUJvk4qnFV/+r9OnxYtu8S/N+8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=iyMWwvG6UCrS/Io0Cq9jHsCAR7n/CRBYlHzai8Ui9zIz7exJtBZvkEtA8L9ZX56lS lpMafXHsc3wKvrX4Af3e24QfE6QawiGN2gv/mL3BZGO20PMiCd1AZZ3tyl1G5706wv /QjvJdCUsTc0wPYcT+0BTVvPd3EOIsWh2eVdv+t4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391114AbfJWK5X (ORCPT ); Wed, 23 Oct 2019 06:57:23 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:43921 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390540AbfJWK5W (ORCPT ); Wed, 23 Oct 2019 06:57:22 -0400 Received: by mail-ed1-f68.google.com with SMTP id q24so9419919edr.10; Wed, 23 Oct 2019 03:57:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=AVFd6LJ96F4qd/EigznQJuvz3SMKebF4Tl0OCKWEbU4=; b=QzWyaQ7NqoDAwu3CVR9ad0gwsDFCbX0bqO8rrs6wPJchDSXiyHyIDgpHz5oDIRW1kN jxOIRVSrZK/8e4qwWvE4BFo06pJId/91uJIlPt7HCmR6SNWky5BmJB4Kz4DEB6vKvCaw rCEFWsiPeHEyd+IIeity+8p1Exxo4WPSIZP3l/sZRtSKClLBc1fqIJ4Ll8IGdwzp/ngS oo2PQco+ck9k3ujfjKxF9sRwyNlgvtZNjvVRBzF8gQue0dG4qt2CcYT5aGb0qInL1DBM 6nF/PC+rjf0haW7Yb5jCWXcr7dk2YT4z/SC1xIU1nOsSOjrzojDI7wdUM+pf00CbbVQT ItQA== X-Gm-Message-State: APjAAAX5VPED3PoKSSZeNKt83ug2mwXN9JLQlVVnEN4ZzbNCBgNT44dR lAQ8193bos/6iMLliVK5ZuhJAEGR X-Google-Smtp-Source: APXvYqz2m9c3DsGIx81hfOZRR9q8BRfSarhYDkrVPcLRoup2R/1lZqDrXp+W/zwiqQP1RT4zv9Z6wQ== X-Received: by 2002:a17:906:585a:: with SMTP id h26mr20637220ejs.329.1571828239818; Wed, 23 Oct 2019 03:57:19 -0700 (PDT) Received: from pi3 ([194.230.155.217]) by smtp.googlemail.com with ESMTPSA id m5sm143443ejc.70.2019.10.23.03.57.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 03:57:19 -0700 (PDT) Date: Wed, 23 Oct 2019 12:57:17 +0200 From: Krzysztof Kozlowski To: Arnd Bergmann Cc: Kukjin Kim , Ulf Hansson , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linus.walleij@linaro.org, Olof Johansson , Sascha Hauer , Bartlomiej Zolnierkiewicz , "Enrico Weigelt, metux IT consult" , linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org Subject: Re: [PATCH 08/36] ARM: exynos: stop selecting PLAT_SAMSUNG Message-ID: <20191023105717.GF10630@pi3> References: <20191010202802.1132272-1-arnd@arndb.de> <20191010203043.1241612-1-arnd@arndb.de> <20191010203043.1241612-8-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20191010203043.1241612-8-arnd@arndb.de> User-Agent: Mutt/1.12.1 (2019-06-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 10, 2019 at 10:29:52PM +0200, Arnd Bergmann wrote: > Now that no code in arch/arm is shared between mach-exynos and the > others, make the split formal. > > Signed-off-by: Arnd Bergmann > --- > arch/arm/Kconfig.debug | 8 ++++---- > arch/arm/Makefile | 1 - > arch/arm/mach-exynos/Makefile | 4 ---- > arch/arm/plat-samsung/Kconfig | 4 ++-- > drivers/mmc/host/Kconfig | 2 +- > 5 files changed, 7 insertions(+), 12 deletions(-) > > diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug > index d05b836dfeb2..9c4f2d6deb06 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 > + 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 > @@ -1010,7 +1010,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 > @@ -1022,7 +1022,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 > @@ -1034,7 +1034,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 You need to keep PLAT_SAMSUNG because of additional architectures, so follow pattern from DEBUG_S3C_UART2. Best regards, Krzysztof > select DEBUG_EXYNOS_UART if ARCH_EXYNOS > select DEBUG_S3C64XX_UART if ARCH_S3C64XX > select DEBUG_S5PV210_UART if ARCH_S5PV210 > diff --git a/arch/arm/Makefile b/arch/arm/Makefile > index db857d07114f..f492d7c338fe 100644 > --- a/arch/arm/Makefile > +++ b/arch/arm/Makefile > @@ -233,7 +233,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 > diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile > index 0fd3fcf8bfb0..53fa363c8e44 100644 > --- a/arch/arm/mach-exynos/Makefile > +++ b/arch/arm/mach-exynos/Makefile > @@ -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 > diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig > index 832ab0e6cd72..e31a156a27df 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_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 > diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig > index 49ea02c467bf..400a581c918c 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 > + 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 > -- > 2.20.0 >