summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-08-18 23:12:30 +0200
committerArnd Bergmann <arnd@arndb.de>2017-08-18 23:12:30 +0200
commit1e95f2ca6ec85d2a1b393725a7ed09eba0184805 (patch)
tree1ac048757f26cfd819b391e9efdb94970305eacb
parent81f794d7015a759bc672142130cad8a95c994849 (diff)
parent304ce59242e11e715bfdc86577771502df99f7cd (diff)
downloadlinux-1e95f2ca6ec85d2a1b393725a7ed09eba0184805.tar.gz
linux-1e95f2ca6ec85d2a1b393725a7ed09eba0184805.tar.bz2
linux-1e95f2ca6ec85d2a1b393725a7ed09eba0184805.zip
Merge tag 'renesas-dt-bindings2-for-v4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Pull "Second Round of Renesas ARM Based SoC DT Bindings Updates for v4.14" from Simon Horman: * Add RZ/G1M (r8a7743) binding to apmu driver This allows SMP to be supported on the RZ/G1M SoC * Add bindings for iW-RainboW-G22D-SODIMM RZ/G1E SODIMM development kit This is in preparation for adding DTS to support this hardware * tag 'renesas-dt-bindings2-for-v4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: dt-bindings: apmu: Document r8a7743 support ARM: shmobile: document iW-RainboW-G22D SODIMM SOM Development Platform ARM: shmobile: document iW-RainboW-G22M-SM SODIMM System on Module
-rw-r--r--Documentation/devicetree/bindings/arm/shmobile.txt4
-rw-r--r--Documentation/devicetree/bindings/power/renesas,apmu.txt3
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index 275cda1469b8..ae75cb3b1331 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -68,6 +68,10 @@ Boards:
compatible = "renesas,h3ulcb", "renesas,r8a7795";
- Henninger
compatible = "renesas,henninger", "renesas,r8a7791"
+ - iWave Systems RZ/G1E SODIMM SOM Development Platform (iW-RainboW-G22D)
+ compatible = "iwave,g22d", "iwave,g22m", "renesas,r8a7745"
+ - iWave Systems RZ/G1E SODIMM System On Module (iW-RainboW-G22M-SM)
+ compatible = "iwave,g22m", "renesas,r8a7745"
- iWave Systems RZ/G1M Qseven Development Platform (iW-RainboW-G20D-Qseven)
compatible = "iwave,g20d", "iwave,g20m", "renesas,r8a7743"
- iWave Systems RZ/G1M Qseven System On Module (iW-RainboW-G20M-Qseven)
diff --git a/Documentation/devicetree/bindings/power/renesas,apmu.txt b/Documentation/devicetree/bindings/power/renesas,apmu.txt
index 84404c9edff7..af21502e939c 100644
--- a/Documentation/devicetree/bindings/power/renesas,apmu.txt
+++ b/Documentation/devicetree/bindings/power/renesas,apmu.txt
@@ -1,12 +1,13 @@
DT bindings for the Renesas Advanced Power Management Unit
-Renesas R-Car line of SoCs utilize one or more APMU hardware units
+Renesas R-Car and RZ/G1 SoCs utilize one or more APMU hardware units
for CPU core power domain control including SMP boot and CPU Hotplug.
Required properties:
- compatible: Should be "renesas,<soctype>-apmu", "renesas,apmu" as fallback.
Examples with soctypes are:
+ - "renesas,r8a7743-apmu" (RZ/G1M)
- "renesas,r8a7790-apmu" (R-Car H2)
- "renesas,r8a7791-apmu" (R-Car M2-W)
- "renesas,r8a7792-apmu" (R-Car V2H)