Merge tag 'for-linus-5.6-1' of https://github.com/cminyard/linux-ipmi

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / vf610-zii-scu4-aib.dts

diff --git a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
index d7caf618f9801486546f1ce6cd09a501b78bfdbe..b642520199ba103a4646c6a171976254af5d7b2f 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
+++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
@@ -407,7 +407,7 @@
        pinctrl-0 = <&pinctrl_dspi1>;
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -420,7 +420,7 @@
                };
        };
 
-       spi-flash@1 {
+       flash@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -509,7 +509,7 @@
                #gpio-cells = <2>;
        };
 
-       lm75@48 {
+       temp-sensor@48 {
                compatible = "national,lm75";
                reg = <0x48>;
        };
@@ -524,7 +524,7 @@
                reg = <0x52>;
        };
 
-       ds1682@6b {
+       elapsed-time-recorder@6b {
                compatible = "dallas,ds1682";
                reg = <0x6b>;
        };
@@ -536,7 +536,12 @@
        pinctrl-0 = <&pinctrl_i2c1>;
        status = "okay";
 
-       adt7411@4a {
+       watchdog@38 {
+               compatible = "zii,rave-wdt";
+               reg = <0x38>;
+       };
+
+       adc@4a {
                compatible = "adi,adt7411";
                reg = <0x4a>;
        };
@@ -548,7 +553,7 @@
        pinctrl-0 = <&pinctrl_i2c2>;
        status = "okay";
 
-       gpio9: sx1503q@20 {
+       gpio9: io-expander@20 {
                compatible = "semtech,sx1503q";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_sx1503_20>;
@@ -559,12 +564,12 @@
                interrupts = <31 IRQ_TYPE_EDGE_FALLING>;
        };
 
-       lm75@4e {
+       temp-sensor@4e {
                compatible = "national,lm75";
                reg = <0x4e>;
        };
 
-       lm75@4f {
+       temp-sensor@4f {
                compatible = "national,lm75";
                reg = <0x4f>;
        };
@@ -576,17 +581,17 @@
                reg = <0x23>;
        };
 
-       adt7411@4a {
+       adc@4a {
                compatible = "adi,adt7411";
                reg = <0x4a>;
        };
 
-       at24c08@54 {
+       eeprom@54 {
                compatible = "atmel,24c08";
                reg = <0x54>;
        };
 
-       tca9548@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9548";
                pinctrl-names = "default";
                #address-cells = <1>;
@@ -625,7 +630,7 @@
                };
        };
 
-       tca9548@71 {
+       i2c-mux@71 {
                compatible = "nxp,pca9548";
                pinctrl-names = "default";
                reg = <0x71>;