Unverified Commit 33063e5a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Renesas driver updates for v6.4

  - Drop support for the obsolete R-Car H3 ES1.* (R8A77950) SoC,
  - Miscellaneous fixes and improvements.

* tag 'renesas-drivers-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  soc: renesas: Use "#ifdef" for single-symbol definition checks
  soc: renesas: pwc-rzv2m: drop of_match_ptr for ID table
  soc: renesas: mark OF related data as maybe unused
  soc: renesas: rmobile-sysc: Use of_fwnode_handle() helper
  soc: renesas: Remove r8a77950 arch
  soc: renesas: rcar-sysc: Remove R-Car H3 ES1.* handling

Link: https://lore.kernel.org/r/cover.1679907059.git.geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents eeac8ede 2653d5bf

drivers/soc/renesas/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -206,13 +206,6 @@ config ARCH_R8A77990 
	  This enables support for the Renesas R-Car E3 SoC.

	  This includes different gradings like R-Car E3e.



config ARCH_R8A77950

	bool "ARM64 Platform support for R-Car H3 ES1.x"

	select ARCH_RCAR_GEN3

	select SYSC_R8A7795

	help

	  This enables support for the Renesas R-Car H3 SoC (revision 1.x).



config ARCH_R8A77951

	bool "ARM64 Platform support for R-Car H3 ES2.0+"

	select ARCH_RCAR_GEN3

drivers/soc/renesas/pwc-rzv2m.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static struct platform_driver rzv2m_pwc_driver = { 
	.probe = rzv2m_pwc_probe,

	.driver = {

		.name = "rzv2m_pwc",

		.of_match_table = of_match_ptr(rzv2m_pwc_of_match),

		.of_match_table = rzv2m_pwc_of_match,

	},

};

module_platform_driver(rzv2m_pwc_driver);

drivers/soc/renesas/r8a7795-sysc.c

+0 −10
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ static struct rcar_sysc_area r8a7795_areas[] __initdata = { 
	{ "a3vp",	0x340, 0, R8A7795_PD_A3VP,	R8A7795_PD_ALWAYS_ON },

	{ "cr7",	0x240, 0, R8A7795_PD_CR7,	R8A7795_PD_ALWAYS_ON },

	{ "a3vc",	0x380, 0, R8A7795_PD_A3VC,	R8A7795_PD_ALWAYS_ON },

	/* A2VC0 exists on ES1.x only */

	{ "a2vc0",	0x3c0, 0, R8A7795_PD_A2VC0,	R8A7795_PD_A3VC },

	{ "a2vc1",	0x3c0, 1, R8A7795_PD_A2VC1,	R8A7795_PD_A3VC },

	{ "3dg-a",	0x100, 0, R8A7795_PD_3DG_A,	R8A7795_PD_ALWAYS_ON },

	{ "3dg-b",	0x100, 1, R8A7795_PD_3DG_B,	R8A7795_PD_3DG_A },
@@ -54,14 +52,10 @@ static struct rcar_sysc_area r8a7795_areas[] __initdata = { 
	 * Fixups for R-Car H3 revisions

	 */



#define HAS_A2VC0	BIT(0)		/* Power domain A2VC0 is present */

#define NO_EXTMASK	BIT(1)		/* Missing SYSCEXTMASK register */



static const struct soc_device_attribute r8a7795_quirks_match[] __initconst = {

	{

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

		.data = (void *)(HAS_A2VC0 | NO_EXTMASK),

	}, {

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

		.data = (void *)(NO_EXTMASK),

	},
@@ -77,10 +71,6 @@ static int __init r8a7795_sysc_init(void) 
	if (attr)

		quirks = (uintptr_t)attr->data;



	if (!(quirks & HAS_A2VC0))

		rcar_sysc_nullify(r8a7795_areas, ARRAY_SIZE(r8a7795_areas),

				  R8A7795_PD_A2VC0);



	if (quirks & NO_EXTMASK)

		r8a7795_sysc_info.extmask_val = 0;

drivers/soc/renesas/renesas-soc.c

+6 −8
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static const struct renesas_soc soc_shmobile_ag5 __initconst __maybe_unused = { 
};





static const struct of_device_id renesas_socs[] __initconst = {

static const struct of_device_id renesas_socs[] __initconst __maybe_unused = {

#ifdef CONFIG_ARCH_R7S72100

	{ .compatible = "renesas,r7s72100",	.data = &soc_rz_a1h },

#endif
@@ -330,10 +330,8 @@ static const struct of_device_id renesas_socs[] __initconst = { 
#ifdef CONFIG_ARCH_R8A7794

	{ .compatible = "renesas,r8a7794",	.data = &soc_rcar_e2 },

#endif

#if defined(CONFIG_ARCH_R8A77950) || defined(CONFIG_ARCH_R8A77951)

	{ .compatible = "renesas,r8a7795",	.data = &soc_rcar_h3 },

#endif

#ifdef CONFIG_ARCH_R8A77951

	{ .compatible = "renesas,r8a7795",	.data = &soc_rcar_h3 },

	{ .compatible = "renesas,r8a779m0",	.data = &soc_rcar_h3 },

	{ .compatible = "renesas,r8a779m1",	.data = &soc_rcar_h3 },

	{ .compatible = "renesas,r8a779m8",	.data = &soc_rcar_h3 },
@@ -375,20 +373,20 @@ static const struct of_device_id renesas_socs[] __initconst = { 
#ifdef CONFIG_ARCH_R8A779G0

	{ .compatible = "renesas,r8a779g0",	.data = &soc_rcar_v4h },

#endif

#if defined(CONFIG_ARCH_R9A07G043)

#ifdef CONFIG_ARCH_R9A07G043

#ifdef CONFIG_RISCV

	{ .compatible = "renesas,r9a07g043",	.data = &soc_rz_five },

#else

	{ .compatible = "renesas,r9a07g043",	.data = &soc_rz_g2ul },

#endif

#endif

#if defined(CONFIG_ARCH_R9A07G044)

#ifdef CONFIG_ARCH_R9A07G044

	{ .compatible = "renesas,r9a07g044",	.data = &soc_rz_g2l },

#endif

#if defined(CONFIG_ARCH_R9A07G054)

#ifdef CONFIG_ARCH_R9A07G054

	{ .compatible = "renesas,r9a07g054",	.data = &soc_rz_v2l },

#endif

#if defined(CONFIG_ARCH_R9A09G011)

#ifdef CONFIG_ARCH_R9A09G011

	{ .compatible = "renesas,r9a09g011",	.data = &soc_rz_v2m },

#endif

#ifdef CONFIG_ARCH_SH73A0

drivers/soc/renesas/rmobile-sysc.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static int __init rmobile_init_pm_domains(void) 
			break;

		}



		fwnode_dev_initialized(&np->fwnode, true);

		fwnode_dev_initialized(of_fwnode_handle(np), true);

	}



	put_special_pds();