File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -22472,8 +22472,8 @@ F: drivers/gpio/gpio-mpfs.c
2247222472F: drivers/i2c/busses/i2c-microchip-corei2c.c
2247322473F: drivers/mailbox/mailbox-mpfs.c
2247422474F: drivers/pci/controller/plda/pcie-microchip-host.c
22475- F: drivers/pinctrl/pinctrl-mpfs-iomux0.c
22476- F: drivers/pinctrl/pinctrl-pic64gx-gpio2.c
22475+ F: drivers/pinctrl/microchip/ pinctrl-mpfs-iomux0.c
22476+ F: drivers/pinctrl/microchip/ pinctrl-pic64gx-gpio2.c
2247722477F: drivers/pwm/pwm-microchip-core.c
2247822478F: drivers/reset/reset-mpfs.c
2247922479F: drivers/rtc/rtc-mpfs.c
Original file line number Diff line number Diff line change @@ -486,14 +486,6 @@ config PINCTRL_PIC32MZDA
486486 def_bool y if PIC32MZDA
487487 select PINCTRL_PIC32
488488
489- config PINCTRL_PIC64GX
490- bool "pic64gx gpio2 pinctrl driver"
491- depends on ARCH_MICROCHIP || COMPILE_TEST
492- depends on OF
493- select GENERIC_PINCONF
494- help
495- This selects the pinctrl driver for gpio2 on pic64gx.
496-
497489config PINCTRL_PISTACHIO
498490 bool "IMG Pistachio SoC pinctrl driver"
499491 depends on OF && (MIPS || COMPILE_TEST)
@@ -505,14 +497,6 @@ config PINCTRL_PISTACHIO
505497 help
506498 This support pinctrl and GPIO driver for IMG Pistachio SoC.
507499
508- config PINCTRL_POLARFIRE_SOC
509- bool "Polarfire SoC pinctrl driver"
510- depends on ARCH_MICROCHIP || COMPILE_TEST
511- depends on OF
512- select GENERIC_PINCONF
513- help
514- This selects the pinctrl driver for Microchip Polarfire SoC.
515-
516500config PINCTRL_RK805
517501 tristate "Pinctrl and GPIO driver for RK805 PMIC"
518502 depends on MFD_RK8XX
@@ -707,6 +691,7 @@ source "drivers/pinctrl/freescale/Kconfig"
707691source "drivers/pinctrl/intel/Kconfig"
708692source "drivers/pinctrl/mediatek/Kconfig"
709693source "drivers/pinctrl/meson/Kconfig"
694+ source "drivers/pinctrl/microchip/Kconfig"
710695source "drivers/pinctrl/mvebu/Kconfig"
711696source "drivers/pinctrl/nomadik/Kconfig"
712697source "drivers/pinctrl/nuvoton/Kconfig"
Original file line number Diff line number Diff line change @@ -48,9 +48,7 @@ obj-$(CONFIG_PINCTRL_OCELOT) += pinctrl-ocelot.o
4848obj-$(CONFIG_PINCTRL_PALMAS) += pinctrl-palmas.o
4949obj-$(CONFIG_PINCTRL_PEF2256) += pinctrl-pef2256.o
5050obj-$(CONFIG_PINCTRL_PIC32) += pinctrl-pic32.o
51- obj-$(CONFIG_PINCTRL_PIC64GX) += pinctrl-pic64gx-gpio2.o
5251obj-$(CONFIG_PINCTRL_PISTACHIO) += pinctrl-pistachio.o
53- obj-$(CONFIG_PINCTRL_POLARFIRE_SOC) += pinctrl-mpfs-iomux0.o
5452obj-$(CONFIG_PINCTRL_RK805) += pinctrl-rk805.o
5553obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o
5654obj-$(CONFIG_PINCTRL_RP1) += pinctrl-rp1.o
@@ -76,6 +74,7 @@ obj-y += freescale/
7674obj-$(CONFIG_X86) += intel/
7775obj-y += mediatek/
7876obj-$(CONFIG_PINCTRL_MESON) += meson/
77+ obj-y += microchip/
7978obj-y += mvebu/
8079obj-y += nomadik/
8180obj-y += nuvoton/
Original file line number Diff line number Diff line change 1+ # SPDX-License-Identifier: GPL-2.0-only
2+
3+ config PINCTRL_PIC64GX
4+ bool "pic64gx gpio2 pinctrl driver"
5+ depends on ARCH_MICROCHIP || COMPILE_TEST
6+ depends on OF
7+ select GENERIC_PINCONF
8+ help
9+ This selects the pinctrl driver for gpio2 on pic64gx.
10+
11+ config PINCTRL_POLARFIRE_SOC
12+ bool "Polarfire SoC pinctrl driver"
13+ depends on ARCH_MICROCHIP || COMPILE_TEST
14+ depends on OF
15+ select GENERIC_PINCONF
16+ help
17+ This selects the pinctrl driver for Microchip Polarfire SoC.
Original file line number Diff line number Diff line change 1+ # SPDX-License-Identifier: GPL-2.0-only
2+
3+ obj-$(CONFIG_PINCTRL_PIC64GX) += pinctrl-pic64gx-gpio2.o
4+ obj-$(CONFIG_PINCTRL_POLARFIRE_SOC) += pinctrl-mpfs-iomux0.o
Original file line number Diff line number Diff line change 1515#include <linux/pinctrl/pinctrl.h>
1616#include <linux/pinctrl/pinmux.h>
1717
18- #include "core.h"
19- #include "pinctrl-utils.h"
20- #include "pinconf.h"
21- #include "pinmux.h"
18+ #include "../ core.h"
19+ #include "../ pinctrl-utils.h"
20+ #include "../ pinconf.h"
21+ #include "../ pinmux.h"
2222
2323#define MPFS_IOMUX0_REG 0x200
2424
Original file line number Diff line number Diff line change 1414#include <linux/pinctrl/pinctrl.h>
1515#include <linux/pinctrl/pinmux.h>
1616
17- #include "pinctrl-utils.h"
17+ #include "../ pinctrl-utils.h"
1818
1919#define PIC64GX_PINMUX_REG 0x0
2020
You can’t perform that action at this time.
0 commit comments