From patchwork Fri Oct 18 15:42:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 176862 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1031040ill; Fri, 18 Oct 2019 08:43:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqzp13k2+6z0S7loVIwW2NoY6wjQkgFIMACAjBHrdqec9E/tJwDQrvjGu/BBi4zaWYbNaAr5 X-Received: by 2002:a17:906:a986:: with SMTP id jr6mr9212875ejb.158.1571413407341; Fri, 18 Oct 2019 08:43:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571413407; cv=none; d=google.com; s=arc-20160816; b=f6cao4y1htPrm7nasqkzuXCONgcm9OZjCzua6GBRqqYayVXlVynCqKffZRJpjqGyFM ZsJ4t+aGOyUw4AY8g7gKD0xdX4eY0sqYArrGEzpQXwTdRC7jIrmnncFH49Z60OPmbX6P LNqulsvU15cTQDUqLUrPz48Cq+XuZqhMjvtutk040sRQiH+junKTCp13KoPl71kaQKVm Foe7qrs3eaVDdnJ48IZvdZQDs7EMHtVrZY1whHNDXoNcyqH6zpiZM7MzgIKS31RiRbMj +1jqNUr3X+5LOM4tzSf4yg59cr63qPqdJsikzz2PyqTUnCQpTcoO5bvRMvnFyjd+dTc/ 4uLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=EQGVIb/RvpQ/c2kf4YkjtFE7dwPd9+4QmxanzMIJwaM=; b=z2RYuqioiFGhW6qHp02R/AwGDBYkFjCLmflPCtbRkNBou8Zjajz5XqHb4J2GrsKAhQ n87XmbkG9A2ihZmy4z9I3IKCW6elloEYlWM6V5fkjkt41f7wgbmtFBVSdLwEbSdcOTwm 6TuEYainMWgQ95kUuHn09IGvJ5uby61q0KB+hUT6b6dn4crjHDbKWx2aOnjCNgnsp84Y 1vIii8pBaF2f2R//wL+kRvwfzUDP54fTUw6M/pe8b2iUCYUOfrdbPMLTRletQEa/Sv1L 9H77/TixNxPbm6MebCS123o8A+o8fBY2ahCnAASGyyir/xo725catHgUOa+EDxLRqjSj UIAg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g13si3897729edu.4.2019.10.18.08.43.27; Fri, 18 Oct 2019 08:43:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2505262AbfJRPmy (ORCPT + 26 others); Fri, 18 Oct 2019 11:42:54 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:58375 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2505194AbfJRPmo (ORCPT ); Fri, 18 Oct 2019 11:42:44 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1MkHIV-1hauA82NxJ-00kdl6; Fri, 18 Oct 2019 17:42:37 +0200 From: Arnd Bergmann To: Daniel Mack , Haojian Zhuang , Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Linus Walleij , Arnd Bergmann , Lubomir Rintel Subject: [PATCH 46/46] ARM: pxa: move plat-pxa to drivers/soc/ Date: Fri, 18 Oct 2019 17:42:01 +0200 Message-Id: <20191018154201.1276638-46-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191018154052.1276506-1-arnd@arndb.de> References: <20191018154052.1276506-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:5XjJp8O801ykBXpbjofn9E4JPl6NL5NXrww4uVIvlM6v3Cs6+kK Bnuw8vNHe0lhUDgGxZGtv0hg7YNnU/AHVCmtPo1JUflEMdaHwyWa6pIWP95rFyctkjmnXPD 4vZmwEVgTX0X1RD4h3o/zQgmZ8CZJEuR7tmtn5uCJJJfccJZpeb+6JBl0iHWR+rOYeQZ0lW wo8IP7X+AI/IB0k4JrdlA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:xvo3kzI1RzU=:/3JEdZilOOjFWOPN5qMSPI GFfdNGNVGpdBDSUHhWuTLkVRVNB704uSndAGNN3Ipw4VCZ934NHFPQfSSwWSsP9Q/eWG1ocMo WVa8R76GRhs75DsO0xhSVNjhs5Prcl8RkVmKGSf2MfD94/ew8tUVP1ZXqS5E2h6jsBG+kUkem Jez9/dsPSp+29bYAXRDMbozDrlZi14OkB5VUF3WbOJksI/0dA2RHv+JFS9ZQpcVDmI4vItrSK tQVfrj/9DOOHnSJMCJujSROog/b7Y+6/EtQw2T+w2BCqx9Q1G/qkgt/qzCR6ukJ7/ZmQr8WH6 3JDVRbrI2su7ac1Y792wLQMJSq08YLF5umyBYH5xpeVU2FrNnZVDz7H/2VdwGjYmoEC/AwaUk 7cYAWkHJtMjSNLSEsDpeEeasEwU0A+F9ItjRkTEDn5EO05giEfKw6WY8wG6xnMok5YxunPVYu gv7ydkEQqOu1nXEL8N8B1vn4DTSig+bnQmUODj0n4gUOwUWbf94u7NyLUtw7hCv08ECmSzl/o dRDpodABHj9c3nhU2vgUrDhJyM10MTzcAKE+ThaAAgJb2E/jq0B3n0H+ZiJT9/l3rpvkbn/By bEnNGdWjpCJ08q8VN6eJ9yK7037WIArhuehZskh7vnMtQW4mIxkwX4VrcX+LzPcDYdZCqPYzz sEV2z0LRTu0hbfOqKn9jF1j2CIdqy5GWjxFPC+laCfmKY2/c9KvOhEWuotMgqobNkNeGypuUa /Z3IWXr88iOEqCMTOJFM+S28dKRghfU9kyE7PAfIo/BJaU+c02BaiEvRjKWB9KTIULAibtHHe 5YJsT0Xu4jw8xIncbcY5CbiWtEafKqikZmJ6VZImg/ZdhYtrdjErKmN7VF2ejAZwPA9l2OMnj kfOMZbdP7jBNJHHawLng== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Cc: Lubomir Rintel Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 3 --- 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(+), 20 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%) -- 2.20.0 Acked-by: Robert Jarzmik Acked-by: Lubomir Rintel (mach-mmp) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b01f762abbda..330a1685101a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -796,9 +796,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 db857d07114f..09622c26a8a4 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -238,7 +238,6 @@ 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 plat-$(CONFIG_PLAT_VERSATILE) += versatile 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 833e04a7835c..fc30a33ada9b 100644 --- a/drivers/soc/Kconfig +++ b/drivers/soc/Kconfig @@ -10,6 +10,7 @@ source "drivers/soc/fsl/Kconfig" source "drivers/soc/imx/Kconfig" source "drivers/soc/ixp4xx/Kconfig" source "drivers/soc/mediatek/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 2ec355003524..2934ad8c5a9f 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_ARCH_MXC) += imx/ obj-$(CONFIG_ARCH_IXP4XX) += ixp4xx/ obj-$(CONFIG_SOC_XWAY) += lantiq/ obj-y += mediatek/ +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