[PATCH V3 0/2] soc: imx: increase build coverage for imx8 soc driver

[PATCH V3 0/2] soc: imx: increase build coverage for imx8 soc driver

[Peng Fan]

From: Peng Fan <peng.fan@nxp.com>


V3:
 Per Arnd's suggestions, merged Patch 2/3/4/5 into one patch
 Dropped the defconfig change with a default Kconfig

 Leonard, I dropped you R-b in V3 since the change.

V2:
 Include Leonard's patch to fix build break after enable compile test
 Add Leonard's R-b tag

Rename soc-imx8.c to soc-imx8m.c which is for i.MX8M family
Add SOC_IMX8M for build gate soc-imx8m.c
Increase build coverage for i.MX SoC driver

Leonard Crestez (1):
  soc: imx: gpcv2: include linux/sizes.h

Peng Fan (1):
  soc: imx: increase build coverage for imx8m soc driver

 drivers/soc/Makefile                        | 2 +-
 drivers/soc/imx/Kconfig                     | 9 +++++++++
 drivers/soc/imx/Makefile                    | 2 +-
 drivers/soc/imx/gpcv2.c                     | 1 +
 drivers/soc/imx/{soc-imx8.c => soc-imx8m.c} | 0
 5 files changed, 12 insertions(+), 2 deletions(-)
 rename drivers/soc/imx/{soc-imx8.c => soc-imx8m.c} (100%)

-- 
2.16.4

[PATCH V3 1/2] soc: imx: gpcv2: include linux/sizes.h

[Peng Fan]

From: Leonard Crestez <leonard.crestez@nxp.com>

This header is included indirectly on arm/arm64 but not on x86 so
CONFIG_COMPILE_TEST breaks. Fix by including <linux/sizes.h> directly.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
---
 drivers/soc/imx/gpcv2.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c
index b0dffb06c05d..6cf8a7a412bd 100644
--- a/drivers/soc/imx/gpcv2.c
+++ b/drivers/soc/imx/gpcv2.c
@@ -14,6 +14,7 @@
 #include <linux/pm_domain.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
+#include <linux/sizes.h>
 #include <dt-bindings/power/imx7-power.h>
 #include <dt-bindings/power/imx8mq-power.h>
 
-- 
2.16.4

[PATCH V3 2/2] soc: imx: increase build coverage for imx8m soc driver

[Peng Fan]

From: Peng Fan <peng.fan@nxp.com>

The soc-imx8.c driver is actually for i.MX8M family, so rename it
to soc-imx8m.c.

Use CONFIG_SOC_IMX8M as build gate, not CONFIG_ARCH_MXC, to control
whether build this driver, also make it possible for compile test.

Default set it to y for ARCH_MXC && ARM64

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/soc/Makefile                        | 2 +-
 drivers/soc/imx/Kconfig                     | 9 +++++++++
 drivers/soc/imx/Makefile                    | 2 +-
 drivers/soc/imx/{soc-imx8.c => soc-imx8m.c} | 0
 4 files changed, 11 insertions(+), 2 deletions(-)
 rename drivers/soc/imx/{soc-imx8.c => soc-imx8m.c} (100%)

diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 2ec355003524..614986cd1713 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -11,7 +11,7 @@ obj-$(CONFIG_ARCH_DOVE)		+= dove/
 obj-$(CONFIG_MACH_DOVE)		+= dove/
 obj-y				+= fsl/
 obj-$(CONFIG_ARCH_GEMINI)	+= gemini/
-obj-$(CONFIG_ARCH_MXC)		+= imx/
+obj-y				+= imx/
 obj-$(CONFIG_ARCH_IXP4XX)	+= ixp4xx/
 obj-$(CONFIG_SOC_XWAY)		+= lantiq/
 obj-y				+= mediatek/
diff --git a/drivers/soc/imx/Kconfig b/drivers/soc/imx/Kconfig
index 0281ef9a1800..70019cefa617 100644
--- a/drivers/soc/imx/Kconfig
+++ b/drivers/soc/imx/Kconfig
@@ -17,4 +17,13 @@ config IMX_SCU_SOC
 	  Controller Unit SoC info module, it will provide the SoC info
 	  like SoC family, ID and revision etc.
 
+config SOC_IMX8M
+	bool "i.MX8M SoC family support"
+	depends on ARCH_MXC || COMPILE_TEST
+	default ARCH_MXC && ARM64
+	help
+	  If you say yes here you get support for the NXP i.MX8M family
+	  support, it will provide the SoC info like SoC family,
+	  ID and revision etc.
+
 endmenu
diff --git a/drivers/soc/imx/Makefile b/drivers/soc/imx/Makefile
index cf9ca42ff739..103e2c93c342 100644
--- a/drivers/soc/imx/Makefile
+++ b/drivers/soc/imx/Makefile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o
 obj-$(CONFIG_IMX_GPCV2_PM_DOMAINS) += gpcv2.o
-obj-$(CONFIG_ARCH_MXC) += soc-imx8.o
+obj-$(CONFIG_SOC_IMX8M) += soc-imx8m.o
 obj-$(CONFIG_IMX_SCU_SOC) += soc-imx-scu.o
diff --git a/drivers/soc/imx/soc-imx8.c b/drivers/soc/imx/soc-imx8m.c
similarity index 100%
rename from drivers/soc/imx/soc-imx8.c
rename to drivers/soc/imx/soc-imx8m.c
-- 
2.16.4

Re: [PATCH V3 2/2] soc: imx: increase build coverage for imx8m soc driver

[Leonard Crestez]

On 28.01.2020 08:03, Peng Fan wrote:
> From: Peng Fan <peng.fan@nxp.com>
> 
> The soc-imx8.c driver is actually for i.MX8M family, so rename it
> to soc-imx8m.c.
> 
> Use CONFIG_SOC_IMX8M as build gate, not CONFIG_ARCH_MXC, to control
> whether build this driver, also make it possible for compile test.
> 
> Default set it to y for ARCH_MXC && ARM64
> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>

Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>

> ---
>   drivers/soc/Makefile                        | 2 +-
>   drivers/soc/imx/Kconfig                     | 9 +++++++++
>   drivers/soc/imx/Makefile                    | 2 +-
>   drivers/soc/imx/{soc-imx8.c => soc-imx8m.c} | 0
>   4 files changed, 11 insertions(+), 2 deletions(-)
>   rename drivers/soc/imx/{soc-imx8.c => soc-imx8m.c} (100%)
> 
> diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
> index 2ec355003524..614986cd1713 100644
> --- a/drivers/soc/Makefile
> +++ b/drivers/soc/Makefile
> @@ -11,7 +11,7 @@ obj-$(CONFIG_ARCH_DOVE)		+= dove/
>   obj-$(CONFIG_MACH_DOVE)		+= dove/
>   obj-y				+= fsl/
>   obj-$(CONFIG_ARCH_GEMINI)	+= gemini/
> -obj-$(CONFIG_ARCH_MXC)		+= imx/
> +obj-y				+= imx/
>   obj-$(CONFIG_ARCH_IXP4XX)	+= ixp4xx/
>   obj-$(CONFIG_SOC_XWAY)		+= lantiq/
>   obj-y				+= mediatek/
> diff --git a/drivers/soc/imx/Kconfig b/drivers/soc/imx/Kconfig
> index 0281ef9a1800..70019cefa617 100644
> --- a/drivers/soc/imx/Kconfig
> +++ b/drivers/soc/imx/Kconfig
> @@ -17,4 +17,13 @@ config IMX_SCU_SOC
>   	  Controller Unit SoC info module, it will provide the SoC info
>   	  like SoC family, ID and revision etc.
>   
> +config SOC_IMX8M
> +	bool "i.MX8M SoC family support"
> +	depends on ARCH_MXC || COMPILE_TEST
> +	default ARCH_MXC && ARM64
> +	help
> +	  If you say yes here you get support for the NXP i.MX8M family
> +	  support, it will provide the SoC info like SoC family,
> +	  ID and revision etc.
> +
>   endmenu
> diff --git a/drivers/soc/imx/Makefile b/drivers/soc/imx/Makefile
> index cf9ca42ff739..103e2c93c342 100644
> --- a/drivers/soc/imx/Makefile
> +++ b/drivers/soc/imx/Makefile
> @@ -1,5 +1,5 @@
>   # SPDX-License-Identifier: GPL-2.0-only
>   obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o
>   obj-$(CONFIG_IMX_GPCV2_PM_DOMAINS) += gpcv2.o
> -obj-$(CONFIG_ARCH_MXC) += soc-imx8.o
> +obj-$(CONFIG_SOC_IMX8M) += soc-imx8m.o
>   obj-$(CONFIG_IMX_SCU_SOC) += soc-imx-scu.o
> diff --git a/drivers/soc/imx/soc-imx8.c b/drivers/soc/imx/soc-imx8m.c
> similarity index 100%
> rename from drivers/soc/imx/soc-imx8.c
> rename to drivers/soc/imx/soc-imx8m.c

Re: [PATCH V3 2/2] soc: imx: increase build coverage for imx8m soc driver

[Shawn Guo]

On Tue, Jan 28, 2020 at 06:03:17AM +0000, Peng Fan wrote:
> From: Peng Fan <peng.fan@nxp.com>
> 
> The soc-imx8.c driver is actually for i.MX8M family, so rename it
> to soc-imx8m.c.
> 
> Use CONFIG_SOC_IMX8M as build gate, not CONFIG_ARCH_MXC, to control
> whether build this driver, also make it possible for compile test.
> 
> Default set it to y for ARCH_MXC && ARM64
> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>

Applied, thanks.