From patchwork Tue Apr 19 16:38:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 563375 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp3466687map; Tue, 19 Apr 2022 10:30:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwkbDJt/Kiq5nbgbBpo00cicYHTK7si5LW95jCeTpHFkiOUYRop2/LICBj+AIvAOP1ZWOt X-Received: by 2002:a63:c1b:0:b0:39d:93f7:4b7b with SMTP id b27-20020a630c1b000000b0039d93f74b7bmr15597293pgl.595.1650389430568; Tue, 19 Apr 2022 10:30:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650389430; cv=none; d=google.com; s=arc-20160816; b=QxSzPMCoyfWDYvlH7icL+WJqOnlURSWv3Ehte7q9sb+TNw6sMlR+qXuO+GMyjdOz5U MvElw/dlZnMwMfRMLTGSPNUAU85A5tXCi233dbnzwTDqFWJs2AyxhT2BRe/5EJVnG3uc n016602/JX5J3KTAOHcF9G81/9xlTtqblw7Qv6BI3ThNbVNumfsv0GdDnLvi8FouMGLc W+ZE0UvCRVRK+NponJ7SlvdoJjHeioGve9/0vIHCnqKlAvUYsQmF+xCIbypzMruIQ3nh LVj/utMoEVbz7M/Y8JPaimFW6MznD3ywnUOIghggWzPcgTxU65O+0bC4YLwZB7aUc0z7 ingQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature:dkim-signature; bh=nlF/AthQLgewjEzAgDnMr02AWaCeYe0D3ch0tvGS0fg=; b=HbflK/qudMy1jcng3GogPVNvO3tEaTuW09IxaenV0RiQYMmX1W//LSpMnegmxFcYGK eUZWuVt5TKJOdYl6r4aWJR5/xUVTr4INBZRsoGlafYPSFX41IpXFdnQHzl2a25M9pTAm ExTwrS3uE2ZLvyt0v2dx5NvZeAdJM5xxlPB7rPlTU0RczylWoii8dNBRhc8vmYrOHBKp z2dhRbOtRpS22ZnId0OxcIaqWvJsdyiGOiguSqgWCoSf6ogCVnv3ihS/0qEjmocsm9Hj qkw10TYOuMW1/FeeYtdhsCkV47jpt4tJKgFlQ/h5GDTAwrs3jEO4EtYEjM1pJrGQd3BM 8mQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=bombadil.20210309 header.b=kUfqxPZy; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=k20201202 header.b="EB/6DhNF"; spf=pass (google.com: best guess record for domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom="linux-mtd-bounces+patch=linaro.org@lists.infradead.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id d13-20020a056a0024cd00b00505ad872920si13739173pfv.289.2022.04.19.10.30.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Apr 2022 10:30:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=bombadil.20210309 header.b=kUfqxPZy; dkim=neutral (body hash did not verify) header.i=@kernel.org header.s=k20201202 header.b="EB/6DhNF"; spf=pass (google.com: best guess record for domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom="linux-mtd-bounces+patch=linaro.org@lists.infradead.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nlF/AthQLgewjEzAgDnMr02AWaCeYe0D3ch0tvGS0fg=; b=kUfqxPZyAUPh1u 6Ny2EHzm+Ci3E1vunNrhJtVmXMT1kOrnuqbN3zUVn5yuxznvVEGt0KQMumV9eHAlodCT26PJUu8Jj 0R6hmnU87LlYvSarAodwvMPOrg9jnqcWutlrlyqDJRDMk2LwWZ8nTyqUd2MA15cfTqfKFoy71rH+s gSX2Fn6yWB+UQ9hXFNGzZwJswPjIYgwZ5QGUf+iK8/5gIHkBeHK348u73r/YfL/CSToj9+1tcsI0u +I5UwHRu+FrKZgDW6RQVxkk2pDr1fbhRhWnUfrNPwnCzpRDmJLo22Km8qSykZfID5+YrjVeBjDYE3 yoVAWeKu5dVwzh+4GGOw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ngrfh-005Jpf-9g; Tue, 19 Apr 2022 17:29:49 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ngqxz-004yry-6M; Tue, 19 Apr 2022 16:44:43 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 919BFB81BEF; Tue, 19 Apr 2022 16:44:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98879C385B2; Tue, 19 Apr 2022 16:44:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650386675; bh=E21UhST9fsmcKihylxjEyCuP25oDJbc3hkCHxxEC7Wk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EB/6DhNFIygUIJNqebbXaCuU1Caq5c1sBLelCq0shsuEm3FRNZV2B59x6I2trbDEc mGp4dOD9Ygy0j8x6aPCdDEEtBsFVyQmwX6Z6ETiwL8f+P+6YAU8qYTWV4eD8Y1tRSO YeNzajYLagp6ruLgMBiU+soJeU4jvRsJU8tDlT8ym5RNBHHt5mLJ6idSKE8ueFa7Fq gHunt4HKHZZrSSLT70Pil89w5mgdiwlO4CenyC2gybqFS5NJ/dJWeID+kklVKdk6Y5 Ntms9VwIzEHT/wAhZPE58MouPij2FW+YnFEqM77U/IG+gpakryHwwwc9+78N5VekkF 55njOa7JMJYOw== From: Arnd Bergmann To: robert.jarzmik@free.fr, linux-arm-kernel@lists.infradead.org Cc: Arnd Bergmann , Daniel Mack , Haojian Zhuang , Marek Vasut , Philipp Zabel , Lubomir Rintel , Paul Parsons , Tomas Cech , Sergey Lapin , Thomas Bogendoerfer , Michael Turquette , Stephen Boyd , "Rafael J. Wysocki" , Viresh Kumar , Dmitry Torokhov , Ulf Hansson , Dominik Brodowski , Helge Deller , Mark Brown , Linus Walleij , linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-ide@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, linux-input@vger.kernel.org, patches@opensource.cirrus.com, linux-leds@vger.kernel.org, linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org, linux-rtc@vger.kernel.org, linux-usb@vger.kernel.org, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, alsa-devel@alsa-project.org Subject: [PATCH 44/48] ARM: pxa: move plat-pxa to drivers/soc/ Date: Tue, 19 Apr 2022 18:38:06 +0200 Message-Id: <20220419163810.2118169-45-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20220419163810.2118169-1-arnd@kernel.org> References: <20220419163810.2118169-1-arnd@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220419_094439_663742_8DADC686 X-CRM114-Status: GOOD ( 20.69 ) X-Spam-Score: -5.4 (-----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Arnd Bergmann There are two drivers in arch/arm/plat-pxa: mfp and ssp. Both of them should ideally not be needed at all, as there are proper subsystems to replace them. OTOH, they are self-contained and can simply be normal SoC drivers, so move them over there to eliminate one more of the plat-* directories. Content analysis details: (-5.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [2604:1380:4601:e00:0:0:0:1 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+patch=linaro.org@lists.infradead.org From: Arnd Bergmann There are two drivers in arch/arm/plat-pxa: mfp and ssp. Both of them should ideally not be needed at all, as there are proper subsystems to replace them. OTOH, they are self-contained and can simply be normal SoC drivers, so move them over there to eliminate one more of the plat-* directories. Acked-by: Robert Jarzmik (mach-pxa) Acked-by: Lubomir Rintel (mach-mmp) Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 4 ---- arch/arm/Makefile | 1 - arch/arm/mach-mmp/mfp.h | 2 +- arch/arm/mach-pxa/include/mach/mfp.h | 2 +- arch/arm/mach-pxa/mfp-pxa2xx.h | 2 +- arch/arm/mach-pxa/mfp-pxa3xx.h | 2 +- drivers/soc/Kconfig | 1 + drivers/soc/Makefile | 1 + {arch/arm/plat-pxa => drivers/soc/pxa}/Kconfig | 5 ++--- {arch/arm/plat-pxa => drivers/soc/pxa}/Makefile | 4 ---- {arch/arm/plat-pxa => drivers/soc/pxa}/mfp.c | 2 +- {arch/arm/plat-pxa => drivers/soc/pxa}/ssp.c | 0 .../plat-pxa/include/plat => include/linux/soc/pxa}/mfp.h | 6 ++---- 13 files changed, 11 insertions(+), 21 deletions(-) rename {arch/arm/plat-pxa => drivers/soc/pxa}/Kconfig (83%) rename {arch/arm/plat-pxa => drivers/soc/pxa}/Makefile (51%) rename {arch/arm/plat-pxa => drivers/soc/pxa}/mfp.c (99%) rename {arch/arm/plat-pxa => drivers/soc/pxa}/ssp.c (100%) rename {arch/arm/plat-pxa/include/plat => include/linux/soc/pxa}/mfp.h (98%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2e8091e2d8a8..eef8cbf20045 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -667,7 +667,6 @@ source "arch/arm/mach-orion5x/Kconfig" source "arch/arm/mach-oxnas/Kconfig" source "arch/arm/mach-pxa/Kconfig" -source "arch/arm/plat-pxa/Kconfig" source "arch/arm/mach-qcom/Kconfig" @@ -753,9 +752,6 @@ config PLAT_ORION_LEGACY bool select PLAT_ORION -config PLAT_PXA - bool - config PLAT_VERSATILE bool diff --git a/arch/arm/Makefile b/arch/arm/Makefile index a2391b8de5a5..206a900fc87c 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -230,7 +230,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear # by CONFIG_* macro name. plat-$(CONFIG_ARCH_OMAP) += omap plat-$(CONFIG_PLAT_ORION) += orion -plat-$(CONFIG_PLAT_PXA) += pxa plat-$(CONFIG_PLAT_VERSATILE) += versatile # The byte offset of the kernel image in RAM from the start of RAM. diff --git a/arch/arm/mach-mmp/mfp.h b/arch/arm/mach-mmp/mfp.h index 75a4acb33b1b..6f3057987756 100644 --- a/arch/arm/mach-mmp/mfp.h +++ b/arch/arm/mach-mmp/mfp.h @@ -2,7 +2,7 @@ #ifndef __ASM_MACH_MFP_H #define __ASM_MACH_MFP_H -#include +#include /* * NOTE: the MFPR register bit definitions on PXA168 processor lines are a diff --git a/arch/arm/mach-pxa/include/mach/mfp.h b/arch/arm/mach-pxa/include/mach/mfp.h index dbb961fb570e..7e0879bd4102 100644 --- a/arch/arm/mach-pxa/include/mach/mfp.h +++ b/arch/arm/mach-pxa/include/mach/mfp.h @@ -13,6 +13,6 @@ #ifndef __ASM_ARCH_MFP_H #define __ASM_ARCH_MFP_H -#include +#include #endif /* __ASM_ARCH_MFP_H */ diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.h b/arch/arm/mach-pxa/mfp-pxa2xx.h index 980145e7ee99..683a3ea5f154 100644 --- a/arch/arm/mach-pxa/mfp-pxa2xx.h +++ b/arch/arm/mach-pxa/mfp-pxa2xx.h @@ -2,7 +2,7 @@ #ifndef __ASM_ARCH_MFP_PXA2XX_H #define __ASM_ARCH_MFP_PXA2XX_H -#include +#include /* * the following MFP_xxx bit definitions in mfp.h are re-used for pxa2xx: diff --git a/arch/arm/mach-pxa/mfp-pxa3xx.h b/arch/arm/mach-pxa/mfp-pxa3xx.h index cdd830926d1c..81fec4fa5a0f 100644 --- a/arch/arm/mach-pxa/mfp-pxa3xx.h +++ b/arch/arm/mach-pxa/mfp-pxa3xx.h @@ -2,7 +2,7 @@ #ifndef __ASM_ARCH_MFP_PXA3XX_H #define __ASM_ARCH_MFP_PXA3XX_H -#include +#include #define MFPR_BASE (0x40e10000) diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig index c5aae42673d3..86ccf5970bc1 100644 --- a/drivers/soc/Kconfig +++ b/drivers/soc/Kconfig @@ -14,6 +14,7 @@ source "drivers/soc/ixp4xx/Kconfig" source "drivers/soc/litex/Kconfig" source "drivers/soc/mediatek/Kconfig" source "drivers/soc/microchip/Kconfig" +source "drivers/soc/pxa/Kconfig" source "drivers/soc/qcom/Kconfig" source "drivers/soc/renesas/Kconfig" source "drivers/soc/rockchip/Kconfig" diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index 904eec2a7871..fd7717d597fc 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -19,6 +19,7 @@ obj-$(CONFIG_SOC_XWAY) += lantiq/ obj-$(CONFIG_LITEX_SOC_CONTROLLER) += litex/ obj-y += mediatek/ obj-y += microchip/ +obj-y += pxa/ obj-y += amlogic/ obj-y += qcom/ obj-y += renesas/ diff --git a/arch/arm/plat-pxa/Kconfig b/drivers/soc/pxa/Kconfig similarity index 83% rename from arch/arm/plat-pxa/Kconfig rename to drivers/soc/pxa/Kconfig index 6f7a0a39c2b9..c5c265aa4f07 100644 --- a/arch/arm/plat-pxa/Kconfig +++ b/drivers/soc/pxa/Kconfig @@ -1,9 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-only -if PLAT_PXA +config PLAT_PXA + bool config PXA_SSP tristate help Enable support for PXA2xx SSP ports - -endif diff --git a/arch/arm/plat-pxa/Makefile b/drivers/soc/pxa/Makefile similarity index 51% rename from arch/arm/plat-pxa/Makefile rename to drivers/soc/pxa/Makefile index 349ea0af8450..413deceddbdd 100644 --- a/arch/arm/plat-pxa/Makefile +++ b/drivers/soc/pxa/Makefile @@ -1,8 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -# -# Makefile for code common across different PXA processor families -# -ccflags-$(CONFIG_ARCH_MMP) := -I$(srctree)/$(src)/include obj-$(CONFIG_PXA3xx) += mfp.o obj-$(CONFIG_ARCH_MMP) += mfp.o diff --git a/arch/arm/plat-pxa/mfp.c b/drivers/soc/pxa/mfp.c similarity index 99% rename from arch/arm/plat-pxa/mfp.c rename to drivers/soc/pxa/mfp.c index 17fc4f33f35b..6220ba321cfc 100644 --- a/arch/arm/plat-pxa/mfp.c +++ b/drivers/soc/pxa/mfp.c @@ -15,7 +15,7 @@ #include #include -#include +#include #define MFPR_SIZE (PAGE_SIZE) diff --git a/arch/arm/plat-pxa/ssp.c b/drivers/soc/pxa/ssp.c similarity index 100% rename from arch/arm/plat-pxa/ssp.c rename to drivers/soc/pxa/ssp.c diff --git a/arch/arm/plat-pxa/include/plat/mfp.h b/include/linux/soc/pxa/mfp.h similarity index 98% rename from arch/arm/plat-pxa/include/plat/mfp.h rename to include/linux/soc/pxa/mfp.h index 3accaa9ee781..39779cbed0c0 100644 --- a/arch/arm/plat-pxa/include/plat/mfp.h +++ b/include/linux/soc/pxa/mfp.h @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * arch/arm/plat-pxa/include/plat/mfp.h - * * Common Multi-Function Pin Definitions * * Copyright (C) 2007 Marvell International Ltd. @@ -453,8 +451,8 @@ struct mfp_addr_map { #define MFP_ADDR_END { MFP_PIN_INVALID, 0 } -void __init mfp_init_base(void __iomem *mfpr_base); -void __init mfp_init_addr(struct mfp_addr_map *map); +void mfp_init_base(void __iomem *mfpr_base); +void mfp_init_addr(struct mfp_addr_map *map); /* * mfp_{read, write}() - for direct read/write access to the MFPR register