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

pinctrl: sh-pfc: Rename PINCTRL_PFC_R8A7796 to PINCTRL_PFC_R8A77960

Rename CONFIG_PINCTRL_PFC_R8A7796 for R-Car M3-W (R8A77960) to
CONFIG_PINCTRL_PFC_R8A77960, to avoid confusion with R-Car M3-W+
(R8A77961), which will use CONFIG_PINCTRL_PFC_R8A77961.

Extend the dependency of CONFIG_PINCTRL_PFC_R8A77960 from
CONFIG_ARCH_R8A7796 to CONFIG_ARCH_R8A77960, to relax dependencies for a
future rename of the SoC configuration symbol.

Rename r8a7796_pinmux_info to r8a77960_pinmux_info, as it contains an
r8a77960-based name.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/20191023122955.12420-3-geert+renesas@glider.be

Geert Uytterhoeven d15ca3a3 5ffce2f4

+8 -8
+2 -2
drivers/pinctrl/sh-pfc/Kconfig
··· 27 27 select PINCTRL_PFC_R8A7793 if ARCH_R8A7793 28 28 select PINCTRL_PFC_R8A7794 if ARCH_R8A7794 29 29 select PINCTRL_PFC_R8A7795 if ARCH_R8A7795 30 - select PINCTRL_PFC_R8A7796 if ARCH_R8A7796 30 + select PINCTRL_PFC_R8A77960 if ARCH_R8A77960 || ARCH_R8A7796 31 31 select PINCTRL_PFC_R8A77965 if ARCH_R8A77965 32 32 select PINCTRL_PFC_R8A77970 if ARCH_R8A77970 33 33 select PINCTRL_PFC_R8A77980 if ARCH_R8A77980 ··· 117 117 config PINCTRL_PFC_R8A7795 118 118 bool "R-Car H3 pin control support" if COMPILE_TEST 119 119 120 - config PINCTRL_PFC_R8A7796 120 + config PINCTRL_PFC_R8A77960 121 121 bool "R-Car M3-W pin control support" if COMPILE_TEST 122 122 123 123 config PINCTRL_PFC_R8A77965
+1 -1
drivers/pinctrl/sh-pfc/Makefile
··· 20 20 obj-$(CONFIG_PINCTRL_PFC_R8A7794) += pfc-r8a7794.o 21 21 obj-$(CONFIG_PINCTRL_PFC_R8A7795) += pfc-r8a7795.o 22 22 obj-$(CONFIG_PINCTRL_PFC_R8A7795) += pfc-r8a7795-es1.o 23 - obj-$(CONFIG_PINCTRL_PFC_R8A7796) += pfc-r8a7796.o 23 + obj-$(CONFIG_PINCTRL_PFC_R8A77960) += pfc-r8a7796.o 24 24 obj-$(CONFIG_PINCTRL_PFC_R8A77965) += pfc-r8a77965.o 25 25 obj-$(CONFIG_PINCTRL_PFC_R8A77970) += pfc-r8a77970.o 26 26 obj-$(CONFIG_PINCTRL_PFC_R8A77980) += pfc-r8a77980.o
+2 -2
drivers/pinctrl/sh-pfc/core.c
··· 581 581 }, 582 582 #endif /* DEBUG */ 583 583 #endif 584 - #ifdef CONFIG_PINCTRL_PFC_R8A7796 584 + #ifdef CONFIG_PINCTRL_PFC_R8A77960 585 585 { 586 586 .compatible = "renesas,pfc-r8a7796", 587 - .data = &r8a7796_pinmux_info, 587 + .data = &r8a77960_pinmux_info, 588 588 }, 589 589 #endif 590 590 #ifdef CONFIG_PINCTRL_PFC_R8A77965
+2 -2
drivers/pinctrl/sh-pfc/pfc-r8a7796.c
··· 6210 6210 }; 6211 6211 #endif 6212 6212 6213 - #ifdef CONFIG_PINCTRL_PFC_R8A7796 6214 - const struct sh_pfc_soc_info r8a7796_pinmux_info = { 6213 + #ifdef CONFIG_PINCTRL_PFC_R8A77960 6214 + const struct sh_pfc_soc_info r8a77960_pinmux_info = { 6215 6215 .name = "r8a77960_pfc", 6216 6216 .ops = &r8a7796_pinmux_ops, 6217 6217 .unlock_reg = 0xe6060000, /* PMMR */
+1 -1
drivers/pinctrl/sh-pfc/sh_pfc.h
··· 320 320 extern const struct sh_pfc_soc_info r8a7794_pinmux_info; 321 321 extern const struct sh_pfc_soc_info r8a7795_pinmux_info; 322 322 extern const struct sh_pfc_soc_info r8a7795es1_pinmux_info; 323 - extern const struct sh_pfc_soc_info r8a7796_pinmux_info; 323 + extern const struct sh_pfc_soc_info r8a77960_pinmux_info; 324 324 extern const struct sh_pfc_soc_info r8a77965_pinmux_info; 325 325 extern const struct sh_pfc_soc_info r8a77970_pinmux_info; 326 326 extern const struct sh_pfc_soc_info r8a77980_pinmux_info;