Merge tag 'linux-kselftest-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/arch/arm/boot/dts/r8a7792.dtsi b/arch/arm/boot/dts/r8a7792.dtsi
index c332f77ebb6b9349a52257475bca2780b5f9e736..131f65b0426ea317ccfa4fa8fed0b015611bd48c 100644 (file)
--- a/arch/arm/boot/dts/r8a7792.dtsi
+++ b/arch/arm/boot/dts/r8a7792.dtsi
@@ -56,6 +56,7 @@
                        compatible = "arm,cortex-a15";
                        reg = <1>;
                        clock-frequency = <1000000000>;
+                       clocks = <&cpg CPG_CORE R8A7792_CLK_Z>;
                        power-domains = <&sysc R8A7792_PD_CA15_CPU1>;
                        next-level-cache = <&L2_CA15>;
                };
@@ -147,7 +148,7 @@
 
                gpio0: gpio@e6050000 {
                        compatible = "renesas,gpio-r8a7792",
-                                    "renesas,gpio-rcar";
+                                    "renesas,rcar-gen2-gpio";
                        reg = <0 0xe6050000 0 0x50>;
                        interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
                        #gpio-cells = <2>;
@@ -162,7 +163,7 @@
 
                gpio1: gpio@e6051000 {
                        compatible = "renesas,gpio-r8a7792",
-                                    "renesas,gpio-rcar";
+                                    "renesas,rcar-gen2-gpio";
                        reg = <0 0xe6051000 0 0x50>;
                        interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
                        #gpio-cells = <2>;
@@ -177,7 +178,7 @@
 
                gpio2: gpio@e6052000 {
                        compatible = "renesas,gpio-r8a7792",
-                                    "renesas,gpio-rcar";
+                                    "renesas,rcar-gen2-gpio";
                        reg = <0 0xe6052000 0 0x50>;
                        interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
                        #gpio-cells = <2>;
@@ -192,7 +193,7 @@
 
                gpio3: gpio@e6053000 {
                        compatible = "renesas,gpio-r8a7792",
-                                    "renesas,gpio-rcar";
+                                    "renesas,rcar-gen2-gpio";
                        reg = <0 0xe6053000 0 0x50>;
                        interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
                        #gpio-cells = <2>;
@@ -207,7 +208,7 @@
 
                gpio4: gpio@e6054000 {
                        compatible = "renesas,gpio-r8a7792",
-                                    "renesas,gpio-rcar";
+                                    "renesas,rcar-gen2-gpio";
                        reg = <0 0xe6054000 0 0x50>;
                        interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
                        #gpio-cells = <2>;
@@ -222,7 +223,7 @@
 
                gpio5: gpio@e6055000 {
                        compatible = "renesas,gpio-r8a7792",
-                                    "renesas,gpio-rcar";
+                                    "renesas,rcar-gen2-gpio";
                        reg = <0 0xe6055000 0 0x50>;
                        interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
                        #gpio-cells = <2>;
@@ -237,7 +238,7 @@
 
                gpio6: gpio@e6055100 {
                        compatible = "renesas,gpio-r8a7792",
-                                    "renesas,gpio-rcar";
+                                    "renesas,rcar-gen2-gpio";
                        reg = <0 0xe6055100 0 0x50>;
                        interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
                        #gpio-cells = <2>;
@@ -252,7 +253,7 @@
 
                gpio7: gpio@e6055200 {
                        compatible = "renesas,gpio-r8a7792",
-                                    "renesas,gpio-rcar";
+                                    "renesas,rcar-gen2-gpio";
                        reg = <0 0xe6055200 0 0x50>;
                        interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
                        #gpio-cells = <2>;
@@ -267,7 +268,7 @@
 
                gpio8: gpio@e6055300 {
                        compatible = "renesas,gpio-r8a7792",
-                                    "renesas,gpio-rcar";
+                                    "renesas,rcar-gen2-gpio";
                        reg = <0 0xe6055300 0 0x50>;
                        interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
                        #gpio-cells = <2>;
@@ -282,7 +283,7 @@
 
                gpio9: gpio@e6055400 {
                        compatible = "renesas,gpio-r8a7792",
-                                    "renesas,gpio-rcar";
+                                    "renesas,rcar-gen2-gpio";
                        reg = <0 0xe6055400 0 0x50>;
                        interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
                        #gpio-cells = <2>;
@@ -297,7 +298,7 @@
 
                gpio10: gpio@e6055500 {
                        compatible = "renesas,gpio-r8a7792",
-                                    "renesas,gpio-rcar";
+                                    "renesas,rcar-gen2-gpio";
                        reg = <0 0xe6055500 0 0x50>;
                        interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
                        #gpio-cells = <2>;
@@ -312,7 +313,7 @@
 
                gpio11: gpio@e6055600 {
                        compatible = "renesas,gpio-r8a7792",
-                                    "renesas,gpio-rcar";
+                                    "renesas,rcar-gen2-gpio";
                        reg = <0 0xe6055600 0 0x50>;
                        interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
                        #gpio-cells = <2>;
@@ -794,7 +795,7 @@
                        status = "disabled";
                };
 
-               vsp1@fe928000 {
+               vsp@fe928000 {
                        compatible = "renesas,vsp1";
                        reg = <0 0xfe928000 0 0x8000>;
                        interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
@@ -803,7 +804,7 @@
                        resets = <&cpg 131>;
                };
 
-               vsp1@fe930000 {
+               vsp@fe930000 {
                        compatible = "renesas,vsp1";
                        reg = <0 0xfe930000 0 0x8000>;
                        interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
@@ -812,7 +813,7 @@
                        resets = <&cpg 128>;
                };
 
-               vsp1@fe938000 {
+               vsp@fe938000 {
                        compatible = "renesas,vsp1";
                        reg = <0 0xfe938000 0 0x8000>;
                        interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;