Commit 16acd53b authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files

ARM: shmobile: r8a7779: Remove explicit SYSC config and init 



If the R-Car H1 system controller is described in DT, the rcar-sysc
driver configures SYSCIER and SYSCIMR based on the SoC-specific power
area definitions in r8a7779-sysc.  The platform code still passed this
information to the rcar-sysc driver, for compatibility with old DTBs
predating commit b2df3aa4 ("ARM: dts: r8a7779: 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 stopping powering down secondary CPUs during early boot, 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 H1 platform code.

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

arch/arm/mach-shmobile/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o 
obj-$(CONFIG_ARCH_R8A73A4)	+= setup-r8a73a4.o

obj-$(CONFIG_ARCH_R8A7740)	+= setup-r8a7740.o

obj-$(CONFIG_ARCH_R8A7778)	+= setup-r8a7778.o

obj-$(CONFIG_ARCH_R8A7779)	+= setup-r8a7779.o pm-r8a7779.o

obj-$(CONFIG_ARCH_R8A7779)	+= setup-r8a7779.o

obj-$(CONFIG_ARCH_EMEV2)	+= setup-emev2.o

obj-$(CONFIG_ARCH_R7S72100)	+= setup-r7s72100.o

arch/arm/mach-shmobile/pm-r8a7779.c

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
/*

 * r8a7779 Power management support

 *

 * Copyright (C) 2011  Renesas Solutions Corp.

 * Copyright (C) 2011  Magnus Damm

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */



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



#include <asm/io.h>



#include "r8a7779.h"



/* SYSC */

#define SYSCIER 0x0c

#define SYSCIMR 0x10



#if defined(CONFIG_PM) || defined(CONFIG_SMP)



static void __init r8a7779_sysc_init(void)

{

	rcar_sysc_init(0xffd85000, 0x0131000e);

}



#else /* CONFIG_PM || CONFIG_SMP */



static inline void r8a7779_sysc_init(void) {}



#endif /* CONFIG_PM || CONFIG_SMP */



void __init r8a7779_pm_init(void)

{

	static int once;



	if (!once++)

		r8a7779_sysc_init();

}

arch/arm/mach-shmobile/r8a7779.h

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
#ifndef __ASM_R8A7779_H__

#define __ASM_R8A7779_H__



extern void r8a7779_pm_init(void);



extern const struct smp_operations r8a7779_smp_ops;



#endif /* __ASM_R8A7779_H__ */

arch/arm/mach-shmobile/smp-r8a7779.c

+0 −2
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus) 


	/* setup r8a7779 specific SCU bits */

	shmobile_smp_scu_prepare_cpus(R8A7779_SCU_BASE, max_cpus);



	r8a7779_pm_init();

}



#ifdef CONFIG_HOTPLUG_CPU

CRA Git | Maintained and supported by SUSTech CRA and CCSE