pinctrl: move microchip riscv pinctrl drivers to a folder

There's three of these drivers now for the same platforms, move them
together with other microchip drivers to follow.

Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: Linus Walleij <linusw@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 5b11839cba9de1e9e43f63787578edd8c429ca39..ff6084cb57975df1c5a3bee55696d341f6d9abc0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -22472,8 +22472,8 @@ F:      drivers/gpio/gpio-mpfs.c
 F:     drivers/i2c/busses/i2c-microchip-corei2c.c
 F:     drivers/mailbox/mailbox-mpfs.c
 F:     drivers/pci/controller/plda/pcie-microchip-host.c
-F:     drivers/pinctrl/pinctrl-mpfs-iomux0.c
-F:     drivers/pinctrl/pinctrl-pic64gx-gpio2.c
+F:     drivers/pinctrl/microchip/pinctrl-mpfs-iomux0.c
+F:     drivers/pinctrl/microchip/pinctrl-pic64gx-gpio2.c
 F:     drivers/pwm/pwm-microchip-core.c
 F:     drivers/reset/reset-mpfs.c
 F:     drivers/rtc/rtc-mpfs.c

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 0ea117581bde4913e02cbf00b751f761f6f24927..d2a414450c16d33334b2774df20d7df0e059a685 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -486,14 +486,6 @@ config PINCTRL_PIC32MZDA
        def_bool y if PIC32MZDA
        select PINCTRL_PIC32
 
-config PINCTRL_PIC64GX
-       bool "pic64gx gpio2 pinctrl driver"
-       depends on ARCH_MICROCHIP || COMPILE_TEST
-       depends on OF
-       select GENERIC_PINCONF
-       help
-         This selects the pinctrl driver for gpio2 on pic64gx.
-
 config PINCTRL_PISTACHIO
        bool "IMG Pistachio SoC pinctrl driver"
        depends on OF && (MIPS || COMPILE_TEST)
@@ -505,14 +497,6 @@ config PINCTRL_PISTACHIO
        help
          This support pinctrl and GPIO driver for IMG Pistachio SoC.
 
-config PINCTRL_POLARFIRE_SOC
-       bool "Polarfire SoC pinctrl driver"
-       depends on ARCH_MICROCHIP || COMPILE_TEST
-       depends on OF
-       select GENERIC_PINCONF
-       help
-         This selects the pinctrl driver for Microchip Polarfire SoC.
-
 config PINCTRL_RK805
        tristate "Pinctrl and GPIO driver for RK805 PMIC"
        depends on MFD_RK8XX
@@ -707,6 +691,7 @@ source "drivers/pinctrl/freescale/Kconfig"
 source "drivers/pinctrl/intel/Kconfig"
 source "drivers/pinctrl/mediatek/Kconfig"
 source "drivers/pinctrl/meson/Kconfig"
+source "drivers/pinctrl/microchip/Kconfig"
 source "drivers/pinctrl/mvebu/Kconfig"
 source "drivers/pinctrl/nomadik/Kconfig"
 source "drivers/pinctrl/nuvoton/Kconfig"

diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index be5200c23e60171d1cefeb261d944e4c9f701624..05737b1afec99da691a490b3f40e822ccbd92f11 100644 (file)
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -48,9 +48,7 @@ obj-$(CONFIG_PINCTRL_OCELOT)  += pinctrl-ocelot.o
 obj-$(CONFIG_PINCTRL_PALMAS)   += pinctrl-palmas.o
 obj-$(CONFIG_PINCTRL_PEF2256)  += pinctrl-pef2256.o
 obj-$(CONFIG_PINCTRL_PIC32)    += pinctrl-pic32.o
-obj-$(CONFIG_PINCTRL_PIC64GX)  += pinctrl-pic64gx-gpio2.o
 obj-$(CONFIG_PINCTRL_PISTACHIO)        += pinctrl-pistachio.o
