Unverified Commit 92a1691b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-drivers-for-v5.20-tag1' of... 

Merge tag 'renesas-drivers-for-v5.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/drivers

Renesas driver updates for v5.20

  - Small fixes and improvements.

* tag 'renesas-drivers-for-v5.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  soc: renesas: rcar-sysc: Optimize rcar_sysc_area struct sizes
  soc: renesas: r8a779a0-sysc: Fix A2DP1 and A2CV[2357] PDR values

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 03c765b0 4f5bc54d

drivers/soc/renesas/r8a779a0-sysc.c

+5 −5
Original line number Diff line number Diff line
@@ -57,11 +57,11 @@ static struct rcar_gen4_sysc_area r8a779a0_areas[] __initdata = { 
	{ "a2cv6",	R8A779A0_PD_A2CV6, R8A779A0_PD_A3IR },

	{ "a2cn2",	R8A779A0_PD_A2CN2, R8A779A0_PD_A3IR },

	{ "a2imp23",	R8A779A0_PD_A2IMP23, R8A779A0_PD_A3IR },

	{ "a2dp1",	R8A779A0_PD_A2DP0, R8A779A0_PD_A3IR },

	{ "a2cv2",	R8A779A0_PD_A2CV0, R8A779A0_PD_A3IR },

	{ "a2cv3",	R8A779A0_PD_A2CV1, R8A779A0_PD_A3IR },

	{ "a2cv5",	R8A779A0_PD_A2CV4, R8A779A0_PD_A3IR },

	{ "a2cv7",	R8A779A0_PD_A2CV6, R8A779A0_PD_A3IR },

	{ "a2dp1",	R8A779A0_PD_A2DP1, R8A779A0_PD_A3IR },

	{ "a2cv2",	R8A779A0_PD_A2CV2, R8A779A0_PD_A3IR },

	{ "a2cv3",	R8A779A0_PD_A2CV3, R8A779A0_PD_A3IR },

	{ "a2cv5",	R8A779A0_PD_A2CV5, R8A779A0_PD_A3IR },

	{ "a2cv7",	R8A779A0_PD_A2CV7, R8A779A0_PD_A3IR },

	{ "a2cn1",	R8A779A0_PD_A2CN1, R8A779A0_PD_A3IR },

	{ "a1cnn0",	R8A779A0_PD_A1CNN0, R8A779A0_PD_A2CN0 },

	{ "a1cnn2",	R8A779A0_PD_A1CNN2, R8A779A0_PD_A2CN2 },

drivers/soc/renesas/rcar-gen4-sysc.h

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
struct rcar_gen4_sysc_area {

	const char *name;

	u8 pdr;			/* PDRn */

	int parent;		/* -1 if none */

	unsigned int flags;	/* See PD_* */

	s8 parent;		/* -1 if none */

	u8 flags;		/* See PD_* */

};



/*

drivers/soc/renesas/rcar-sysc.h

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ struct rcar_sysc_area { 
	u16 chan_offs;		/* Offset of PWRSR register for this area */

	u8 chan_bit;		/* Bit in PWR* (except for PWRUP in PWRSR) */

	u8 isr_bit;		/* Bit in SYSCI*R */

	int parent;		/* -1 if none */

	unsigned int flags;	/* See PD_* */

	s8 parent;		/* -1 if none */

	u8 flags;		/* See PD_* */

};