Commit 26aec1f4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-drivers-for-v4.10' of... 

Merge tag 'renesas-drivers-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers

Renesas ARM Based SoC Drivers Updates for v4.10

* Add support for the r8a7743 SoC to rcar-sysc

* tag 'renesas-drivers-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  soc: renesas: rcar-sysc: add R8A7743 support
  ARM: shmobile: r8a7743: add power domain index macros

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 07d9a380 603311ba

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

+4 −3
Original line number Diff line number Diff line 
DT bindings for the Renesas R-Car System Controller

DT bindings for the Renesas R-Car (RZ/G) System Controller



== System Controller Node ==



The R-Car System Controller provides power management for the CPU cores and

various coprocessors.

The R-Car (RZ/G) System Controller provides power management for the CPU cores

and various coprocessors.



Required properties:

  - compatible: Must contain exactly one of the following:

      - "renesas,r8a7743-sysc" (RZ/G1M)

      - "renesas,r8a7779-sysc" (R-Car H1)

      - "renesas,r8a7790-sysc" (R-Car H2)

      - "renesas,r8a7791-sysc" (R-Car M2-W)

drivers/soc/renesas/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_ARCH_R8A7743)	+= rcar-sysc.o r8a7743-sysc.o

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

drivers/soc/renesas/r8a7743-sysc.c

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

 * Renesas RZ/G1M 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 version 2 as

 * published by the Free Software Foundation; of the License.

 */



#include <linux/bug.h>

#include <linux/kernel.h>



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



#include "rcar-sysc.h"



static const struct rcar_sysc_area r8a7743_areas[] __initconst = {

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

	{ "ca15-scu",	0x180, 0, R8A7743_PD_CA15_SCU,	R8A7743_PD_ALWAYS_ON,

	  PD_SCU },

	{ "ca15-cpu0",	 0x40, 0, R8A7743_PD_CA15_CPU0,	R8A7743_PD_CA15_SCU,

	  PD_CPU_NOCR },

	{ "ca15-cpu1",	 0x40, 1, R8A7743_PD_CA15_CPU1,	R8A7743_PD_CA15_SCU,

	  PD_CPU_NOCR },

	{ "sgx",	 0xc0, 0, R8A7743_PD_SGX,	R8A7743_PD_ALWAYS_ON },

};



const struct rcar_sysc_info r8a7743_sysc_info __initconst = {

	.areas = r8a7743_areas,

	.num_areas = ARRAY_SIZE(r8a7743_areas),

};

drivers/soc/renesas/rcar-sysc.c

+3 −0
Original line number Diff line number Diff line
@@ -275,6 +275,9 @@ finalize: 
}



static const struct of_device_id rcar_sysc_matches[] = {

#ifdef CONFIG_ARCH_R8A7743

	{ .compatible = "renesas,r8a7743-sysc", .data = &r8a7743_sysc_info },

#endif

#ifdef CONFIG_ARCH_R8A7779

	{ .compatible = "renesas,r8a7779-sysc", .data = &r8a7779_sysc_info },

#endif

drivers/soc/renesas/rcar-sysc.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ struct rcar_sysc_info { 
	unsigned int num_areas;

};



extern const struct rcar_sysc_info r8a7743_sysc_info;

extern const struct rcar_sysc_info r8a7779_sysc_info;

extern const struct rcar_sysc_info r8a7790_sysc_info;

extern const struct rcar_sysc_info r8a7791_sysc_info;

CRA Git | Maintained and supported by SUSTech CRA and CCSE