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.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,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 8C597CA9EB6 for ; Wed, 23 Oct 2019 10:57:43 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 566AD214B2 for ; Wed, 23 Oct 2019 10:57:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CwZKfBBp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 566AD214B2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=E7a6bNk5Is1ycaagvMF2kTqrROpRohiHQ99jaPmOuWU=; b=CwZKfBBpgJw2Sw JPMhTRir80qTfjENgglMyqdfbH1vcFjxMevu8/dyW2ZqbM68wbE4Mqli6fywWA7gAhHQYxFGgkSWJ Y1bdmXHSm/i5H81eSTxApjMn9cxbVXoVrzjOIP+WOxYigBBcPz/W4hhKXODNatpIU1ZWjgTpjTGnF 025fMoKGDTM16pWJtTXSqwl8WC7ccmQ7uKulLaVXUqZKjPF0VeggY1NV5N1ETiBvGnV+/fcQL7khw 7QPj5TGxfLelpgwmceJKKni6o/BDvBGapVqBj3OzpyMvcB4+vsrjodMOLTjbD5tPQF61ioHnaD4JP 0ns+Qxn9o9kyxXk/ocIw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNEKg-0005S7-V6; Wed, 23 Oct 2019 10:57:39 +0000 Received: from mail-ed1-f66.google.com ([209.85.208.66]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iNEKP-0005FW-Gu for linux-arm-kernel@lists.infradead.org; Wed, 23 Oct 2019 10:57:23 +0000 Received: by mail-ed1-f66.google.com with SMTP id r16so15376613edq.11 for ; Wed, 23 Oct 2019 03:57:21 -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=m9MccS59kxsc3R3iQMNJUoXXvrp9mvu6wXL+8qSVSVen8XSRnJ3nK7HUiV4u7xtbNL rH4Vy4NM0jDJEFw2h56f2j3K6gHEJXhsAYrCRmkOuZM0Q40AkW8Qi47yoZiXHuFs8q69 NUYFcvtJjDYknsdQK7U8zFdguzBX9S0qEq8iddC8dSALMVGRSUJffrwmlbaElQVIs2hs pkrm7cuBrZ0UC4ZYj5pAVuGxuMirxrnYALOM0KdD9h1kggBok96TfeyPa8jgC4mZtg7h zOB69GGLdvuJuj8p34qj2xgX3mch18WBzRUljB8YTD7wlUteU8srcVF4ZcHJBqqlvBZj kHCg== X-Gm-Message-State: APjAAAUXXAxgQ5rw7Mohm8GrC2xQ4PRSsivv2Gxr/i59g/T2cWp9NOmw 8gFRQF5JxBK4upLyUFviF+0= 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 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-Disposition: inline In-Reply-To: <20191010203043.1241612-8-arnd@arndb.de> User-Agent: Mutt/1.12.1 (2019-06-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191023_035721_562683_923399BE X-CRM114-Status: GOOD ( 17.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ulf Hansson , linux-samsung-soc@vger.kernel.org, Bartlomiej Zolnierkiewicz , linus.walleij@linaro.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Kukjin Kim , Olof Johansson , "Enrico Weigelt, metux IT consult" , Sascha Hauer , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.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 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel