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

Commit 319b15df authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files

ARM: shmobile: rcar-gen2: Remove explicit SYSC config and init 



If the R-Car system controller is described in DT, the rcar-sysc driver
configures SYSCIER and SYSCIMR based on the SoC-specific power area
definitions in r8a779*-sysc.  The platform code still passed this
information to the rcar-sysc driver, for compatibility with old R-Car H2
and M2-W DTBs predating commit 8574de86 ("ARM: dts: r8a7791: Add
SYSC PM Domains") in v4.7.  The time has come to drop backwards
compatibility, and delegate everything to the DT enabled rcar-sysc
driver.

After the removal of the legacy SMP fallbacks, which powered up the SCUs
explicitly, there is no longer a need to force an early initialization
of the rcar-sysc driver.  It will be initialized in time for secondary
CPU bringup by its early_initcall().

Hence all explicit SYSC configuration and initialization can be removed
from the R-Car Gen2 platform code.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 3bf6d773

arch/arm/mach-shmobile/pm-rcar-gen2.c

+0 −25
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/smp.h>

#include <linux/soc/renesas/rcar-sysc.h>

#include <asm/io.h>

#include <asm/cputype.h>

#include "common.h"
@@ -46,23 +45,6 @@ static inline u32 phys_to_sbar(phys_addr_t addr) 
	return (addr >> 8) & 0xfffffc00;

}



/* SYSC */

#define SYSCIER 0x0c

#define SYSCIMR 0x10



#if defined(CONFIG_SMP)



static void __init rcar_gen2_sysc_init(u32 syscier)

{

	rcar_sysc_init(0xe6180000, syscier);

}



#else /* CONFIG_SMP */



static inline void rcar_gen2_sysc_init(u32 syscier) {}



#endif /* CONFIG_SMP */



void __init rcar_gen2_pm_init(void)

{

	void __iomem *p;
@@ -72,7 +54,6 @@ void __init rcar_gen2_pm_init(void) 
	bool has_a7 = false;

	bool has_a15 = false;

	struct resource res;

	u32 syscier = 0;

	int error;



	if (once++)
@@ -89,11 +70,6 @@ void __init rcar_gen2_pm_init(void) 
			has_a7 = true;

	}



	if (of_machine_is_compatible("renesas,r8a7790"))

		syscier = 0x013111ef;

	else if (of_machine_is_compatible("renesas,r8a7791"))

		syscier = 0x00111003;



	np = of_find_compatible_node(NULL, NULL, "renesas,smp-sram");

	if (!np) {

		/* No smp-sram in DT, fall back to hardcoded address */
@@ -155,6 +131,5 @@ void __init rcar_gen2_pm_init(void) 
	}

	iounmap(p);



	rcar_gen2_sysc_init(syscier);

	shmobile_smp_apmu_suspend_init();

}