-obj-$(CONFIG_PINCTRL_POLARFIRE_SOC)    += pinctrl-mpfs-iomux0.o
 obj-$(CONFIG_PINCTRL_RK805)    += pinctrl-rk805.o
 obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o
 obj-$(CONFIG_PINCTRL_RP1)       += pinctrl-rp1.o
@@ -76,6 +74,7 @@ obj-y                         += freescale/
 obj-$(CONFIG_X86)              += intel/
 obj-y                          += mediatek/
 obj-$(CONFIG_PINCTRL_MESON)    += meson/
+obj-y                          += microchip/
 obj-y                          += mvebu/
 obj-y                          += nomadik/
 obj-y                          += nuvoton/

diff --git a/drivers/pinctrl/microchip/Kconfig b/drivers/pinctrl/microchip/Kconfig
new file mode 100644 (file)
index 0000000..bdefe65
--- /dev/null
+++ b/drivers/pinctrl/microchip/Kconfig
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config PINCTRL_PIC64GX
+       bool "pic64gx gpio2 pinctrl driver"
+       depends on ARCH_MICROCHIP || COMPILE_TEST
+       depends on OF
+       select GENERIC_PINCONF
+       help
+         This selects the pinctrl driver for gpio2 on pic64gx.
+
+config PINCTRL_POLARFIRE_SOC
+       bool "Polarfire SoC pinctrl driver"
+       depends on ARCH_MICROCHIP || COMPILE_TEST
+       depends on OF
+       select GENERIC_PINCONF
+       help
+         This selects the pinctrl driver for Microchip Polarfire SoC.

diff --git a/drivers/pinctrl/microchip/Makefile b/drivers/pinctrl/microchip/Makefile
new file mode 100644 (file)
index 0000000..584d48e
--- /dev/null
+++ b/drivers/pinctrl/microchip/Makefile
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-$(CONFIG_PINCTRL_PIC64GX)  += pinctrl-pic64gx-gpio2.o
+obj-$(CONFIG_PINCTRL_POLARFIRE_SOC)    += pinctrl-mpfs-iomux0.o

diff --git a/drivers/pinctrl/pinctrl-mpfs-iomux0.c b/drivers/pinctrl/microchip/pinctrl-mpfs-iomux0.c
similarity index 98%
rename from drivers/pinctrl/pinctrl-mpfs-iomux0.c
rename to drivers/pinctrl/microchip/pinctrl-mpfs-iomux0.c
index cf5b2e4e8f5ba7f464669738fbb472dc3aeb2aae..1b060a0389203d63c357c034c55472f4a3c6cfe1 100644 (file)
--- a/drivers/pinctrl/pinctrl-mpfs-iomux0.c
+++ b/drivers/pinctrl/microchip/pinctrl-mpfs-iomux0.c
@@ -15,10 +15,10 @@
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
 
-#include "core.h"
-#include "pinctrl-utils.h"
-#include "pinconf.h"
-#include "pinmux.h"
+#include "../core.h"
+#include "../pinctrl-utils.h"
+#include "../pinconf.h"
+#include "../pinmux.h"
 
 #define MPFS_IOMUX0_REG 0x200
 

diff --git a/drivers/pinctrl/pinctrl-pic64gx-gpio2.c b/drivers/pinctrl/microchip/pinctrl-pic64gx-gpio2.c
similarity index 99%
rename from drivers/pinctrl/pinctrl-pic64gx-gpio2.c
rename to drivers/pinctrl/microchip/pinctrl-pic64gx-gpio2.c
index f322bb5e61814421d3b82b6cabd218499ea5f070..a0b3e839cf3ba60a749dbffbac1ecf3b9fafab21 100644 (file)
--- a/drivers/pinctrl/pinctrl-pic64gx-gpio2.c
+++ b/drivers/pinctrl/microchip/pinctrl-pic64gx-gpio2.c
@@ -14,7 +14,7 @@
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
 
-#include "pinctrl-utils.h"
+#include "../pinctrl-utils.h"
 
 #define PIC64GX_PINMUX_REG 0x0