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

Commit f0aa411d authored by Simon Horman's avatar Simon Horman
Browse files

Merge branch 'rcar-sysc-for-v4.8' into HEAD

parents c94bc815 ced42730

Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Required properties: 
      - "renesas,r8a7793-sysc" (R-Car M2-N)

      - "renesas,r8a7794-sysc" (R-Car E2)

      - "renesas,r8a7795-sysc" (R-Car H3)

      - "renesas,r8a7796-sysc" (R-Car M3-W)

  - reg: Address start and address range for the device.

  - #power-domain-cells: Must be 1.

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

+1 −5
Original line number Diff line number Diff line
@@ -23,11 +23,7 @@ 


static void __init r8a7779_sysc_init(void)

{

	void __iomem *base = rcar_sysc_init(0xffd85000);



	/* enable all interrupt sources, but do not use interrupt handler */

	iowrite32(0x0131000e, base + SYSCIER);

	iowrite32(0, base + SYSCIMR);

	rcar_sysc_init(0xffd85000, 0x0131000e);

}



#else /* CONFIG_PM || CONFIG_SMP */

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

+1 −5
Original line number Diff line number Diff line
@@ -36,11 +36,7 @@ 


static void __init rcar_gen2_sysc_init(u32 syscier)

{

	void __iomem *base = rcar_sysc_init(0xe6180000);



	/* enable all interrupt sources, but do not use interrupt handler */

	iowrite32(syscier, base + SYSCIER);

	iowrite32(0, base + SYSCIMR);

	rcar_sysc_init(0xe6180000, syscier);

}



#else /* CONFIG_SMP */

drivers/soc/renesas/Makefile

+2 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_ARCH_R8A7779)	+= rcar-sysc.o r8a7779-sysc.o

obj-$(CONFIG_ARCH_R8A7790)	+= rcar-sysc.o r8a7790-sysc.o

obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o r8a7791-sysc.o

obj-$(CONFIG_ARCH_R8A7792)	+= rcar-sysc.o r8a7792-sysc.o

# R-Car M2-N is identical to R-Car M2-W w.r.t. power domains.

obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o r8a7791-sysc.o

obj-$(CONFIG_ARCH_R8A7794)	+= rcar-sysc.o r8a7794-sysc.o

obj-$(CONFIG_ARCH_R8A7795)	+= rcar-sysc.o r8a7795-sysc.o

obj-$(CONFIG_ARCH_R8A7796)	+= rcar-sysc.o r8a7796-sysc.o

drivers/soc/renesas/r8a7792-sysc.c

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * Renesas R-Car V2H (R8A7792) System Controller

 *

 * Copyright (C) 2016 Cogent Embedded Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; version 2 of the License.

 */



#include <linux/bug.h>

#include <linux/init.h>

#include <linux/kernel.h>



#include <dt-bindings/power/r8a7792-sysc.h>



#include "rcar-sysc.h"



static const struct rcar_sysc_area r8a7792_areas[] __initconst = {

	{ "always-on",	    0, 0, R8A7792_PD_ALWAYS_ON,	-1, PD_ALWAYS_ON },

	{ "ca15-scu",	0x180, 0, R8A7792_PD_CA15_SCU,	R8A7792_PD_ALWAYS_ON,

	  PD_SCU },

	{ "ca15-cpu0",	 0x40, 0, R8A7792_PD_CA15_CPU0,	R8A7792_PD_CA15_SCU,

	  PD_CPU_NOCR },

	{ "ca15-cpu1",	 0x40, 1, R8A7792_PD_CA15_CPU1,	R8A7792_PD_CA15_SCU,

	  PD_CPU_NOCR },

	{ "sgx",	 0xc0, 0, R8A7792_PD_SGX,	R8A7792_PD_ALWAYS_ON },

	{ "imp",	0x140, 0, R8A7792_PD_IMP,	R8A7792_PD_ALWAYS_ON },

};



const struct rcar_sysc_info r8a7792_sysc_info __initconst = {

	.areas = r8a7792_areas,

	.num_areas = ARRAY_SIZE(r8a7792_areas),

};