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

Commit a51dcd29 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-soc-for-v4.18' of... 

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

Renesas ARM Based SoC Updates for v4.18

* SoC
  - Change platform dependency to ARCH_RENESAS
    This will allow to drop ARCH_SHMOBILE on ARM and ARM64 in the near
    future.
  - Add the to Kconfig RZ/N1D (r9a06g032) SoC
  - Identify R-Car E3 (r8a77990) SoC
  - Identify and add minimal support for RZ/G1C (r8a77470) SoC

* R-Car SYSC
  - Add support for R-Car E3 (r8a77990) SoC
  - Remove unused inclusion of <linux/sys_soc.h>,
  - Make r8a77995_areas[] const.

* R-Car Reset
  - Add support for R-Car E3 (r8a77990) SoC

* Debug-LL
  - Add support for RZ/G1C (r8a77470) SoC

* tag 'renesas-soc-for-v4.18' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  soc: renesas: r8a77990-sysc: Add workaround for 3DG-{A,B}
  soc: renesas: rcar-sysc: Add support for R-Car E3 power areas
  arm: shmobile: Add the RZ/N1D (R9A06G032) to the shmobile Kconfig
  arm: shmobile: Change platform dependency to ARCH_RENESAS
  soc: renesas: r8a77995-sysc: Cleanups
  soc: renesas: rcar-rst: Add support for R-Car E3
  soc: renesas: Add r8a77990 SYSC PM Domain Binding Definitions
  soc: renesas: identify R-Car E3
  ARM: debug-ll: Add support for r8a77470
  ARM: shmobile: Add the RZ/N1 arch to the shmobile Kconfig
  ARM: shmobile: r8a77470: basic SoC support
  soc: renesas: rcar-sysc: Add r8a77470 support
  soc: renesas: rcar-rst: Add support for RZ/G1C
  soc: renesas: Identify RZ/G1C

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5ab99d48 086b3999

Documentation/devicetree/bindings/arm/shmobile.txt

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ SoCs: 
    compatible = "renesas,r8a7744"

  - RZ/G1E (R8A77450)

    compatible = "renesas,r8a7745"

  - RZ/G1C (R8A77470)

    compatible = "renesas,r8a77470"

  - R-Car M1A (R8A77781)

    compatible = "renesas,r8a7778"

  - R-Car H1 (R8A77790)

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

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 
  - compatible: Must contain exactly one of the following:

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

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

      - "renesas,r8a77470-sysc" (RZ/G1C)

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

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

      - "renesas,r8a7791-sysc" (R-Car M2-W)
@@ -20,6 +21,7 @@ Required properties: 
      - "renesas,r8a77965-sysc" (R-Car M3-N)

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

      - "renesas,r8a77980-sysc" (R-Car V3H)

      - "renesas,r8a77990-sysc" (R-Car E3)

      - "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

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Required properties: 
		Examples with soctypes are:

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

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

		  - "renesas,r8a77470-rst" (RZ/G1C)

		  - "renesas,r8a7778-reset-wdt" (R-Car M1A)

		  - "renesas,r8a7779-reset-wdt" (R-Car H1)

		  - "renesas,r8a7790-rst" (R-Car H2)
@@ -29,6 +30,7 @@ Required properties: 
		  - "renesas,r8a77965-rst" (R-Car M3-N)

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

		  - "renesas,r8a77980-rst" (R-Car V3H)

		  - "renesas,r8a77990-rst" (R-Car E3)

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

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

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1467,7 +1467,7 @@ config ARM_PSCI 
config ARCH_NR_GPIO

	int

	default 2048 if ARCH_SOCFPGA

	default 1024 if ARCH_BRCMSTB || ARCH_SHMOBILE || ARCH_TEGRA || \

	default 1024 if ARCH_BRCMSTB || ARCH_RENESAS || ARCH_TEGRA || \

		ARCH_ZYNQ

	default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \

		SOC_DRA7XX || ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210

arch/arm/Kconfig.debug

+11 −2
Original line number Diff line number Diff line
@@ -942,6 +942,13 @@ choice 
		  via SCIF0 on Renesas RZ/G1M (R8A7743), R-Car H2 (R8A7790),

		  M2-W (R8A7791), V2H (R8A7792), or M2-N (R8A7793).



	config DEBUG_RCAR_GEN2_SCIF1

		bool "Kernel low-level debugging messages via SCIF1 on R8A77470"

		depends on ARCH_R8A77470

		help

		  Say Y here if you want kernel low-level debugging support

		  via SCIF1 on Renesas RZ/G1C (R8A77470).



	config DEBUG_RCAR_GEN2_SCIF2

		bool "Kernel low-level debugging messages via SCIF2 on R8A7794"

		depends on ARCH_R8A7794
@@ -1495,6 +1502,7 @@ config DEBUG_LL_INCLUDE 
	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN1_SCIF0

	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN1_SCIF2

	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN2_SCIF0

	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN2_SCIF1

	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN2_SCIF2

	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN2_SCIF4

	default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA0
@@ -1617,6 +1625,7 @@ config DEBUG_UART_PHYS 
	default 0xe6c80000 if DEBUG_RMOBILE_SCIFA4

	default 0xe6e58000 if DEBUG_RCAR_GEN2_SCIF2

	default 0xe6e60000 if DEBUG_RCAR_GEN2_SCIF0

	default 0xe6e68000 if DEBUG_RCAR_GEN2_SCIF1

	default 0xe6ee0000 if DEBUG_RCAR_GEN2_SCIF4

	default 0xe8008000 if DEBUG_R7S72100_SCIF2

	default 0xf0000be0 if ARCH_EBSA110
@@ -1651,8 +1660,8 @@ config DEBUG_UART_PHYS 
		DEBUG_NETX_UART || \

		DEBUG_QCOM_UARTDM || DEBUG_R7S72100_SCIF2 || \

		DEBUG_RCAR_GEN1_SCIF0 || DEBUG_RCAR_GEN1_SCIF2 || \

		DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF2 || \

		DEBUG_RCAR_GEN2_SCIF4 || \

		DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF1 || \

		DEBUG_RCAR_GEN2_SCIF2 || DEBUG_RCAR_GEN2_SCIF4 || \

		DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \

		DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \

		DEBUG_S3C64XX_UART || \