diff mbox series

[46/46] ARM: pxa: move plat-pxa to drivers/soc/

Message ID 20191018154201.1276638-46-arnd@arndb.de
State New
Headers show
Series [01/46] ARM: pxa: split mach/generic.h | expand

Commit Message

Arnd Bergmann Oct. 18, 2019, 3:42 p.m. UTC 
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 <lkundrak@v3.sk>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 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

Comments

Robert Jarzmik Oct. 30, 2019, 9:40 p.m. UTC | #1 
Arnd Bergmann <arnd@arndb.de> writes:

> 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 <lkundrak@v3.sk>

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

For the pxa part :
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>


Cheers.

--
Robert
Lubomir Rintel Oct. 31, 2019, 8:53 a.m. UTC | #2 
On Fri, 2019-10-18 at 17:42 +0200, Arnd Bergmann wrote:
> 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 <lkundrak@v3.sk>

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Acked-by: Lubomir Rintel <lkundrak@v3.sk> (mach-mmp)


> ---

>  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%)

> 

> 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 <plat/mfp.h>

> +#include <linux/soc/pxa/mfp.h>

>  

>  /*

>   * 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 <plat/mfp.h>

> +#include <linux/soc/pxa/mfp.h>

>  

>  #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 <plat/mfp.h>

> +#include <linux/soc/pxa/mfp.h>

>  

>  /*

>   * 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 <plat/mfp.h>

> +#include <linux/soc/pxa/mfp.h>

>  

>  #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 <linux/init.h>

>  #include <linux/io.h>

>  

> -#include <plat/mfp.h>

> +#include <linux/soc/pxa/mfp.h>

>  

>  #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
diff mbox series

Patch

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 <plat/mfp.h>
+#include <linux/soc/pxa/mfp.h>
 
 /*
  * 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 <plat/mfp.h>
+#include <linux/soc/pxa/mfp.h>
 
 #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 <plat/mfp.h>
+#include <linux/soc/pxa/mfp.h>
 
 /*
  * 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 <plat/mfp.h>
+#include <linux/soc/pxa/mfp.h>
 
 #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 <linux/init.h>
 #include <linux/io.h>
 
-#include <plat/mfp.h>
+#include <linux/soc/pxa/mfp.h>
 
 #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