Merge branch 'stable/for-linus-5.1' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi
index 3adc158a40bb34f0d8954163595333293ce21653..de981d629bdddec386a98d27b306cf9064e0cf4d 100644 (file)
--- a/arch/arm/boot/dts/r8a7743.dtsi
+++ b/arch/arm/boot/dts/r8a7743.dtsi
@@ -15,25 +15,6 @@
        #address-cells = <2>;
        #size-cells = <2>;
 
-       aliases {
-               i2c0 = &i2c0;
-               i2c1 = &i2c1;
-               i2c2 = &i2c2;
-               i2c3 = &i2c3;
-               i2c4 = &i2c4;
-               i2c5 = &i2c5;
-               i2c6 = &iic0;
-               i2c7 = &iic1;
-               i2c8 = &iic3;
-               spi0 = &qspi;
-               spi1 = &msiof0;
-               spi2 = &msiof1;
-               spi3 = &msiof2;
-               vin0 = &vin0;
-               vin1 = &vin1;
-               vin2 = &vin2;
-       };
-
        /*
         * The external audio clocks are configured as 0 Hz fixed frequency
         * clocks by default.
@@ -154,6 +135,16 @@
                #size-cells = <2>;
                ranges;
 
+               rwdt: watchdog@e6020000 {
+                       compatible = "renesas,r8a7743-wdt",
+                                    "renesas,rcar-gen2-wdt";
+                       reg = <0 0xe6020000 0 0x0c>;
+                       clocks = <&cpg CPG_MOD 402>;
+                       power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+                       resets = <&cpg 402>;
+                       status = "disabled";
+               };
+
                gpio0: gpio@e6050000 {
                        compatible = "renesas,gpio-r8a7743",
                                     "renesas,rcar-gen2-gpio";
@@ -310,16 +301,6 @@
                        reg = <0 0xe6160000 0 0x100>;
                };
 
-               rwdt: watchdog@e6020000 {
-                       compatible = "renesas,r8a7743-wdt",
-                                    "renesas,rcar-gen2-wdt";
-                       reg = <0 0xe6020000 0 0x0c>;
-                       clocks = <&cpg CPG_MOD 402>;
-                       power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
-                       resets = <&cpg 402>;
-                       status = "disabled";
-               };
-
                sysc: system-controller@e6180000 {
                        compatible = "renesas,r8a7743-sysc";
                        reg = <0 0xe6180000 0 0x200>;
@@ -564,9 +545,7 @@
                        /* doesn't need pinmux */
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       compatible = "renesas,iic-r8a7743",
-                                    "renesas,rcar-gen2-iic",
-                                    "renesas,rmobile-iic";
+                       compatible = "renesas,iic-r8a7743";
                        reg = <0 0xe60b0000 0 0x425>;
                        interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&cpg CPG_MOD 926>;