@@ -13688,9 +13688,10 @@ PIN CONTROLLER - RENESAS
M: Geert Uytterhoeven <geert+renesas@glider.be>
L: linux-renesas-soc@vger.kernel.org
S: Supported
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git sh-pfc
+T: git
+git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas
F: Documentation/devicetree/bindings/pinctrl/renesas,*
-F: drivers/pinctrl/sh-pfc/
+F: drivers/pinctrl/renesas/
PIN CONTROLLER - SAMSUNG
M: Tomasz Figa <tomasz.figa@gmail.com>
@@ -383,8 +383,8 @@ source "drivers/pinctrl/nomadik/Kconfig"
source "drivers/pinctrl/nuvoton/Kconfig"
source "drivers/pinctrl/pxa/Kconfig"
source "drivers/pinctrl/qcom/Kconfig"
+source "drivers/pinctrl/renesas/Kconfig"
source "drivers/pinctrl/samsung/Kconfig"
-source "drivers/pinctrl/sh-pfc/Kconfig"
source "drivers/pinctrl/spear/Kconfig"
source "drivers/pinctrl/sprd/Kconfig"
source "drivers/pinctrl/stm32/Kconfig"
@@ -59,8 +59,8 @@ obj-y += nomadik/
obj-$(CONFIG_ARCH_NPCM7XX) += nuvoton/
obj-$(CONFIG_PINCTRL_PXA) += pxa/
obj-$(CONFIG_ARCH_QCOM) += qcom/
+obj-$(CONFIG_PINCTRL_RENESAS) += renesas/
obj-$(CONFIG_PINCTRL_SAMSUNG) += samsung/
-obj-$(CONFIG_PINCTRL_SH_PFC) += sh-pfc/
obj-$(CONFIG_PINCTRL_SPEAR) += spear/
obj-y += sprd/
obj-$(CONFIG_PINCTRL_STM32) += stm32/
similarity index 99%
rename from drivers/pinctrl/sh-pfc/Kconfig
rename to drivers/pinctrl/renesas/Kconfig
@@ -5,7 +5,7 @@
menu "Renesas pinctrl drivers"
-config PINCTRL_SH_PFC
+config PINCTRL_RENESAS
bool "Renesas SoC pin control support" if COMPILE_TEST && !(ARCH_RENESAS || SUPERH)
default y if ARCH_RENESAS || SUPERH
select PINMUX
similarity index 96%
rename from drivers/pinctrl/sh-pfc/Makefile
rename to drivers/pinctrl/renesas/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_PINCTRL_SH_PFC) += core.o pinctrl.o
+obj-$(CONFIG_PINCTRL_RENESAS) += core.o pinctrl.o
obj-$(CONFIG_PINCTRL_SH_PFC_GPIO) += gpio.o
-obj-$(CONFIG_PINCTRL_PFC_EMEV2) += pfc-emev2.o
+obj-$(CONFIG_PINCTRL_PFC_EMEV2) += pfc-emev2.o
obj-$(CONFIG_PINCTRL_PFC_R8A73A4) += pfc-r8a73a4.o
obj-$(CONFIG_PINCTRL_PFC_R8A7740) += pfc-r8a7740.o
obj-$(CONFIG_PINCTRL_PFC_R8A7742) += pfc-r8a7790.o
similarity index 100%
rename from drivers/pinctrl/sh-pfc/core.c
rename to drivers/pinctrl/renesas/core.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/core.h
rename to drivers/pinctrl/renesas/core.h
similarity index 100%
rename from drivers/pinctrl/sh-pfc/gpio.c
rename to drivers/pinctrl/renesas/gpio.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-emev2.c
rename to drivers/pinctrl/renesas/pfc-emev2.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
rename to drivers/pinctrl/renesas/pfc-r8a73a4.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a7740.c
rename to drivers/pinctrl/renesas/pfc-r8a7740.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a77470.c
rename to drivers/pinctrl/renesas/pfc-r8a77470.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a7778.c
rename to drivers/pinctrl/renesas/pfc-r8a7778.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a7779.c
rename to drivers/pinctrl/renesas/pfc-r8a7779.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a7790.c
rename to drivers/pinctrl/renesas/pfc-r8a7790.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a7791.c
rename to drivers/pinctrl/renesas/pfc-r8a7791.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a7792.c
rename to drivers/pinctrl/renesas/pfc-r8a7792.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a7794.c
rename to drivers/pinctrl/renesas/pfc-r8a7794.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a77950.c
rename to drivers/pinctrl/renesas/pfc-r8a77950.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-r8a77951.c
rename to drivers/pinctrl/renesas/pfc-r8a77951.c
similarity index 99%
rename from drivers/pinctrl/sh-pfc/pfc-r8a7796.c
rename to drivers/pinctrl/renesas/pfc-r8a7796.c
@@ -4,7 +4,7 @@
*
* Copyright (C) 2016-2019 Renesas Electronics Corp.
*
- * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7795.c
+ * This file is based on the drivers/pinctrl/renesas/pfc-r8a7795.c
*
* R-Car Gen3 processor support - PFC hardware block.
*
similarity index 99%
rename from drivers/pinctrl/sh-pfc/pfc-r8a77965.c
rename to drivers/pinctrl/renesas/pfc-r8a77965.c
@@ -5,7 +5,7 @@
* Copyright (C) 2018 Jacopo Mondi <jacopo+renesas@jmondi.org>
* Copyright (C) 2016-2019 Renesas Electronics Corp.
*
- * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7796.c
+ * This file is based on the drivers/pinctrl/renesas/pfc-r8a7796.c
*
* R-Car Gen3 processor support - PFC hardware block.
*
similarity index 99%
rename from drivers/pinctrl/sh-pfc/pfc-r8a77970.c
rename to drivers/pinctrl/renesas/pfc-r8a77970.c
@@ -5,7 +5,7 @@
* Copyright (C) 2016 Renesas Electronics Corp.
* Copyright (C) 2017 Cogent Embedded, Inc. <source@cogentembedded.com>
*
- * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7795.c
+ * This file is based on the drivers/pinctrl/renesas/pfc-r8a7795.c
*
* R-Car Gen3 processor support - PFC hardware block.
*
similarity index 99%
rename from drivers/pinctrl/sh-pfc/pfc-r8a77980.c
rename to drivers/pinctrl/renesas/pfc-r8a77980.c
@@ -5,7 +5,7 @@
* Copyright (C) 2018 Renesas Electronics Corp.
* Copyright (C) 2018 Cogent Embedded, Inc.
*
- * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7795.c
+ * This file is based on the drivers/pinctrl/renesas/pfc-r8a7795.c
*
* R-Car Gen3 processor support - PFC hardware block.
*
similarity index 99%
rename from drivers/pinctrl/sh-pfc/pfc-r8a77990.c
rename to drivers/pinctrl/renesas/pfc-r8a77990.c
@@ -4,7 +4,7 @@
*
* Copyright (C) 2018-2019 Renesas Electronics Corp.
*
- * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7796.c
+ * This file is based on the drivers/pinctrl/renesas/pfc-r8a7796.c
*
* R8A7796 processor support - PFC hardware block.
*
similarity index 99%
rename from drivers/pinctrl/sh-pfc/pfc-r8a77995.c
rename to drivers/pinctrl/renesas/pfc-r8a77995.c
@@ -4,7 +4,7 @@
*
* Copyright (C) 2017 Renesas Electronics Corp.
*
- * This file is based on the drivers/pinctrl/sh-pfc/pfc-r8a7796.c
+ * This file is based on the drivers/pinctrl/renesas/pfc-r8a7796.c
*
* R-Car Gen3 processor support - PFC hardware block.
*
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7203.c
rename to drivers/pinctrl/renesas/pfc-sh7203.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7264.c
rename to drivers/pinctrl/renesas/pfc-sh7264.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7269.c
rename to drivers/pinctrl/renesas/pfc-sh7269.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh73a0.c
rename to drivers/pinctrl/renesas/pfc-sh73a0.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7720.c
rename to drivers/pinctrl/renesas/pfc-sh7720.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7722.c
rename to drivers/pinctrl/renesas/pfc-sh7722.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7723.c
rename to drivers/pinctrl/renesas/pfc-sh7723.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7724.c
rename to drivers/pinctrl/renesas/pfc-sh7724.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7734.c
rename to drivers/pinctrl/renesas/pfc-sh7734.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7757.c
rename to drivers/pinctrl/renesas/pfc-sh7757.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7785.c
rename to drivers/pinctrl/renesas/pfc-sh7785.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-sh7786.c
rename to drivers/pinctrl/renesas/pfc-sh7786.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pfc-shx3.c
rename to drivers/pinctrl/renesas/pfc-shx3.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pinctrl-rza1.c
rename to drivers/pinctrl/renesas/pinctrl-rza1.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pinctrl-rza2.c
rename to drivers/pinctrl/renesas/pinctrl-rza2.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pinctrl-rzn1.c
rename to drivers/pinctrl/renesas/pinctrl-rzn1.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/pinctrl.c
rename to drivers/pinctrl/renesas/pinctrl.c
similarity index 100%
rename from drivers/pinctrl/sh-pfc/sh_pfc.h
rename to drivers/pinctrl/renesas/sh_pfc.h
The drivers/pinctrl/sh-pfc subdirectory was originally created to group pin control drivers for various Renesas SuperH and SH-Mobile platforms. However, the name "sh-pfc" no longer reflects its contents, as the directory now contains pin control drivers for Renesas SuperH, ARM32, and ARM64 SoCs. Hence rename the subdirectory from drivers/pinctrl/sh-pfc to drivers/pinctrl/renesas, and the related Kconfig symbol from PINCTRL_SH_PFC to PINCTRL_RENESAS. Rename the git branch in MAINTAINERS, too, for consistency. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- MAINTAINERS | 5 +++-- drivers/pinctrl/Kconfig | 2 +- drivers/pinctrl/Makefile | 2 +- drivers/pinctrl/{sh-pfc => renesas}/Kconfig | 2 +- drivers/pinctrl/{sh-pfc => renesas}/Makefile | 4 ++-- drivers/pinctrl/{sh-pfc => renesas}/core.c | 0 drivers/pinctrl/{sh-pfc => renesas}/core.h | 0 drivers/pinctrl/{sh-pfc => renesas}/gpio.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-emev2.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a73a4.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7740.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77470.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7778.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7779.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7790.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7791.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7792.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7794.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77950.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77951.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7796.c | 2 +- drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77965.c | 2 +- drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77970.c | 2 +- drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77980.c | 2 +- drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77990.c | 2 +- drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77995.c | 2 +- drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7203.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7264.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7269.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh73a0.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7720.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7722.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7723.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7724.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7734.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7757.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7785.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7786.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pfc-shx3.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pinctrl-rza1.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pinctrl-rza2.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pinctrl-rzn1.c | 0 drivers/pinctrl/{sh-pfc => renesas}/pinctrl.c | 0 drivers/pinctrl/{sh-pfc => renesas}/sh_pfc.h | 0 44 files changed, 14 insertions(+), 13 deletions(-) rename drivers/pinctrl/{sh-pfc => renesas}/Kconfig (99%) rename drivers/pinctrl/{sh-pfc => renesas}/Makefile (96%) rename drivers/pinctrl/{sh-pfc => renesas}/core.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/core.h (100%) rename drivers/pinctrl/{sh-pfc => renesas}/gpio.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-emev2.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a73a4.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7740.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77470.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7778.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7779.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7790.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7791.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7792.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7794.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77950.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77951.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a7796.c (99%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77965.c (99%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77970.c (99%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77980.c (99%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77990.c (99%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-r8a77995.c (99%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7203.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7264.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7269.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh73a0.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7720.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7722.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7723.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7724.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7734.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7757.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7785.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-sh7786.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pfc-shx3.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pinctrl-rza1.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pinctrl-rza2.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pinctrl-rzn1.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/pinctrl.c (100%) rename drivers/pinctrl/{sh-pfc => renesas}/sh_pfc.h (100%)