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

Commit 63747d3c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm64-dt-for-v4.5' of... 

Merge tag 'renesas-arm64-dt-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64

Merge "Renesas ARM64 Based SoC DT Updates for v4.5" from Simon Horman:

* Initial support for Renesas ARM64 Based r8a7795 SoC and
  Salvator-X board

* tag 'renesas-arm64-dt-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  MAINTAINERS: Add entry for Renesas arm64 architecture
  arm64: renesas: add Salvator-X board support
  arm64: renesas: r8a7795: enable PFC
  arm64: renesas: r8a7795: Add all SCIF nodes
  arm64: renesas: r8a7795: Add dummy dma-controller nodes
  arm64: renesas: r8a7795: Add Renesas R8A7795 SoC support
parents 31ade3b8 b138e119

Documentation/devicetree/bindings/arm/shmobile.txt

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ SoCs: 
    compatible = "renesas,r8a7793"

  - R-Car E2 (R8A77940)

    compatible = "renesas,r8a7794"

  - R-Car H3 (R8A77950)

    compatible = "renesas,r8a7795"





Boards:
@@ -57,5 +59,7 @@ Boards: 
    compatible = "renesas,marzen", "renesas,r8a7779"

  - Porter (M2-LCDP)

    compatible = "renesas,porter", "renesas,r8a7791"

  - Salvator-X

    compatible = "renesas,salvator-x", "renesas,r8a7795";

  - SILK (RTP0RC7794LCB00011S)

    compatible = "renesas,silk", "renesas,r8a7794"

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -1420,6 +1420,15 @@ M: Lennert Buytenhek <kernel@wantstofly.org> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained



ARM/RENESAS ARM64 ARCHITECTURE

M:	Simon Horman <horms@verge.net.au>

M:	Magnus Damm <magnus.damm@gmail.com>

L:	linux-sh@vger.kernel.org

Q:	http://patchwork.kernel.org/project/linux-sh/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next

S:	Supported

F:	arch/arm64/boot/dts/renesas/



ARM/RISCPC ARCHITECTURE

M:	Russell King <linux@arm.linux.org.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm64/Kconfig.platforms

+17 −0
Original line number Diff line number Diff line
@@ -67,6 +67,23 @@ config ARCH_SEATTLE 
	help

	  This enables support for AMD Seattle SOC Family



config ARCH_SHMOBILE

	bool



config ARCH_RENESAS

	bool "Renesas SoC Platforms"

	select ARCH_SHMOBILE

	select PINCTRL

	select PM_GENERIC_DOMAINS if PM

	help

	  This enables support for the ARMv8 based Renesas SoCs.



config ARCH_R8A7795

	bool "Renesas R-Car H3 SoC Platform"

	depends on ARCH_RENESAS

	help

	  This enables support for the Renesas R-Car H3 SoC.



config ARCH_STRATIX10

	bool "Altera's Stratix 10 SoCFPGA Family"

	help

arch/arm64/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ dts-dirs += hisilicon 
dts-dirs += marvell

dts-dirs += mediatek

dts-dirs += qcom

dts-dirs += renesas

dts-dirs += rockchip

dts-dirs += sprd

dts-dirs += xilinx

arch/arm64/boot/dts/renesas/Makefile

0 → 100644
+4 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb



always		:= $(dtb-y)

clean-files	:= *.dtb