Commit 17ef34e9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'renesas/rcar-sysc' into next/dt64 

This is needed to work around another failure with "make dtbs":

In file included from ../arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts:12:0:
arch/arm64/boot/dts/renesas/r8a7796.dtsi:13:44: fatal error: dt-bindings/power/r8a7796-sysc.h: No such file or directory

* renesas/rcar-sysc:
  soc: renesas: rcar-sysc: Add support for R-Car M3-W power areas
  soc: renesas: Add r8a7796 SYSC PM Domain Binding Definitions
  soc: renesas: rcar-sysc: Document r8a7796 support
parents 8ebe624a e0c98b91

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.

drivers/soc/renesas/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ obj-$(CONFIG_ARCH_R8A7791) += rcar-sysc.o r8a7791-sysc.o 
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/r8a7796-sysc.c

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

 * Renesas R-Car M3-W System Controller

 *

 * Copyright (C) 2016 Glider bvba

 *

 * 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/kernel.h>



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



#include "rcar-sysc.h"



static const struct rcar_sysc_area r8a7796_areas[] __initconst = {

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

	{ "ca57-scu",	0x1c0, 0, R8A7796_PD_CA57_SCU,	R8A7796_PD_ALWAYS_ON,

	  PD_SCU },

	{ "ca57-cpu0",	 0x80, 0, R8A7796_PD_CA57_CPU0,	R8A7796_PD_CA57_SCU,

	  PD_CPU_NOCR },

	{ "ca57-cpu1",	 0x80, 1, R8A7796_PD_CA57_CPU1,	R8A7796_PD_CA57_SCU,

	  PD_CPU_NOCR },

	{ "ca53-scu",	0x140, 0, R8A7796_PD_CA53_SCU,	R8A7796_PD_ALWAYS_ON,

	  PD_SCU },

	{ "ca53-cpu0",	0x200, 0, R8A7796_PD_CA53_CPU0,	R8A7796_PD_CA53_SCU,

	  PD_CPU_NOCR },

	{ "ca53-cpu1",	0x200, 1, R8A7796_PD_CA53_CPU1,	R8A7796_PD_CA53_SCU,

	  PD_CPU_NOCR },

	{ "ca53-cpu2",	0x200, 2, R8A7796_PD_CA53_CPU2,	R8A7796_PD_CA53_SCU,

	  PD_CPU_NOCR },

	{ "ca53-cpu3",	0x200, 3, R8A7796_PD_CA53_CPU3,	R8A7796_PD_CA53_SCU,

	  PD_CPU_NOCR },

	{ "cr7",	0x240, 0, R8A7796_PD_CR7,	R8A7796_PD_ALWAYS_ON },

	{ "a3vc",	0x380, 0, R8A7796_PD_A3VC,	R8A7796_PD_ALWAYS_ON },

	{ "a2vc0",	0x3c0, 0, R8A7796_PD_A2VC0,	R8A7796_PD_A3VC },

	{ "a2vc1",	0x3c0, 1, R8A7796_PD_A2VC1,	R8A7796_PD_A3VC },

	{ "3dg-a",	0x100, 0, R8A7796_PD_3DG_A,	R8A7796_PD_ALWAYS_ON },

	{ "3dg-b",	0x100, 1, R8A7796_PD_3DG_B,	R8A7796_PD_3DG_A },

	{ "a3ir",	0x180, 0, R8A7796_PD_A3IR,	R8A7796_PD_ALWAYS_ON },

};



const struct rcar_sysc_info r8a7796_sysc_info __initconst = {

	.areas = r8a7796_areas,

	.num_areas = ARRAY_SIZE(r8a7796_areas),

};

drivers/soc/renesas/rcar-sysc.c

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

#ifdef CONFIG_ARCH_R8A7795

	{ .compatible = "renesas,r8a7795-sysc", .data = &r8a7795_sysc_info },

#endif

#ifdef CONFIG_ARCH_R8A7796

	{ .compatible = "renesas,r8a7796-sysc", .data = &r8a7796_sysc_info },

#endif

	{ /* sentinel */ }

};

drivers/soc/renesas/rcar-sysc.h

+1 −0
Original line number Diff line number Diff line
@@ -55,4 +55,5 @@ extern const struct rcar_sysc_info r8a7790_sysc_info; 
extern const struct rcar_sysc_info r8a7791_sysc_info;

extern const struct rcar_sysc_info r8a7794_sysc_info;

extern const struct rcar_sysc_info r8a7795_sysc_info;

extern const struct rcar_sysc_info r8a7796_sysc_info;

#endif /* __SOC_RENESAS_RCAR_SYSC_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE