Commit 4cc45d38 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-drivers-for-v5.5-tag1' of... 

Merge tag 'renesas-drivers-for-v5.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/drivers

Renesas driver updates for v5.5

  - Add support for the new RZ/G2N (r8a774b1) SoC,
  - Fix System Controller power request conflicts on recent R-Car Gen3
    and RZ/G2N SoC variants and revisions,
  - Minor cleanups.

* tag 'renesas-drivers-for-v5.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  soc: renesas: rcar-sysc: Add r8a774b1 support
  soc: renesas: rcar-sysc: Remove unneeded inclusion of <linux/bug.h>
  soc: renesas: r8a774c0-sysc: Fix power request conflicts
  soc: renesas: rcar-rst: Add support for RZ/G2N
  soc: renesas: Identify RZ/G2N
  soc: renesas: Add Renesas R8A774B1 config option
  soc: renesas: r8a77990-sysc: Fix power request conflicts
  soc: renesas: r8a77980-sysc: Fix power request conflicts
  soc: renesas: r8a77970-sysc: Fix power request conflicts
  soc: renesas: r8a77965-sysc: Fix power request conflicts
  soc: renesas: r8a7796-sysc: Fix power request conflicts
  soc: renesas: r8a7795-sysc: Fix power request conflicts
  soc: renesas: rcar-sysc: Prepare for fixing power request conflicts
  dt-bindings: clk: Add r8a774b1 CPG Core Clock Definitions
  dt-bindings: power: Add r8a774b1 SYSC power domain definitions

Link: https://lore.kernel.org/r/20191018101136.26350-5-geert+renesas@glider.be


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents da0c9ea1 6655c568

drivers/soc/renesas/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -178,6 +178,13 @@ config ARCH_R8A774A1 
	help

	  This enables support for the Renesas RZ/G2M SoC.



config ARCH_R8A774B1

	bool "Renesas RZ/G2N SoC Platform"

	select ARCH_RCAR_GEN3

	select SYSC_R8A774B1

	help

	  This enables support for the Renesas RZ/G2N SoC.



config ARCH_R8A774C0

	bool "Renesas RZ/G2E SoC Platform"

	select ARCH_RCAR_GEN3
@@ -253,6 +260,10 @@ config SYSC_R8A774A1 
	bool "RZ/G2M System Controller support" if COMPILE_TEST

	select SYSC_RCAR



config SYSC_R8A774B1

	bool "RZ/G2N System Controller support" if COMPILE_TEST

	select SYSC_RCAR



config SYSC_R8A774C0

	bool "RZ/G2E System Controller support" if COMPILE_TEST

	select SYSC_RCAR

drivers/soc/renesas/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ obj-$(CONFIG_SYSC_R8A7743) += r8a7743-sysc.o 
obj-$(CONFIG_SYSC_R8A7745)	+= r8a7745-sysc.o

obj-$(CONFIG_SYSC_R8A77470)	+= r8a77470-sysc.o

obj-$(CONFIG_SYSC_R8A774A1)	+= r8a774a1-sysc.o

obj-$(CONFIG_SYSC_R8A774B1)	+= r8a774b1-sysc.o

obj-$(CONFIG_SYSC_R8A774C0)	+= r8a774c0-sysc.o

obj-$(CONFIG_SYSC_R8A7779)	+= r8a7779-sysc.o

obj-$(CONFIG_SYSC_R8A7790)	+= r8a7790-sysc.o

drivers/soc/renesas/r8a7743-sysc.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 * Copyright (C) 2016 Cogent Embedded Inc.

 */



#include <linux/bug.h>

#include <linux/kernel.h>



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

drivers/soc/renesas/r8a7745-sysc.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 * Copyright (C) 2016 Cogent Embedded Inc.

 */



#include <linux/bug.h>

#include <linux/kernel.h>



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

drivers/soc/renesas/r8a77470-sysc.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 * Copyright (C) 2018 Renesas Electronics Corp.

 */



#include <linux/bug.h>

#include <linux/kernel.h>



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE