Merge tag 'renesas-dt3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Third Round of Renesas ARM Based SoC DT Updates for v3.18" from Simon Horman:

* Use tabs for indentation in kzm9g-reference and r8a7779 DTS(I) files
* Add platform device tree bindings documentation
* Add SoC-specific thermal compatible property to r8a73a4 and r8a7779

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'renesas-dt3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: kzm9g-reference dts: Use tabs for indentation
  ARM: shmobile: r8a7779 dtsi: Use tabs for indentation
  ARM: shmobile: Add platform device tree bindings documentation
  ARM: shmobile: r8a73a4 dtsi: Add SoC-specific thermal compatible property
  ARM: shmobile: r8a7779 dtsi: Add SoC-specific thermal compatible property

4 files changed, 79 insertions, 8 deletions

diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
new file mode 100644
index 000000000000..5d1c5c0085dc
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -0,0 +1,71 @@
+Renesas SH-Mobile, R-Mobile, and R-Car Platform Device Tree Bindings
+--------------------------------------------------------------------
+
+SoCs:
+
+  - Emma Mobile EV2
+    compatible = "renesas,emev2"
+  - RZ/A1H (R7S72100)
+    compatible = "renesas,r7s72100"
+  - SH-Mobile AP4 (R8A73720/SH7372)
+    compatible = "renesas,sh7372"
+  - SH-Mobile AG5 (R8A73A00/SH73A0)
+    compatible = "renesas,sh73a0"
+  - R-Mobile APE6 (R8A73A40)
+    compatible = "renesas,r8a73a4"
+  - R-Mobile A1 (R8A77400)
+    compatible = "renesas,r8a7740"
+  - R-Car M1A (R8A77781)
+    compatible = "renesas,r8a7778"
+  - R-Car H1 (R8A77790)
+    compatible = "renesas,r8a7779"
+  - R-Car H2 (R8A77900)
+    compatible = "renesas,r8a7790"
+  - R-Car M2-W (R8A77910)
+    compatible = "renesas,r8a7791"
+  - R-Car V2H (R8A77920)
+    compatible = "renesas,r8a7792"
+  - R-Car M2-N (R8A77930)
+    compatible = "renesas,r8a7793"
+  - R-Car E2 (R8A77940)
+    compatible = "renesas,r8a7794"
+
+
+Boards:
+
+  - Alt
+    compatible = "renesas,alt", "renesas,r8a7794"
+  - APE6-EVM
+    compatible = "renesas,ape6evm", "renesas,r8a73a4"
+  - APE6-EVM - Reference Device Tree Implementation
+    compatible = "renesas,ape6evm-reference", "renesas,r8a73a4"
+  - Atmark Techno Armadillo-800 EVA
+    compatible = "renesas,armadillo800eva"
+  - BOCK-W
+    compatible = "renesas,bockw", "renesas,r8a7778"
+  - BOCK-W - Reference Device Tree Implementation
+    compatible = "renesas,bockw-reference", "renesas,r8a7778"
+  - Genmai (RTK772100BC00000BR)
+    compatible = "renesas,genmai", "renesas,r7s72100"
+  - Gose
+    compatible = "renesas,gose", "renesas,r8a7793"
+  - Henninger
+    compatible = "renesas,henninger", "renesas,r8a7791"
+  - Koelsch (RTP0RC7791SEB00010S)
+    compatible = "renesas,koelsch", "renesas,r8a7791"
+  - KZM9D
+    compatible = "renesas,kzm9d", "renesas,emev2"
+  - KZM-A9-GT
+    compatible = "renesas,kzm9g", "renesas,sh73a0"
+  - KZM-A9-GT - Reference Device Tree Implementation
+    compatible = "renesas,kzm9g-reference", "renesas,sh73a0"
+  - Lager (RTP0RC7790SEB00010S)
+    compatible = "renesas,lager", "renesas,r8a7790"
+  - Mackerel (R0P7372LC0016RL, AP4 EVM 2nd)
+    compatible = "renesas,mackerel"
+  - Marzen
+    compatible = "renesas,marzen", "renesas,r8a7779"
+
+Note: Reference Device Tree Implementations are temporary implementations
+      to ease the migration from platform devices to Device Tree, and are
+      intended to be removed in the future.
diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index d8ec5058c351..fba39a2bfe42 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -165,7 +165,7 @@
         };
 
         thermal@e61f0000 {
-                compatible = "renesas,rcar-thermal";
+                compatible = "renesas,thermal-r8a73a4", "renesas,rcar-thermal";
                 reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>,
                          <0 0xe61f0200 0 0x38>, <0 0xe61f0300 0 0x38>;
                 interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 0e64c7635127..05b68f427c50 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -256,7 +256,7 @@
         };
 
         thermal@ffc48000 {
-                compatible = "renesas,rcar-thermal";
+                compatible = "renesas,thermal-r8a7779", "renesas,rcar-thermal";
                 reg = <0xffc48000 0x38>;
         };
 
@@ -398,10 +398,10 @@
                 /* Gate clocks */
                 mstp0_clks: clocks@ffc80030 {
                         compatible = "renesas,r8a7779-mstp-clocks",
-                                     "renesas,cpg-mstp-clocks";
+                                     "renesas,cpg-mstp-clocks";
                         reg = <0xffc80030 4>;
                         clocks = <&cpg_clocks R8A7779_CLK_S>,
-                                 <&cpg_clocks R8A7779_CLK_P>,
+                                 <&cpg_clocks R8A7779_CLK_P>,
                                  <&cpg_clocks R8A7779_CLK_P>,
                                  <&cpg_clocks R8A7779_CLK_P>,
                                  <&cpg_clocks R8A7779_CLK_S>,
@@ -435,7 +435,7 @@
                 };
                 mstp1_clks: clocks@ffc80034 {
                         compatible = "renesas,r8a7779-mstp-clocks",
-                                     "renesas,cpg-mstp-clocks";
+                                     "renesas,cpg-mstp-clocks";
                         reg = <0xffc80034 4>, <0xffc80044 4>;
                         clocks = <&cpg_clocks R8A7779_CLK_P>,
                                  <&cpg_clocks R8A7779_CLK_P>,
@@ -464,7 +464,7 @@
                 };
                 mstp3_clks: clocks@ffc8003c {
                         compatible = "renesas,r8a7779-mstp-clocks",
-                                     "renesas,cpg-mstp-clocks";
+                                     "renesas,cpg-mstp-clocks";
                         reg = <0xffc8003c 4>;
                         clocks = <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>,
                                  <&s4_clk>, <&s4_clk>;
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index 18662aec2ec4..477f8153debd 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -66,7 +66,7 @@
         };
 
         vmmc_sdhi0: regulator@2 {
-                compatible = "regulator-fixed";
+                compatible = "regulator-fixed";
                 regulator-name = "SDHI0 Vcc";
                 regulator-min-microvolt = <3300000>;
                 regulator-max-microvolt = <3300000>;
@@ -75,7 +75,7 @@
         };
 
         vmmc_sdhi2: regulator@3 {
-                compatible = "regulator-fixed";
+                compatible = "regulator-fixed";
                 regulator-name = "SDHI2 Vcc";
                 regulator-min-microvolt = <3300000>;
                 regulator-max-microvolt = <3300000>;