pinctrl: sh-pfc: sh7372: Remove PFC support

Remove sh7372 PFC support as part of the sh7372 and Mackerel
legacy code removal.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig
index 3267e928beba17a64cc4b6c8deaab804ccec5231..8c4b3d391823e862f433a3189dc2ab323d8cec81 100644 (file)
--- a/drivers/pinctrl/sh-pfc/Kconfig
+++ b/drivers/pinctrl/sh-pfc/Kconfig
@@ -73,11 +73,6 @@ config PINCTRL_PFC_SH7269
        depends on GPIOLIB
        select PINCTRL_SH_PFC
 
-config PINCTRL_PFC_SH7372
-       def_bool y
-       depends on ARCH_SH7372
-       select PINCTRL_SH_PFC
-
 config PINCTRL_PFC_SH73A0
        def_bool y
        depends on ARCH_SH73A0

diff --git a/drivers/pinctrl/sh-pfc/Makefile b/drivers/pinctrl/sh-pfc/Makefile
index b66432f883e8907a78dbfca82bc64fe2e4b1f037..f4074e166bcf895bdf236e00a45c783ef2a6ee98 100644 (file)
--- a/drivers/pinctrl/sh-pfc/Makefile
+++ b/drivers/pinctrl/sh-pfc/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_PINCTRL_PFC_R8A7791)     += pfc-r8a7791.o
 obj-$(CONFIG_PINCTRL_PFC_SH7203)       += pfc-sh7203.o
 obj-$(CONFIG_PINCTRL_PFC_SH7264)       += pfc-sh7264.o
 obj-$(CONFIG_PINCTRL_PFC_SH7269)       += pfc-sh7269.o
-obj-$(CONFIG_PINCTRL_PFC_SH7372)       += pfc-sh7372.o
 obj-$(CONFIG_PINCTRL_PFC_SH73A0)       += pfc-sh73a0.o
 obj-$(CONFIG_PINCTRL_PFC_SH7720)       += pfc-sh7720.o
 obj-$(CONFIG_PINCTRL_PFC_SH7722)       += pfc-sh7722.o

diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
index b92057d72e3ddd934643057517fefbc1c526612c..a56280814a3f884b24a19b0fda2ae20ba3fe9ab0 100644 (file)
--- a/drivers/pinctrl/sh-pfc/core.c
+++ b/drivers/pinctrl/sh-pfc/core.c
@@ -481,12 +481,6 @@ static const struct of_device_id sh_pfc_of_table[] = {
                .data = &r8a7791_pinmux_info,
        },
 #endif
-#ifdef CONFIG_PINCTRL_PFC_SH7372
-       {
-               .compatible = "renesas,pfc-sh7372",
-               .data = &sh7372_pinmux_info,
-       },
-#endif
 #ifdef CONFIG_PINCTRL_PFC_SH73A0
        {
                .compatible = "renesas,pfc-sh73a0",
@@ -615,9 +609,6 @@ static const struct platform_device_id sh_pfc_id_table[] = {
 #ifdef CONFIG_PINCTRL_PFC_SH7269
        { "pfc-sh7269", (kernel_ulong_t)&sh7269_pinmux_info },
 #endif
-#ifdef CONFIG_PINCTRL_PFC_SH7372
-       { "pfc-sh7372", (kernel_ulong_t)&sh7372_pinmux_info },
-#endif
 #ifdef CONFIG_PINCTRL_PFC_SH73A0
        { "pfc-sh73a0", (kernel_ulong_t)&sh73a0_pinmux_info },
 #endif

diff --git a/drivers/pinctrl/sh-pfc/core.h b/drivers/pinctrl/sh-pfc/core.h
index 1998d13ef8b678bc6d906f21e624a86fea0009f9..6b59d63b9c01e7a6973a0aef1f2c05c18fb7c4d1 100644 (file)
--- a/drivers/pinctrl/sh-pfc/core.h
+++ b/drivers/pinctrl/sh-pfc/core.h
@@ -75,7 +75,6 @@ extern const struct sh_pfc_soc_info r8a7791_pinmux_info;
 extern const struct sh_pfc_soc_info sh7203_pinmux_info;
 extern const struct sh_pfc_soc_info sh7264_pinmux_info;
 extern const struct sh_pfc_soc_info sh7269_pinmux_info;
-extern const struct sh_pfc_soc_info sh7372_pinmux_info;
 extern const struct sh_pfc_soc_info sh73a0_pinmux_info;
 extern const struct sh_pfc_soc_info sh7720_pinmux_info;
 extern const struct sh_pfc_soc_info sh7722_pinmux_info;

diff --cc drivers/pinctrl/sh-pfc/pfc-sh7372.c
Simple merge