]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
pinctrl: Create subdirectory for StarFive drivers
authorJianlong Huang <jianlong.huang@starfivetech.com>
Fri, 30 Sep 2022 06:08:19 +0000 (14:08 +0800)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 4 Oct 2022 08:42:11 +0000 (10:42 +0200)
Move the StarFive JH7100 pinctrl driver to a new subdirectory
in preparation for adding more StarFive pinctrl drivers. No
functional change.

Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com>
Signed-off-by: Hal Feng <hal.feng@linux.starfivetech.com>
Link: https://lore.kernel.org/r/20220930060819.5320-1-hal.feng@linux.starfivetech.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile
drivers/pinctrl/starfive/Kconfig [new file with mode: 0644]
drivers/pinctrl/starfive/Makefile [new file with mode: 0644]
drivers/pinctrl/starfive/pinctrl-starfive.c [moved from drivers/pinctrl/pinctrl-starfive.c with 99% similarity]

index da87f2dc358bc564f780bc428044cfeca5fdc3a5..287420cfc850da81e6fb0dba0726ff4af2cd7f21 100644 (file)
@@ -431,23 +431,6 @@ config PINCTRL_ST
        select PINCONF
        select GPIOLIB_IRQCHIP
 
-config PINCTRL_STARFIVE
-       tristate "Pinctrl and GPIO driver for the StarFive JH7100 SoC"
-       depends on SOC_STARFIVE || COMPILE_TEST
-       depends on OF
-       default SOC_STARFIVE
-       select GENERIC_PINCTRL_GROUPS
-       select GENERIC_PINMUX_FUNCTIONS
-       select GENERIC_PINCONF
-       select GPIOLIB
-       select GPIOLIB_IRQCHIP
-       select OF_GPIO
-       help
-         Say yes here to support pin control on the StarFive JH7100 SoC.
-         This also provides an interface to the GPIO pins not used by other
-         peripherals supporting inputs, outputs, configuring pull-up/pull-down
-         and interrupts on input changes.
-
 config PINCTRL_STMFX
        tristate "STMicroelectronics STMFX GPIO expander pinctrl driver"
        depends on I2C
@@ -545,6 +528,7 @@ source "drivers/pinctrl/renesas/Kconfig"
 source "drivers/pinctrl/samsung/Kconfig"
 source "drivers/pinctrl/spear/Kconfig"
 source "drivers/pinctrl/sprd/Kconfig"
+source "drivers/pinctrl/starfive/Kconfig"
 source "drivers/pinctrl/stm32/Kconfig"
 source "drivers/pinctrl/sunplus/Kconfig"
 source "drivers/pinctrl/sunxi/Kconfig"
index 7188dab7eec888489ddac702dda014d0be820252..89bfa01b5231ad5a4f99861a7d094264d932c85f 100644 (file)
@@ -44,7 +44,6 @@ obj-$(CONFIG_PINCTRL_RK805)   += pinctrl-rk805.o
 obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o
 obj-$(CONFIG_PINCTRL_SINGLE)   += pinctrl-single.o
 obj-$(CONFIG_PINCTRL_ST)       += pinctrl-st.o
-obj-$(CONFIG_PINCTRL_STARFIVE) += pinctrl-starfive.o
 obj-$(CONFIG_PINCTRL_STMFX)    += pinctrl-stmfx.o
 obj-$(CONFIG_PINCTRL_SX150X)   += pinctrl-sx150x.o
 obj-$(CONFIG_PINCTRL_TB10X)    += pinctrl-tb10x.o
@@ -71,6 +70,7 @@ obj-$(CONFIG_PINCTRL_RENESAS) += renesas/
 obj-$(CONFIG_PINCTRL_SAMSUNG)  += samsung/
 obj-$(CONFIG_PINCTRL_SPEAR)    += spear/
 obj-y                          += sprd/
+obj-$(CONFIG_SOC_STARFIVE)     += starfive/
 obj-$(CONFIG_PINCTRL_STM32)    += stm32/
 obj-y                          += sunplus/
 obj-$(CONFIG_PINCTRL_SUNXI)    += sunxi/
diff --git a/drivers/pinctrl/starfive/Kconfig b/drivers/pinctrl/starfive/Kconfig
new file mode 100644 (file)
index 0000000..13c3275
--- /dev/null
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config PINCTRL_STARFIVE
+       tristate "Pinctrl and GPIO driver for the StarFive JH7100 SoC"
+       depends on SOC_STARFIVE || COMPILE_TEST
+       depends on OF
+       select GENERIC_PINCTRL_GROUPS
+       select GENERIC_PINMUX_FUNCTIONS
+       select GENERIC_PINCONF
+       select GPIOLIB
+       select GPIOLIB_IRQCHIP
+       select OF_GPIO
+       default SOC_STARFIVE
+       help
+         Say yes here to support pin control on the StarFive JH7100 SoC.
+         This also provides an interface to the GPIO pins not used by other
+         peripherals supporting inputs, outputs, configuring pull-up/pull-down
+         and interrupts on input changes.
diff --git a/drivers/pinctrl/starfive/Makefile b/drivers/pinctrl/starfive/Makefile
new file mode 100644 (file)
index 0000000..4c96e2f
--- /dev/null
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_PINCTRL_STARFIVE) += pinctrl-starfive.o
similarity index 99%
rename from drivers/pinctrl/pinctrl-starfive.c
rename to drivers/pinctrl/starfive/pinctrl-starfive.c
index 3eb40e230d981238ae03952b449ebd5b40266f4c..74a084740e8c05a02adee585a8b6c24673e0c82a 100644 (file)
 
 #include <dt-bindings/pinctrl/pinctrl-starfive.h>
 
-#include "core.h"
-#include "pinctrl-utils.h"
-#include "pinmux.h"
-#include "pinconf.h"
+#include "../core.h"
+#include "../pinctrl-utils.h"
+#include "../pinmux.h"
+#include "../pinconf.h"
 
 #define DRIVER_NAME "pinctrl-starfive"