Commit 617385bb authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'renesas-pinctrl-for-v6.4-tag1' of... 

Merge tag 'renesas-pinctrl-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel

pinctrl: renesas: Updates for v6.4

  - Add pin groups for audio on R-Car V4H,
  - Drop support for the obsolete R-Car H3 ES1.* (R8A77950) SoC,
  - Miscellaneous fixes and improvements.
parents e0e8fbf8 9d7558ed

drivers/pinctrl/renesas/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ config PINCTRL_RENESAS 
	select PINCTRL_PFC_R8A7792 if ARCH_R8A7792

	select PINCTRL_PFC_R8A7793 if ARCH_R8A7793

	select PINCTRL_PFC_R8A7794 if ARCH_R8A7794

	select PINCTRL_PFC_R8A77950 if ARCH_R8A77950

	select PINCTRL_PFC_R8A77951 if ARCH_R8A77951

	select PINCTRL_PFC_R8A77960 if ARCH_R8A77960

	select PINCTRL_PFC_R8A77961 if ARCH_R8A77961
@@ -103,10 +102,6 @@ config PINCTRL_PFC_R8A7790 
	bool "pin control support for R-Car H2" if COMPILE_TEST

	select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A77950

	bool "pin control support for R-Car H3 ES1.x" if COMPILE_TEST

	select PINCTRL_SH_PFC



config PINCTRL_PFC_R8A77951

	bool "pin control support for R-Car H3 ES2.0+" if COMPILE_TEST

	select PINCTRL_SH_PFC

drivers/pinctrl/renesas/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ obj-$(CONFIG_PINCTRL_PFC_R8A7791) += pfc-r8a7791.o 
obj-$(CONFIG_PINCTRL_PFC_R8A7792)	+= pfc-r8a7792.o

obj-$(CONFIG_PINCTRL_PFC_R8A7793)	+= pfc-r8a7791.o

obj-$(CONFIG_PINCTRL_PFC_R8A7794)	+= pfc-r8a7794.o

obj-$(CONFIG_PINCTRL_PFC_R8A77950)	+= pfc-r8a77950.o

obj-$(CONFIG_PINCTRL_PFC_R8A77951)	+= pfc-r8a77951.o

obj-$(CONFIG_PINCTRL_PFC_R8A77960)	+= pfc-r8a7796.o

obj-$(CONFIG_PINCTRL_PFC_R8A77961)	+= pfc-r8a7796.o

drivers/pinctrl/renesas/core.c

+3 −38
Original line number Diff line number Diff line
@@ -573,23 +573,12 @@ static const struct of_device_id sh_pfc_of_table[] = { 
		.data = &r8a7794_pinmux_info,

	},

#endif

/*

 * Both r8a7795 entries must be present to make sanity checks work, but only

 * the first entry is actually used.

 * R-Car H3 ES1.x is matched using soc_device_match() instead.

 */

#ifdef CONFIG_PINCTRL_PFC_R8A77951

	{

		.compatible = "renesas,pfc-r8a7795",

		.data = &r8a77951_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A77950

	{

		.compatible = "renesas,pfc-r8a7795",

		.data = &r8a77950_pinmux_info,

	},

#endif

#ifdef CONFIG_PINCTRL_PFC_R8A77960

	{

		.compatible = "renesas,pfc-r8a7796",
@@ -1309,28 +1298,6 @@ static void __init sh_pfc_check_driver(const struct platform_driver *pdrv) 
static inline void sh_pfc_check_driver(struct platform_driver *pdrv) {}

#endif /* !DEBUG */



#ifdef CONFIG_OF

static const void *sh_pfc_quirk_match(void)

{

#ifdef CONFIG_PINCTRL_PFC_R8A77950

	const struct soc_device_attribute *match;

	static const struct soc_device_attribute quirks[] = {

		{

			.soc_id = "r8a7795", .revision = "ES1.*",

			.data = &r8a77950_pinmux_info,

		},

		{ /* sentinel */ }

	};



	match = soc_device_match(quirks);

	if (match)

		return match->data;

#endif /* CONFIG_PINCTRL_PFC_R8A77950 */



	return NULL;

}

#endif /* CONFIG_OF */



static int sh_pfc_probe(struct platform_device *pdev)

{

	const struct sh_pfc_soc_info *info;
@@ -1338,11 +1305,9 @@ static int sh_pfc_probe(struct platform_device *pdev) 
	int ret;



#ifdef CONFIG_OF

	if (pdev->dev.of_node) {

		info = sh_pfc_quirk_match();

		if (!info)

	if (pdev->dev.of_node)

		info = of_device_get_match_data(&pdev->dev);

	} else

	else

#endif

		info = (const void *)platform_get_device_id(pdev)->driver_data;

drivers/pinctrl/renesas/pfc-r8a77950.c

deleted100644 → 0
+0 −5947

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/pinctrl/renesas/pfc-r8a779a0.c

+0 −8
Original line number Diff line number Diff line
@@ -696,16 +696,8 @@ static const u16 pinmux_data[] = { 
	PINMUX_SINGLE(PCIE0_CLKREQ_N),



	PINMUX_SINGLE(AVB0_PHY_INT),

	PINMUX_SINGLE(AVB0_MAGIC),

	PINMUX_SINGLE(AVB0_MDC),

	PINMUX_SINGLE(AVB0_MDIO),

	PINMUX_SINGLE(AVB0_TXCREFCLK),



	PINMUX_SINGLE(AVB1_PHY_INT),

	PINMUX_SINGLE(AVB1_MAGIC),

	PINMUX_SINGLE(AVB1_MDC),

	PINMUX_SINGLE(AVB1_MDIO),

	PINMUX_SINGLE(AVB1_TXCREFCLK),



	PINMUX_SINGLE(AVB2_AVTP_PPS),

	PINMUX_SINGLE(AVB2_AVTP_CAPTURE),