Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70bf439a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-fixes-for-v5.0' of... 

Merge tag 'renesas-fixes-for-v5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes

Renesas ARM Based SoC Fixes for v5.0

Renesas SoCs:
* Fix build regressions caused by move of Kconfig symbols

RZ/G2E (r8a774c0) SoC:
* Correct initialization order of 3DG-{A,B} in SYSC driver

* tag 'renesas-fixes-for-v5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  soc: renesas: r8a774c0-sysc: Fix initialization order of 3DG-{A,B}
  ARM: shmobile: fix build regressions

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bfeffd15 a6459722

drivers/soc/renesas/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ config ARCH_RZN1 
	bool

	bool

	select ARM_AMBA

	select ARM_AMBA





if ARM

if ARM && ARCH_RENESAS





#comment "Renesas ARM SoCs System Type"

#comment "Renesas ARM SoCs System Type"

drivers/soc/renesas/r8a774c0-sysc.c

+4 −19
Original line number Original line Diff line number Diff line
@@ -28,19 +28,6 @@ static struct rcar_sysc_area r8a774c0_areas[] __initdata = { 
	{ "3dg-b",	0x100, 1, R8A774C0_PD_3DG_B,	R8A774C0_PD_3DG_A },

	{ "3dg-b",	0x100, 1, R8A774C0_PD_3DG_B,	R8A774C0_PD_3DG_A },

};

};





static void __init rcar_sysc_fix_parent(struct rcar_sysc_area *areas,

					unsigned int num_areas, u8 id,

					int new_parent)

{

	unsigned int i;



	for (i = 0; i < num_areas; i++)

		if (areas[i].isr_bit == id) {

			areas[i].parent = new_parent;

			return;

		}

}



/* Fixups for RZ/G2E ES1.0 revision */

/* Fixups for RZ/G2E ES1.0 revision */

static const struct soc_device_attribute r8a774c0[] __initconst = {

static const struct soc_device_attribute r8a774c0[] __initconst = {

	{ .soc_id = "r8a774c0", .revision = "ES1.0" },

	{ .soc_id = "r8a774c0", .revision = "ES1.0" },
@@ -50,12 +37,10 @@ static const struct soc_device_attribute r8a774c0[] __initconst = { 
static int __init r8a774c0_sysc_init(void)

static int __init r8a774c0_sysc_init(void)

{

{

	if (soc_device_match(r8a774c0)) {

	if (soc_device_match(r8a774c0)) {

		rcar_sysc_fix_parent(r8a774c0_areas,

		/* Fix incorrect 3DG hierarchy */

				     ARRAY_SIZE(r8a774c0_areas),

		swap(r8a774c0_areas[6], r8a774c0_areas[7]);

				     R8A774C0_PD_3DG_A, R8A774C0_PD_3DG_B);

		r8a774c0_areas[6].parent = R8A774C0_PD_ALWAYS_ON;

		rcar_sysc_fix_parent(r8a774c0_areas,

		r8a774c0_areas[7].parent = R8A774C0_PD_3DG_B;

				     ARRAY_SIZE(r8a774c0_areas),

				     R8A774C0_PD_3DG_B, R8A774C0_PD_ALWAYS_ON);

	}

	}





	return 0;

	return 0;