Commit 4b367f2e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "Renesas ARM Based SoC Drivers Updates for v4.15" from Simon Horman:

Add basic support for R-Car V3M (R8A77970) SoC.

Sergei Shtylyov says:

* Add support for R-Car V3M (R8A77970) SoC power areas to the R-Car SYSC
  driver

* Add support for identifying the R-Car V3M (R8A77970) SoC

* Add support for R-Car V3M (R8A77970) to the R-Car RST driver -- this
  driver is  needed  for the clock driver to work

* tag 'renesas-drivers-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  soc: renesas: rcar-sysc: add R8A77970 support
  soc: renesas: identify R-Car V3M
  soc: renesas: rcar-rst: add R8A77970 support
parents 3fbef2f9 bab9b2a7

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

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Required properties: 
      - "renesas,r8a7794-sysc" (R-Car E2)

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

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

      - "renesas,r8a77970-sysc" (R-Car V3M)

      - "renesas,r8a77995-sysc" (R-Car D3)

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

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

Documentation/devicetree/bindings/reset/renesas,rst.txt

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ Required properties: 
		  - "renesas,r8a7794-rst" (R-Car E2)

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

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

		  - "renesas,r8a77970-rst" (R-Car V3M)

		  - "renesas,r8a77995-rst" (R-Car D3)

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

drivers/soc/renesas/Kconfig

+7 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ config SOC_RENESAS 
	default y if ARCH_RENESAS

	select SOC_BUS

	select RST_RCAR if ARCH_RCAR_GEN1 || ARCH_RCAR_GEN2 || \

			   ARCH_R8A7795 || ARCH_R8A7796 || ARCH_R8A77995

			   ARCH_R8A7795 || ARCH_R8A7796 || ARCH_R8A77970 || \

			   ARCH_R8A77995

	select SYSC_R8A7743 if ARCH_R8A7743

	select SYSC_R8A7745 if ARCH_R8A7745

	select SYSC_R8A7779 if ARCH_R8A7779
@@ -13,6 +14,7 @@ config SOC_RENESAS 
	select SYSC_R8A7794 if ARCH_R8A7794

	select SYSC_R8A7795 if ARCH_R8A7795

	select SYSC_R8A7796 if ARCH_R8A7796

	select SYSC_R8A77970 if ARCH_R8A77970

	select SYSC_R8A77995 if ARCH_R8A77995



if SOC_RENESAS
@@ -54,6 +56,10 @@ config SYSC_R8A7796 
	bool "R-Car M3-W System Controller support" if COMPILE_TEST

	select SYSC_RCAR



config SYSC_R8A77970

	bool "R-Car V3M System Controller support" if COMPILE_TEST

	select SYSC_RCAR



config SYSC_R8A77995

	bool "R-Car D3 System Controller support" if COMPILE_TEST

	select SYSC_RCAR

drivers/soc/renesas/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ obj-$(CONFIG_SYSC_R8A7792) += r8a7792-sysc.o 
obj-$(CONFIG_SYSC_R8A7794)	+= r8a7794-sysc.o

obj-$(CONFIG_SYSC_R8A7795)	+= r8a7795-sysc.o

obj-$(CONFIG_SYSC_R8A7796)	+= r8a7796-sysc.o

obj-$(CONFIG_SYSC_R8A77970)	+= r8a77970-sysc.o

obj-$(CONFIG_SYSC_R8A77995)	+= r8a77995-sysc.o



# Family

drivers/soc/renesas/r8a77970-sysc.c

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

 * Renesas R-Car V3M System Controller

 *

 * Copyright (C) 2017 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.

 */



#include <linux/bug.h>

#include <linux/kernel.h>



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



#include "rcar-sysc.h"



static const struct rcar_sysc_area r8a77970_areas[] __initconst = {

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

	{ "ca53-scu",	0x140, 0, R8A77970_PD_CA53_SCU,	R8A77970_PD_ALWAYS_ON,

	  PD_SCU },

	{ "ca53-cpu0",	0x200, 0, R8A77970_PD_CA53_CPU0, R8A77970_PD_CA53_SCU,

	  PD_CPU_NOCR },

	{ "ca53-cpu1",	0x200, 1, R8A77970_PD_CA53_CPU1, R8A77970_PD_CA53_SCU,

	  PD_CPU_NOCR },

	{ "cr7",	0x240, 0, R8A77970_PD_CR7,	R8A77970_PD_ALWAYS_ON },

	{ "a3ir",	0x180, 0, R8A77970_PD_A3IR,	R8A77970_PD_ALWAYS_ON },

	{ "a2ir0",	0x400, 0, R8A77970_PD_A2IR0,	R8A77970_PD_ALWAYS_ON },

	{ "a2ir1",	0x400, 1, R8A77970_PD_A2IR1,	R8A77970_PD_A2IR0 },

	{ "a2ir2",	0x400, 2, R8A77970_PD_A2IR2,	R8A77970_PD_A2IR0 },

	{ "a2ir3",	0x400, 3, R8A77970_PD_A2IR3,	R8A77970_PD_A2IR0 },

	{ "a2sc0",	0x400, 4, R8A77970_PD_A2SC0,	R8A77970_PD_ALWAYS_ON },

	{ "a2sc1",	0x400, 5, R8A77970_PD_A2SC1,	R8A77970_PD_A2SC0 },

};



const struct rcar_sysc_info r8a77970_sysc_info __initconst = {

	.areas = r8a77970_areas,

	.num_areas = ARRAY_SIZE(r8a77970_areas),

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE