ARM: dts: aspeed: Fix/add I2C device vendor prefixes

The ASpeed DTS files have various I2C devices with missing or incorrect
vendor prefixes in their compatible strings. This hasn't really mattered
and doesn't impact ABI compatibility as I2C devices get matched with their
vendor prefix stripped.

With this, the "maxim,max31790" nodes now validate and have some
warnings. Remove the spurious "#address-cells" and "#size-cells"
properties to fix the warnings.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
[arj: Fix conflicts with fe42f567c387 ("ARM: dts: aspeed: Minor whitespace cleanup")]
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts
index 9605ccade1555fa403996269029a7450eec2915b..b550a48f48f0df01deec2acbfa2b12d263db2671 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts
@@ -171,7 +171,7 @@
                                reg = <0x50>;
                        };
                        dps650ab@58 {
-                               compatible = "dps650ab";
+                               compatible = "delta,dps650ab";
                                reg = <0x58>;
                        };
                };

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
index 1ed79f41ef0bbd0a17250c5c743b0e392330e509..b733efe31e8d24c9b8f4d5ec62f048608bddd83a 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
@@ -184,10 +184,8 @@
        status = "okay";
 
        pwm@5e {
-               compatible = "max31790";
+               compatible = "maxim,max31790";
                reg = <0x5e>;
-               #address-cells = <1>;
-               #size-cells = <0>;
        };
 
        power-sensor@40 {
@@ -258,10 +256,8 @@
        status = "okay";
 
        pwm@5e {
-               compatible = "max31790";
+               compatible = "maxim,max31790";
                reg = <0x5e>;
-               #address-cells = <1>;
-               #size-cells = <0>;
        };
 
        power-sensor@40 {

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
index 399e244bcd7943ff82d9220ebb73559ece5b74d7..eb8d4b95596c19d8073dd635c505c374a70fb46f 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
@@ -313,10 +313,8 @@
                        };
 
                        pwm@5e {
-                               compatible = "max31790";
+                               compatible = "maxim,max31790";
                                reg = <0x5e>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                        };
 
                        power-sensor@40 {
@@ -436,10 +434,8 @@
                        };
 
                        pwm@5e {
-                               compatible = "max31790";
+                               compatible = "maxim,max31790";
                                reg = <0x5e>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                        };
 
                        power-sensor@40 {
@@ -559,10 +555,8 @@
                        };
 
                        pwm@5e {
-                               compatible = "max31790";
+                               compatible = "maxim,max31790";
                                reg = <0x5e>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                        };
 
                        power-sensor@40 {
@@ -682,10 +676,8 @@
                        };
 
                        pwm@5e {
-                               compatible = "max31790";
+                               compatible = "maxim,max31790";
                                reg = <0x5e>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                        };
 
                        power-sensor@40 {
@@ -805,10 +797,8 @@
                        };
 
                        pwm@5e {
-                               compatible = "max31790";
+                               compatible = "maxim,max31790";
                                reg = <0x5e>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                        };
 
                        power-sensor@40 {
@@ -927,10 +917,8 @@
                        };
 
                        pwm@5e {
-                               compatible = "max31790";
+                               compatible = "maxim,max31790";
                                reg = <0x5e>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
                        };
 
                        power-sensor@40 {

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-tiogapass.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-tiogapass.dts
index 704ee684e0fb408b8dfc5d79cb8db70110272923..5d4c7d979f1e36396318e26312f9462e3ee4b5a4 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-tiogapass.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-tiogapass.dts
@@ -508,7 +508,7 @@
        status = "okay";
        //HSC, AirMax Conn A
        adm1278@45 {
-               compatible = "adm1275";
+               compatible = "adi,adm1275";
                reg = <0x45>;
                shunt-resistor-micro-ohms = <250>;
        };

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts
index c63f0b43090e17ee60d457a733484dd51416dbd0..fdcf4492fb4e4238a056eead6371727fc6d8f9da 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts
@@ -211,7 +211,7 @@
        status = "okay";
        bus-frequency = <90000>;
        HotSwap@10 {
-               compatible = "adm1272";
+               compatible = "adi,adm1272";
                reg = <0x10>;
        };
 

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts
index a1d3e046d4a224b0cb9fd7188cbe8b2680b24c01..7953059a6c675a725fbf512dfb70f898841152f4 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts
@@ -151,7 +151,7 @@
        };
 
        rtc@68 {
-               compatible = "dallas,ds3231";
+               compatible = "maxim,ds3231";
                reg = <0x68>;
        };
 };

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts
index fd361cf073c20420acfceb76a302234d9bce9da3..86451227847bead82279973219c0b22bc2cb620c 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts
@@ -509,7 +509,7 @@
                        reg = <1>;
 
                        cpu0_pvccin@60 {
-                               compatible = "isil,raa229004";
+                               compatible = "renesas,raa229004";
                                reg = <0x60>;
                        };
 
@@ -530,7 +530,7 @@
                        reg = <2>;
 
                        cpu1_pvccin@72 {
-                               compatible = "isil,raa229004";
+                               compatible = "renesas,raa229004";
                                reg = <0x72>;
                        };