Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / r8a7790.dtsi

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 62baabd757b6ba010693b9b7d4cfc37a367819d8..ed9a68538a5540015cfe0ef86c9e642cac423862 100644 (file)
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -168,7 +168,7 @@
 
                        trips {
                                cpu-crit {
-                                       temperature     = <115000>;
+                                       temperature     = <95000>;
                                        hysteresis      = <0>;
                                        type            = "critical";
                                };
@@ -311,7 +311,7 @@
        };
 
        cmt0: timer@ffca0000 {
-               compatible = "renesas,cmt-48-r8a7790", "renesas,cmt-48-gen2";
+               compatible = "renesas,r8a7790-cmt0", "renesas,rcar-gen2-cmt0";
                reg = <0 0xffca0000 0 0x1004>;
                interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
@@ -320,13 +320,11 @@
                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
                resets = <&cpg 124>;
 
-               renesas,channels-mask = <0x60>;
-
                status = "disabled";
        };
 
        cmt1: timer@e6130000 {
-               compatible = "renesas,cmt-48-r8a7790", "renesas,cmt-48-gen2";
+               compatible = "renesas,r8a7790-cmt1", "renesas,rcar-gen2-cmt1";
                reg = <0 0xe6130000 0 0x1004>;
                interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
@@ -341,8 +339,6 @@
                power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
                resets = <&cpg 329>;
 
-               renesas,channels-mask = <0xff>;
-
                status = "disabled";
        };
 
@@ -662,7 +658,8 @@
        };
 
        sdhi0: sd@ee100000 {
-               compatible = "renesas,sdhi-r8a7790";
+               compatible = "renesas,sdhi-r8a7790",
+                            "renesas,rcar-gen2-sdhi";
                reg = <0 0xee100000 0 0x328>;
                interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&cpg CPG_MOD 314>;
@@ -676,7 +673,8 @@
        };
 
        sdhi1: sd@ee120000 {
-               compatible = "renesas,sdhi-r8a7790";
+               compatible = "renesas,sdhi-r8a7790",
+                            "renesas,rcar-gen2-sdhi";
                reg = <0 0xee120000 0 0x328>;
                interrupts = <GIC_SPI 166 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&cpg CPG_MOD 313>;
@@ -690,7 +688,8 @@
        };
 
        sdhi2: sd@ee140000 {
-               compatible = "renesas,sdhi-r8a7790";
+               compatible = "renesas,sdhi-r8a7790",
+                            "renesas,rcar-gen2-sdhi";
                reg = <0 0xee140000 0 0x100>;
                interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&cpg CPG_MOD 312>;
@@ -704,7 +703,8 @@
        };
 
        sdhi3: sd@ee160000 {
-               compatible = "renesas,sdhi-r8a7790";
+               compatible = "renesas,sdhi-r8a7790",
+                            "renesas,rcar-gen2-sdhi";
                reg = <0 0xee160000 0 0x100>;
                interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&cpg CPG_MOD 311>;
@@ -906,7 +906,8 @@
        };
 
        ether: ethernet@ee700000 {
-               compatible = "renesas,ether-r8a7790";
+               compatible = "renesas,ether-r8a7790",
+                            "renesas,rcar-gen2-ether";
                reg = <0 0xee700000 0 0x400>;
                interrupts = <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&cpg CPG_MOD 813>;