diff mbox series

[v3,2/4] pinctrl: sh-pfc: collect Renesas related CONFIGs in one place

Message ID 87sgccydyr.wl-kuninori.morimoto.gx@renesas.com (mailing list archive)
State Superseded
Delegated to: Geert Uytterhoeven
Headers show
Series pinctrl: sh-pfc: collect Renesas related CONFIGs in one place | expand

Commit Message

Kuninori Morimoto Aug. 24, 2020, 2:30 a.m. UTC 
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Renesas related pinctrl CONFIGs are located many places,
and it is confusable.
This patch collects these into same place,
and group into "Renesas pinctrl drivers" menu.
This patch also moves pinctrl-rz{a1,a2,n1}.c into sh-pfc folder.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/pinctrl/Kconfig                     | 32 ------------------
 drivers/pinctrl/Makefile                    |  3 --
 drivers/pinctrl/sh-pfc/Kconfig              | 36 +++++++++++++++++++++
 drivers/pinctrl/sh-pfc/Makefile             |  4 +++
 drivers/pinctrl/{ => sh-pfc}/pinctrl-rza1.c |  0
 drivers/pinctrl/{ => sh-pfc}/pinctrl-rza2.c |  0
 drivers/pinctrl/{ => sh-pfc}/pinctrl-rzn1.c |  0
 7 files changed, 40 insertions(+), 35 deletions(-)
 rename drivers/pinctrl/{ => sh-pfc}/pinctrl-rza1.c (100%)
 rename drivers/pinctrl/{ => sh-pfc}/pinctrl-rza2.c (100%)
 rename drivers/pinctrl/{ => sh-pfc}/pinctrl-rzn1.c (100%)

Comments

kernel test robot Aug. 24, 2020, 3:26 a.m. UTC | #1 
Hi Kuninori,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on renesas-drivers/sh-pfc]
[also build test ERROR on pinctrl/devel v5.9-rc2 next-20200821]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Kuninori-Morimoto/pinctrl-sh-pfc-collect-Renesas-related-CONFIGs-in-one-place/20200824-103625
base:   https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
config: arc-allyesconfig (attached as .config)
compiler: arc-elf-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arc 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

>> drivers/pinctrl/sh-pfc/pinctrl-rza1.c:30:10: fatal error: devicetree.h: No such file or directory
      30 | #include "devicetree.h"
         |          ^~~~~~~~~~~~~~
   compilation terminated.
--
>> drivers/pinctrl/sh-pfc/pinctrl-rza2.c:21:10: fatal error: pinmux.h: No such file or directory
      21 | #include "pinmux.h"
         |          ^~~~~~~~~~
   compilation terminated.
--
>> drivers/pinctrl/sh-pfc/pinctrl-rzn1.c:21:10: fatal error: pinconf.h: No such file or directory
      21 | #include "pinconf.h"
         |          ^~~~~~~~~~~
   compilation terminated.

# https://github.com/0day-ci/linux/commit/0eebf3dd4b399ae6e2278063620b198fb0a28b24
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Kuninori-Morimoto/pinctrl-sh-pfc-collect-Renesas-related-CONFIGs-in-one-place/20200824-103625
git checkout 0eebf3dd4b399ae6e2278063620b198fb0a28b24
vim +30 drivers/pinctrl/sh-pfc/pinctrl-rza1.c

5a49b644b3075f drivers/pinctrl/pinctrl-rza1.c Jacopo Mondi 2017-06-22  28  
5a49b644b3075f drivers/pinctrl/pinctrl-rza1.c Jacopo Mondi 2017-06-22  29  #include "core.h"
5a49b644b3075f drivers/pinctrl/pinctrl-rza1.c Jacopo Mondi 2017-06-22 @30  #include "devicetree.h"
5a49b644b3075f drivers/pinctrl/pinctrl-rza1.c Jacopo Mondi 2017-06-22  31  #include "pinconf.h"
5a49b644b3075f drivers/pinctrl/pinctrl-rza1.c Jacopo Mondi 2017-06-22  32  #include "pinmux.h"
5a49b644b3075f drivers/pinctrl/pinctrl-rza1.c Jacopo Mondi 2017-06-22  33  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
Kuninori Morimoto Aug. 24, 2020, 5:28 a.m. UTC | #2 
Hi

> All errors (new ones prefixed by >>):
> 
> >> drivers/pinctrl/sh-pfc/pinctrl-rza1.c:30:10: fatal error: devicetree.h: No such file or directory
>       30 | #include "devicetree.h"
>          |          ^~~~~~~~~~~~~~
>    compilation terminated.
> --
> >> drivers/pinctrl/sh-pfc/pinctrl-rza2.c:21:10: fatal error: pinmux.h: No such file or directory
>       21 | #include "pinmux.h"
>          |          ^~~~~~~~~~
>    compilation terminated.
> --
> >> drivers/pinctrl/sh-pfc/pinctrl-rzn1.c:21:10: fatal error: pinconf.h: No such file or directory
>       21 | #include "pinconf.h"
>          |          ^~~~~~~~~~~
>    compilation terminated.

Grr my bad.
Will fix in v4

Thank you for your help !!

Best regards
---
Kuninori Morimoto
diff mbox series

Patch

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 8828613c4e0e..f63c5a04a3f7 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -213,38 +213,6 @@  config PINCTRL_ROCKCHIP
 	select GENERIC_IRQ_CHIP
 	select MFD_SYSCON
 
-config PINCTRL_RZA1
-	bool "Renesas RZ/A1 gpio and pinctrl driver"
-	depends on OF
-	depends on ARCH_R7S72100 || COMPILE_TEST
-	select GPIOLIB
-	select GENERIC_PINCTRL_GROUPS
-	select GENERIC_PINMUX_FUNCTIONS
-	select GENERIC_PINCONF
-	help
-	  This selects pinctrl driver for Renesas RZ/A1 platforms.
-
-config PINCTRL_RZA2
-	bool "Renesas RZ/A2 gpio and pinctrl driver"
-	depends on OF
-	depends on ARCH_R7S9210 || COMPILE_TEST
-	select GPIOLIB
-	select GENERIC_PINCTRL_GROUPS
-	select GENERIC_PINMUX_FUNCTIONS
-	select GENERIC_PINCONF
-	help
-	  This selects GPIO and pinctrl driver for Renesas RZ/A2 platforms.
-
-config PINCTRL_RZN1
-	bool "Renesas RZ/N1 pinctrl driver"
-	depends on OF
-	depends on ARCH_RZN1 || COMPILE_TEST
-	select GENERIC_PINCTRL_GROUPS
-	select GENERIC_PINMUX_FUNCTIONS
-	select GENERIC_PINCONF
-	help
-	  This selects pinctrl driver for Renesas RZ/N1 devices.
-
 config PINCTRL_SINGLE
 	tristate "One-register-per-pin type device tree based pinctrl driver"
 	depends on OF
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index 1731b2154df9..1da9f28aecbd 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -30,9 +30,6 @@  obj-$(CONFIG_PINCTRL_PALMAS)	+= pinctrl-palmas.o
 obj-$(CONFIG_PINCTRL_PIC32)	+= pinctrl-pic32.o
 obj-$(CONFIG_PINCTRL_PISTACHIO)	+= pinctrl-pistachio.o
 obj-$(CONFIG_PINCTRL_ROCKCHIP)	+= pinctrl-rockchip.o
-obj-$(CONFIG_PINCTRL_RZA1)	+= pinctrl-rza1.o
-obj-$(CONFIG_PINCTRL_RZA2)	+= pinctrl-rza2.o
-obj-$(CONFIG_PINCTRL_RZN1)	+= pinctrl-rzn1.o
 obj-$(CONFIG_PINCTRL_SINGLE)	+= pinctrl-single.o
 obj-$(CONFIG_PINCTRL_SIRF)	+= sirf/
 obj-$(CONFIG_PINCTRL_SX150X)	+= pinctrl-sx150x.o
diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig
index 8b2b1e1a9047..ff10bb2ed497 100644
--- a/drivers/pinctrl/sh-pfc/Kconfig
+++ b/drivers/pinctrl/sh-pfc/Kconfig
@@ -3,6 +3,8 @@ 
 # Renesas SH and SH Mobile PINCTRL drivers
 #
 
