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

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

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

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

Add R-Car D3 (r8a77995) support to the Renesas-specific SoC drivers
- SoC identification
- System controller
- Reset controller

* tag 'renesas-drivers-for-v4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  soc: renesas: rcar-rst: Add support for R-Car D3
  soc: renesas: rcar-sysc: Add support for R-Car D3 power areas
  soc: renesas: Add r8a77995 SYSC PM Domain Binding Definitions
  soc: renesas: Identify R-Car D3
parents 900452f3 105ae504

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,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,r8a77995-rst" (R-Car D3)

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

drivers/soc/renesas/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 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_R8A7795 || ARCH_R8A7796 || ARCH_R8A77995

	select SYSC_R8A7743 if ARCH_R8A7743

	select SYSC_R8A7745 if ARCH_R8A7745

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

	select SYSC_R8A7795 if ARCH_R8A7795

	select SYSC_R8A7796 if ARCH_R8A7796

	select SYSC_R8A77995 if ARCH_R8A77995



if SOC_RENESAS
@@ -53,6 +54,10 @@ config SYSC_R8A7796 
	bool "R-Car M3-W 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



# Family

config RST_RCAR

	bool "R-Car Reset Controller support" if COMPILE_TEST

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_R8A77995)	+= r8a77995-sysc.o



# Family

obj-$(CONFIG_RST_RCAR)		+= rcar-rst.o

drivers/soc/renesas/r8a77995-sysc.c

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

 * Renesas R-Car D3 System Controller

 *

 * Copyright (C) 2017 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 <linux/sys_soc.h>



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



#include "rcar-sysc.h"



static struct rcar_sysc_area r8a77995_areas[] __initdata = {

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

	{ "ca53-scu",  0x140, 0, R8A77995_PD_CA53_SCU,  R8A77995_PD_ALWAYS_ON,

	  PD_SCU },

	{ "ca53-cpu0", 0x200, 0, R8A77995_PD_CA53_CPU0, R8A77995_PD_CA53_SCU,

	  PD_CPU_NOCR },

};





const struct rcar_sysc_info r8a77995_sysc_info __initconst = {

	.areas = r8a77995_areas,

	.num_areas = ARRAY_SIZE(r8a77995_areas),

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE