tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Conor Dooley and committed by
Linus Walleij 95c1762a 84340785

+30 -25
+2 -2
MAINTAINERS
··· 22472 22472 F: drivers/i2c/busses/i2c-microchip-corei2c.c 22473 22473 F: drivers/mailbox/mailbox-mpfs.c 22474 22474 F: 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 22477 22477 F: drivers/pwm/pwm-microchip-core.c 22478 22478 F: drivers/reset/reset-mpfs.c 22479 22479 F: drivers/rtc/rtc-mpfs.c
+1 -16
drivers/pinctrl/Kconfig
··· 486 486 def_bool y if PIC32MZDA 487 487 select PINCTRL_PIC32 488 488 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 - 497 489 config PINCTRL_PISTACHIO 498 490 bool "IMG Pistachio SoC pinctrl driver" 499 491 depends on OF && (MIPS || COMPILE_TEST) ··· 496 504 select OF_GPIO 497 505 help 498 506 This support pinctrl and GPIO driver for IMG Pistachio SoC. 499 - 500 - config PINCTRL_POLARFIRE_SOC 501 - bool "Polarfire SoC pinctrl driver" 502 - depends on ARCH_MICROCHIP || COMPILE_TEST 503 - depends on OF 504 - select GENERIC_PINCONF 505 - help 506 - This selects the pinctrl driver for Microchip Polarfire SoC. 507 507 508 508 config PINCTRL_RK805 509 509 tristate "Pinctrl and GPIO driver for RK805 PMIC" ··· 691 707 source "drivers/pinctrl/intel/Kconfig" 692 708 source "drivers/pinctrl/mediatek/Kconfig" 693 709 source "drivers/pinctrl/meson/Kconfig" 710 + source "drivers/pinctrl/microchip/Kconfig" 694 711 source "drivers/pinctrl/mvebu/Kconfig" 695 712 source "drivers/pinctrl/nomadik/Kconfig" 696 713 source "drivers/pinctrl/nuvoton/Kconfig"
+1 -2
drivers/pinctrl/Makefile
··· 48 48 obj-$(CONFIG_PINCTRL_PALMAS) += pinctrl-palmas.o 49 49 obj-$(CONFIG_PINCTRL_PEF2256) += pinctrl-pef2256.o 50 50 obj-$(CONFIG_PINCTRL_PIC32) += pinctrl-pic32.o 51 - obj-$(CONFIG_PINCTRL_PIC64GX) += pinctrl-pic64gx-gpio2.o 52 51 obj-$(CONFIG_PINCTRL_PISTACHIO) += pinctrl-pistachio.o 53 - obj-$(CONFIG_PINCTRL_POLARFIRE_SOC) += pinctrl-mpfs-iomux0.o 54 52 obj-$(CONFIG_PINCTRL_RK805) += pinctrl-rk805.o 55 53 obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o 56 54 obj-$(CONFIG_PINCTRL_RP1) += pinctrl-rp1.o ··· 74 76 obj-$(CONFIG_X86) += intel/ 75 77 obj-y += mediatek/ 76 78 obj-$(CONFIG_PINCTRL_MESON) += meson/ 79 + obj-y += microchip/ 77 80 obj-y += mvebu/ 78 81 obj-y += nomadik/ 79 82 obj-y += nuvoton/
+17
drivers/pinctrl/microchip/Kconfig
··· 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.
+4
drivers/pinctrl/microchip/Makefile
··· 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
+4 -4
drivers/pinctrl/pinctrl-mpfs-iomux0.c drivers/pinctrl/microchip/pinctrl-mpfs-iomux0.c
··· 15 15 #include <linux/pinctrl/pinctrl.h> 16 16 #include <linux/pinctrl/pinmux.h> 17 17 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" 22 22 23 23 #define MPFS_IOMUX0_REG 0x200 24 24
+1 -1
drivers/pinctrl/pinctrl-pic64gx-gpio2.c drivers/pinctrl/microchip/pinctrl-pic64gx-gpio2.c
··· 14 14 #include <linux/pinctrl/pinctrl.h> 15 15 #include <linux/pinctrl/pinmux.h> 16 16 17 - #include "pinctrl-utils.h" 17 + #include "../pinctrl-utils.h" 18 18 19 19 #define PIC64GX_PINMUX_REG 0x0 20 20