+menu "Renesas pinctrl drivers"
+
 config PINCTRL_SH_PFC
 	bool "Renesas SoC pin control support" if COMPILE_TEST && !(ARCH_RENESAS || SUPERH)
 	default y if ARCH_RENESAS || SUPERH
@@ -53,6 +55,38 @@  config PINCTRL_SH_PFC
 	help
 	  This enables pin control drivers for Renesas SuperH and ARM platforms
 
+config PINCTRL_RZA1
+	bool "RZ/A1 gpio and pinctrl driver"
+	depends on OF
+	depends on ARCH_R7S72100 || COMPILE_TEST
+	select GPIOLIB
+	select GENERIC_PINCTRL_GROUPS
+	select GENERIC_PINMUX_FUNCTIONS
+	select GENERIC_PINCONF
+	help
+	  This selects pinctrl driver for Renesas RZ/A1 platforms.
+
+config PINCTRL_RZA2
+	bool "RZ/A2 gpio and pinctrl driver"
+	depends on OF
+	depends on ARCH_R7S9210 || COMPILE_TEST
+	select GPIOLIB
+	select GENERIC_PINCTRL_GROUPS
+	select GENERIC_PINMUX_FUNCTIONS
+	select GENERIC_PINCONF
+	help
+	  This selects GPIO and pinctrl driver for Renesas RZ/A2 platforms.
+
+config PINCTRL_RZN1
+	bool "RZ/N1 pinctrl driver"
+	depends on OF
+	depends on ARCH_RZN1 || COMPILE_TEST
+	select GENERIC_PINCTRL_GROUPS
+	select GENERIC_PINMUX_FUNCTIONS
+	select GENERIC_PINCONF
+	help
+	  This selects pinctrl driver for Renesas RZ/N1 devices.
+
 config PINCTRL_SH_PFC_GPIO
 	select GPIOLIB
 	bool
@@ -203,3 +237,5 @@  config PINCTRL_PFC_SH7786
 config PINCTRL_PFC_SHX3
 	bool "SH-X3 pin control support" if COMPILE_TEST
 	select PINCTRL_SH_FUNC_GPIO
+
+endmenu
diff --git a/drivers/pinctrl/sh-pfc/Makefile b/drivers/pinctrl/sh-pfc/Makefile
index 7bb99187cd8e..0b5640cf457b 100644
--- a/drivers/pinctrl/sh-pfc/Makefile
+++ b/drivers/pinctrl/sh-pfc/Makefile
@@ -43,6 +43,10 @@  obj-$(CONFIG_PINCTRL_PFC_SH7785)	+= pfc-sh7785.o
 obj-$(CONFIG_PINCTRL_PFC_SH7786)	+= pfc-sh7786.o
 obj-$(CONFIG_PINCTRL_PFC_SHX3)		+= pfc-shx3.o
 
+obj-$(CONFIG_PINCTRL_RZA1)	+= pinctrl-rza1.o
+obj-$(CONFIG_PINCTRL_RZA2)	+= pinctrl-rza2.o
+obj-$(CONFIG_PINCTRL_RZN1)	+= pinctrl-rzn1.o
+
 ifeq ($(CONFIG_COMPILE_TEST),y)
 CFLAGS_pfc-sh7203.o	+= -I$(srctree)/arch/sh/include/cpu-sh2a
 CFLAGS_pfc-sh7264.o	+= -I$(srctree)/arch/sh/include/cpu-sh2a
diff --git a/drivers/pinctrl/pinctrl-rza1.c b/drivers/pinctrl/sh-pfc/pinctrl-rza1.c
similarity index 100%
rename from drivers/pinctrl/pinctrl-rza1.c
rename to drivers/pinctrl/sh-pfc/pinctrl-rza1.c
diff --git a/drivers/pinctrl/pinctrl-rza2.c b/drivers/pinctrl/sh-pfc/pinctrl-rza2.c
similarity index 100%
rename from drivers/pinctrl/pinctrl-rza2.c
rename to drivers/pinctrl/sh-pfc/pinctrl-rza2.c
diff --git a/drivers/pinctrl/pinctrl-rzn1.c b/drivers/pinctrl/sh-pfc/pinctrl-rzn1.c
similarity index 100%
rename from drivers/pinctrl/pinctrl-rzn1.c
rename to drivers/pinctrl/sh-pfc/pinctrl-rzn1.c