summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-12-12 00:49:59 +0100
committerArnd Bergmann <arnd@arndb.de>2015-12-12 00:49:59 +0100
commit63747d3c27e283d0d0a035c71f461c8c6cc31364 (patch)
tree81435e1f2a593e418556235258cdba368e5d3910 /Documentation/devicetree
parent31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 (diff)
parentb138e11931f2fe25cf188ed62b54bc36f59a25ce (diff)
downloadop-kernel-dev-63747d3c27e283d0d0a035c71f461c8c6cc31364.zip
op-kernel-dev-63747d3c27e283d0d0a035c71f461c8c6cc31364.tar.gz
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
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r--Documentation/devicetree/bindings/arm/shmobile.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index 40bb9007..678a818 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -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"
OpenPOWER on IntegriCloud