Skip to content

Commit ba7fdf8

Browse files
jianlonghuanglinusw
authored andcommitted
pinctrl: Create subdirectory for StarFive drivers
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 <[email protected]> Signed-off-by: Hal Feng <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent 5197b70 commit ba7fdf8

File tree

5 files changed

+27
-22
lines changed

5 files changed

+27
-22
lines changed

drivers/pinctrl/Kconfig

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -431,23 +431,6 @@ config PINCTRL_ST
431431
select PINCONF
432432
select GPIOLIB_IRQCHIP
433433

434-
config PINCTRL_STARFIVE
435-
tristate "Pinctrl and GPIO driver for the StarFive JH7100 SoC"
436-
depends on SOC_STARFIVE || COMPILE_TEST
437-
depends on OF
438-
default SOC_STARFIVE
439-
select GENERIC_PINCTRL_GROUPS
440-
select GENERIC_PINMUX_FUNCTIONS
441-
select GENERIC_PINCONF
442-
select GPIOLIB
443-
select GPIOLIB_IRQCHIP
444-
select OF_GPIO
445-
help
446-
Say yes here to support pin control on the StarFive JH7100 SoC.
447-
This also provides an interface to the GPIO pins not used by other
448-
peripherals supporting inputs, outputs, configuring pull-up/pull-down
449-
and interrupts on input changes.
450-
451434
config PINCTRL_STMFX
452435
tristate "STMicroelectronics STMFX GPIO expander pinctrl driver"
453436
depends on I2C
@@ -545,6 +528,7 @@ source "drivers/pinctrl/renesas/Kconfig"
545528
source "drivers/pinctrl/samsung/Kconfig"
546529
source "drivers/pinctrl/spear/Kconfig"
547530
source "drivers/pinctrl/sprd/Kconfig"
531+
source "drivers/pinctrl/starfive/Kconfig"
548532
source "drivers/pinctrl/stm32/Kconfig"
549533
source "drivers/pinctrl/sunplus/Kconfig"
550534
source "drivers/pinctrl/sunxi/Kconfig"

drivers/pinctrl/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ obj-$(CONFIG_PINCTRL_RK805) += pinctrl-rk805.o
4444
obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o
4545
obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o
4646
obj-$(CONFIG_PINCTRL_ST) += pinctrl-st.o
47-
obj-$(CONFIG_PINCTRL_STARFIVE) += pinctrl-starfive.o
4847
obj-$(CONFIG_PINCTRL_STMFX) += pinctrl-stmfx.o
4948
obj-$(CONFIG_PINCTRL_SX150X) += pinctrl-sx150x.o
5049
obj-$(CONFIG_PINCTRL_TB10X) += pinctrl-tb10x.o
@@ -71,6 +70,7 @@ obj-$(CONFIG_PINCTRL_RENESAS) += renesas/
7170
obj-$(CONFIG_PINCTRL_SAMSUNG) += samsung/
7271
obj-$(CONFIG_PINCTRL_SPEAR) += spear/
7372
obj-y += sprd/
73+
obj-$(CONFIG_SOC_STARFIVE) += starfive/
7474
obj-$(CONFIG_PINCTRL_STM32) += stm32/
7575
obj-y += sunplus/
7676
obj-$(CONFIG_PINCTRL_SUNXI) += sunxi/

drivers/pinctrl/starfive/Kconfig

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
3+
config PINCTRL_STARFIVE
4+
tristate "Pinctrl and GPIO driver for the StarFive JH7100 SoC"
5+
depends on SOC_STARFIVE || COMPILE_TEST
6+
depends on OF
7+
select GENERIC_PINCTRL_GROUPS
8+
select GENERIC_PINMUX_FUNCTIONS
9+
select GENERIC_PINCONF
10+
select GPIOLIB
11+
select GPIOLIB_IRQCHIP
12+
select OF_GPIO
13+
default SOC_STARFIVE
14+
help
15+
Say yes here to support pin control on the StarFive JH7100 SoC.
16+
This also provides an interface to the GPIO pins not used by other
17+
peripherals supporting inputs, outputs, configuring pull-up/pull-down
18+
and interrupts on input changes.

drivers/pinctrl/starfive/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
3+
obj-$(CONFIG_PINCTRL_STARFIVE) += pinctrl-starfive.o

drivers/pinctrl/pinctrl-starfive.c renamed to drivers/pinctrl/starfive/pinctrl-starfive.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
#include <dt-bindings/pinctrl/pinctrl-starfive.h>
2424

25-
#include "core.h"
26-
#include "pinctrl-utils.h"
27-
#include "pinmux.h"
28-
#include "pinconf.h"
25+
#include "../core.h"
26+
#include "../pinctrl-utils.h"
27+
#include "../pinmux.h"
28+
#include "../pinconf.h"
2929

3030
#define DRIVER_NAME "pinctrl-starfive"
3131

0 commit comments

Comments
 (0)