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

Commit d319fc6d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-r8a7745-sysc-for-v4.10' of... 

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

Pull "Renesas ARM Based SoC r8a7745 SYSC Driver Updates for v4.10" from Simon Horman:

* Add support for the r8a7745 SoC to rcar-sysc

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

:
  soc: renesas: rcar-sysc: add R8A7745 support
  ARM: shmobile: r8a7745: add power domain index macros

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2aa488a6 141723e0

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ and various coprocessors. 
Required properties:

Required properties:

  - compatible: Must contain exactly one of the following:

  - compatible: Must contain exactly one of the following:

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

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

      - "renesas,r8a7745-sysc" (RZ/G1E)

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

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

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

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

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

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

drivers/soc/renesas/Makefile

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

obj-$(CONFIG_ARCH_R8A7743)	+= rcar-sysc.o r8a7743-sysc.o

obj-$(CONFIG_ARCH_R8A7745)	+= rcar-sysc.o r8a7745-sysc.o

obj-$(CONFIG_ARCH_R8A7779)	+= rcar-sysc.o r8a7779-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_R8A7790)	+= rcar-sysc.o r8a7790-sysc.o

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

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

drivers/soc/renesas/r8a7745-sysc.c

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

 * Renesas RZ/G1E 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/r8a7745-sysc.h>



#include "rcar-sysc.h"



static const struct rcar_sysc_area r8a7745_areas[] __initconst = {

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

	{ "ca7-scu",	0x100, 0, R8A7745_PD_CA7_SCU,	R8A7745_PD_ALWAYS_ON,

	  PD_SCU },

	{ "ca7-cpu0",	0x1c0, 0, R8A7745_PD_CA7_CPU0,	R8A7745_PD_CA7_SCU,

	  PD_CPU_NOCR },

	{ "ca7-cpu1",	0x1c0, 1, R8A7745_PD_CA7_CPU1,	R8A7745_PD_CA7_SCU,

	  PD_CPU_NOCR },

	{ "sgx",	 0xc0, 0, R8A7745_PD_SGX,	R8A7745_PD_ALWAYS_ON },

};



const struct rcar_sysc_info r8a7745_sysc_info __initconst = {

	.areas = r8a7745_areas,

	.num_areas = ARRAY_SIZE(r8a7745_areas),

};

drivers/soc/renesas/rcar-sysc.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -278,6 +278,9 @@ static const struct of_device_id rcar_sysc_matches[] = { 
#ifdef CONFIG_ARCH_R8A7743

#ifdef CONFIG_ARCH_R8A7743

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

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

#endif

#endif

#ifdef CONFIG_ARCH_R8A7745

	{ .compatible = "renesas,r8a7745-sysc", .data = &r8a7745_sysc_info },

#endif

#ifdef CONFIG_ARCH_R8A7779

#ifdef CONFIG_ARCH_R8A7779

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

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

#endif

#endif

drivers/soc/renesas/rcar-sysc.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -51,6 +51,7 @@ struct rcar_sysc_info { 
};

};





extern const struct rcar_sysc_info r8a7743_sysc_info;

extern const struct rcar_sysc_info r8a7743_sysc_info;

extern const struct rcar_sysc_info r8a7745_sysc_info;

extern const struct rcar_sysc_info r8a7779_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 r8a7790_sysc_info;

extern const struct rcar_sysc_info r8a7791_sysc_info;

extern const struct rcar_sysc_info r8a7791_sysc_info;