diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 17:57:58 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 17:57:58 +0200 |
| commit | 3c862347d7730ce8fa3e82642544c45ed32f47a3 (patch) | |
| tree | 1cd3fa25baa9e9152ace3b2ea87525529361ebe4 /Documentation/devicetree/bindings/arm | |
| parent | 8d09251a81ecc22e542c3ff6a7dd3ca2b7e2b0e7 (diff) | |
| parent | c805f1a7013a76ae63c002e52cc667d7c37228ea (diff) | |
| download | linux-stable-3c862347d7730ce8fa3e82642544c45ed32f47a3.tar.gz linux-stable-3c862347d7730ce8fa3e82642544c45ed32f47a3.tar.bz2 linux-stable-3c862347d7730ce8fa3e82642544c45ed32f47a3.zip | |
Merge tag 'renesas-arm64-dt2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64
Merge "Second Round of Renesas ARM64 Based SoC DT Updates for v4.8" from Simon Horman:
* Add support for r8a7796/salvator-x (R-Car Gen 3 M3-W)
* Add CAN support to r8a7795 (R-Car Gen 3 H3)
* tag 'renesas-arm64-dt2-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
arm64: dts: r8a7796/salvator-x: Enable watchdog timer
arm64: dts: r8a7796: Add RWDT node
arm64: dts: r8a7796: Use SYSC "always-on" PM Domain
arm64: dts: r8a7796: Add SYSC PM Domains
arm64: dts: salvator-x: add Salvator-X board on R8A7796 SoC
arm64: dts: r8a7796: Add Renesas R8A7796 SoC support
arm64: dts: r8a7795: Add CAN FD support
arm64: dts: r8a7795: Add missing blank lines between cpu nodes
clk: renesas: r8a7795: Add THS/TSC clock
clk: renesas: r8a7795: Add DRIF clock
clk: renesas: r8a7795: Correct lvds clock parent
clk: renesas: r8a7795: Provide FDP1 clocks
clk: renesas: Add R8A7792 support
clk: renesas: mstp: Document R8A7792 support
clk: renesas: rcar-gen2: Document R8A7792 support
clk: renesas: cpg-mssr: Add support for R-Car M3-W
clk: renesas: cpg-mssr: Extract common R-Car Gen3 support code
clk: renesas: Add r8a7796 CPG Core Clock Definitions
clk: renesas: cpg-mssr: Document r8a7796 support
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/shmobile.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt index 9cf67e48f222..d5ed554830d7 100644 --- a/Documentation/devicetree/bindings/arm/shmobile.txt +++ b/Documentation/devicetree/bindings/arm/shmobile.txt @@ -29,6 +29,8 @@ SoCs: compatible = "renesas,r8a7794" - R-Car H3 (R8A77950) compatible = "renesas,r8a7795" + - R-Car M3-W (R8A77960) + compatible = "renesas,r8a7796" Boards: @@ -61,5 +63,7 @@ Boards: compatible = "renesas,porter", "renesas,r8a7791" - Salvator-X (RTP0RC7795SIPB0010S) compatible = "renesas,salvator-x", "renesas,r8a7795"; + - Salvator-X + compatible = "renesas,salvator-x", "renesas,r8a7796"; - SILK (RTP0RC7794LCB00011S) compatible = "renesas,silk", "renesas,r8a7794" |