powerpc/dts: fix STMicroelectronics compatible strings

Replace the non-standard vendor prefix stm and st-micro with st for
STMicroelectronics. The drivers do not specify the vendor prefixes
since the I2C Core strips them away from the DT provided compatible
string. Therefore, changing existing device trees does not have any
impact on device detection.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac14xx.dts
index a1b883730b3169d8171c06c4fdc2d50cfe874b41..27fcabc2f85769ed0bff24770c3ec192df83a7e6 100644 (file)
--- a/arch/powerpc/boot/dts/ac14xx.dts
+++ b/arch/powerpc/boot/dts/ac14xx.dts
@@ -231,7 +231,7 @@ at24@57 {
                        };
 
                        rtc@68 {
-                               compatible = "stm,m41t00";
+                               compatible = "st,m41t00";
                                reg = <0x68>;
                        };
                };

diff --git a/arch/powerpc/boot/dts/akebono.dts b/arch/powerpc/boot/dts/akebono.dts
index f92ecfed3d2f6c6f7ffe3cbb7ca5a55c4e2f8773..e61d5dc598c115b5aa5f8678d4e0b90be5bf7b81 100644 (file)
--- a/arch/powerpc/boot/dts/akebono.dts
+++ b/arch/powerpc/boot/dts/akebono.dts
@@ -224,7 +224,7 @@ IIC0: i2c@00000000 {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                rtc@68 {
-                                       compatible = "stm,m41t80", "m41st85";
+                                       compatible = "st,m41t80", "m41st85";
                                        reg = <0x68>;
                                };
                        };

diff --git a/arch/powerpc/boot/dts/bluestone.dts b/arch/powerpc/boot/dts/bluestone.dts
index 7daaca324c0158ad776cac8ee3d09a44a5795444..b0b26d8d68a28a5af603fcd950829956d9c40a89 100644 (file)
--- a/arch/powerpc/boot/dts/bluestone.dts
+++ b/arch/powerpc/boot/dts/bluestone.dts
@@ -279,7 +279,7 @@ IIC0: i2c@ef600700 {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                rtc@68 {
-                                       compatible = "stm,m41t80";
+                                       compatible = "st,m41t80";
                                        reg = <0x68>;
                                        interrupt-parent = <&UIC0>;
                                        interrupts = <0x9 0x8>;

diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts
index 549c24c4c388311f773b063bfc0b4beed32928f2..0d6ac92d0f5e4a62d2e2292a02c6fbc6f8044f13 100644 (file)
--- a/arch/powerpc/boot/dts/canyonlands.dts
+++ b/arch/powerpc/boot/dts/canyonlands.dts
@@ -319,7 +319,7 @@ IIC0: i2c@ef600700 {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                 rtc@68 {
-                                        compatible = "stm,m41t80";
+                                        compatible = "st,m41t80";
                                         reg = <0x68>;
                                        interrupt-parent = <&UIC2>;
                                        interrupts = <0x19 0x8>;

diff --git a/arch/powerpc/boot/dts/currituck.dts b/arch/powerpc/boot/dts/currituck.dts
index d2c8a872308e64d29665b1f5aada5d533fd36c5c..4191e1850ea1719929eb80e97e81f90ab5400057 100644 (file)
--- a/arch/powerpc/boot/dts/currituck.dts
+++ b/arch/powerpc/boot/dts/currituck.dts
@@ -116,7 +116,7 @@ IIC0: i2c@00000000 {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                 rtc@68 {
-                                        compatible = "stm,m41t80", "m41st85";
+                                        compatible = "st,m41t80", "m41st85";
                                         reg = <0x68>;
                                 };
                        };

diff --git a/arch/powerpc/boot/dts/fsl/mpc8569mds.dts b/arch/powerpc/boot/dts/fsl/mpc8569mds.dts
index a95ff7d2392c54ebb2fbefad98dfa35f4da1ab42..8e94448f296c5a4c7053e841a7aff4c267ac715e 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/mpc8569mds.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8569mds.dts
@@ -232,7 +232,7 @@ spi@4c0 {
                        mode = "cpu-qe";
 
                        serial-flash@0 {
-                               compatible = "stm,m25p40";
+                               compatible = "st,m25p40";
                                reg = <0>;
                                spi-max-frequency = <25000000>;
                        };

diff --git a/arch/powerpc/boot/dts/fsl/p1022rdk.dts b/arch/powerpc/boot/dts/fsl/p1022rdk.dts
index d505d7c51903b5879723c5b093f6e752635e2d7c..29e8af1e3711d70549758995bb96c69e4fc2208e 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1022rdk.dts
+++ b/arch/powerpc/boot/dts/fsl/p1022rdk.dts
@@ -57,7 +57,7 @@ wm8960:codec@1a {
                                clock-frequency = <12288000>;
                        };
                        rtc@68 {
-                               compatible = "stm,m41t62";
+                               compatible = "st,m41t62";
                                reg = <0x68>;
                        };
                        adt7461@4c{

diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts
index 2000060386d7c009572ef3dc204634a08bf3be25..a7a802f4ffddf98f7ba8775982d7a874016a8fcc 100644 (file)
--- a/arch/powerpc/boot/dts/glacier.dts
+++ b/arch/powerpc/boot/dts/glacier.dts
@@ -287,7 +287,7 @@ IIC0: i2c@ef600700 {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                rtc@68 {
-                                       compatible = "stm,m41t80";
+                                       compatible = "st,m41t80";
                                        reg = <0x68>;
                                        interrupt-parent = <&UIC2>;
                                        interrupts = <0x19 0x8>;

diff --git a/arch/powerpc/boot/dts/icon.dts b/arch/powerpc/boot/dts/icon.dts
index abcd0caeccae5e72ee9faf4dbb90041610296638..9c94fd737f7c3bf8add1ac4f8c142170cc38e9f6 100644 (file)
--- a/arch/powerpc/boot/dts/icon.dts
+++ b/arch/powerpc/boot/dts/icon.dts
@@ -256,7 +256,7 @@ IIC1: i2c@f0000500 {
                                #size-cells = <0>;
 
                                 rtc@68 {
-                                        compatible = "stm,m41t00";
+                                        compatible = "st,m41t00";
                                         reg = <0x68>;
                                 };
                        };

diff --git a/arch/powerpc/boot/dts/mpc5121ads.dts b/arch/powerpc/boot/dts/mpc5121ads.dts
index c228a0a232a652357355646a8b90706d3d7e14cc..75888ce2c792dfc5cb67c0063bb5f5843a0ea20f 100644 (file)
--- a/arch/powerpc/boot/dts/mpc5121ads.dts
+++ b/arch/powerpc/boot/dts/mpc5121ads.dts
@@ -99,7 +99,7 @@ eeprom@50 {
                        };
 
                        rtc@68 {
-                               compatible = "stm,m41t62";
+                               compatible = "st,m41t62";
                                reg = <0x68>;
                        };
                };

diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index cf8542401a3cc0a598911752dd763d506962a9a8..90aed3ac2f69088121cc5c2f868239927b7ee121 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -92,7 +92,7 @@ i2c@3000 {
                        dfsrr;
 
                        eeprom: at24@50 {
-                               compatible = "st-micro,24c256";
+                               compatible = "st,24c256";
                                reg = <0x50>;
                        };
 

diff --git a/arch/powerpc/boot/dts/mpc836x_rdk.dts b/arch/powerpc/boot/dts/mpc836x_rdk.dts
index daeacbdcf8b4648eafb9f2247f35257a08cb935f..47c5fc64e4338a75d91dca916f613bdf34b5c91f 100644 (file)
--- a/arch/powerpc/boot/dts/mpc836x_rdk.dts
+++ b/arch/powerpc/boot/dts/mpc836x_rdk.dts
@@ -416,7 +416,7 @@ upm@1,0 {
                        gpios = <&qe_pio_e 18 0>;
 
                        flash {
-                               compatible = "stm,nand512-a";
+                               compatible = "st,nand512-a";
                        };
                };
 

diff --git a/arch/powerpc/boot/dts/pdm360ng.dts b/arch/powerpc/boot/dts/pdm360ng.dts
index 871c16d1ad5e47dff2a9eda19708cfa61cdca928..0cec7244abe7ab7782db9f3318154155f0b2bc5e 100644 (file)
--- a/arch/powerpc/boot/dts/pdm360ng.dts
+++ b/arch/powerpc/boot/dts/pdm360ng.dts
@@ -103,7 +103,7 @@ eeprom@50 {
                        };
 
                        rtc@68 {
-                               compatible = "stm,m41t00";
+                               compatible = "st,m41t00";
                                reg = <0x68>;
                        };
                };

diff --git a/arch/powerpc/boot/dts/sam440ep.dts b/arch/powerpc/boot/dts/sam440ep.dts
index f0663be104210e4edc3eb527bc1dcfd0d6af7233..088361cf4636b327fc6af7d831f7164756045813 100644 (file)
--- a/arch/powerpc/boot/dts/sam440ep.dts
+++ b/arch/powerpc/boot/dts/sam440ep.dts
@@ -196,7 +196,7 @@ IIC0: i2c@ef600700 {
                                interrupt-parent = <&UIC0>;
                                interrupts = <2 4>;
                                rtc@68 {
-                                       compatible = "stm,m41t80";
+                                       compatible = "st,m41t80";
                                        reg = <0x68>;
                                };
                        };

diff --git a/arch/powerpc/boot/dts/xcalibur1501.dts b/arch/powerpc/boot/dts/xcalibur1501.dts
index c409cbafb12678b0782edce46af71f5040f933f5..1f2952dce77d5b76f44e1b098e28e0f5ea7cdbdb 100644 (file)
--- a/arch/powerpc/boot/dts/xcalibur1501.dts
+++ b/arch/powerpc/boot/dts/xcalibur1501.dts
@@ -238,7 +238,7 @@ eeprom@54 {
                        };
 
                        rtc@68 {
-                               compatible = "stm,m41t00",
+                               compatible = "st,m41t00",
                                             "dallas,ds1338";
                                reg = <0x68>;
                        };

diff --git a/arch/powerpc/boot/dts/xpedite5200.dts b/arch/powerpc/boot/dts/xpedite5200.dts
index 8fd7b703135723bf7015a8171cfc67920839a01f..5b10e56a1d8e006c73fcbc1ba54b02da5dfb15ee 100644 (file)
--- a/arch/powerpc/boot/dts/xpedite5200.dts
+++ b/arch/powerpc/boot/dts/xpedite5200.dts
@@ -130,7 +130,7 @@ eeprom@50 {
                        };
 
                        rtc@68 {
-                               compatible = "stm,m41t00",
+                               compatible = "st,m41t00",
                                             "dallas,ds1338";
                                reg = <0x68>;
                        };

diff --git a/arch/powerpc/boot/dts/xpedite5200_xmon.dts b/arch/powerpc/boot/dts/xpedite5200_xmon.dts
index 0baa8283d08c303b10afd5a89d938d0d49aab443..646acfbef0dd8c57b91b5483cd8bed606e69bcf2 100644 (file)
--- a/arch/powerpc/boot/dts/xpedite5200_xmon.dts
+++ b/arch/powerpc/boot/dts/xpedite5200_xmon.dts
@@ -134,7 +134,7 @@ eeprom@50 {
                        };
 
                        rtc@68 {
-                               compatible = "stm,m41t00",
+                               compatible = "st,m41t00",
                                             "dallas,ds1338";
                                reg = <0x68>;
                        };

diff --git a/arch/powerpc/boot/dts/xpedite5301.dts b/arch/powerpc/boot/dts/xpedite5301.dts
index 04cb410da48b78337b04fcfdc6b8940471917bda..7bcc94ffe53d698a3b012e5c9e81959399648e12 100644 (file)
--- a/arch/powerpc/boot/dts/xpedite5301.dts
+++ b/arch/powerpc/boot/dts/xpedite5301.dts
@@ -231,7 +231,7 @@ eeprom@54 {
                        };
 
                        rtc@68 {
-                               compatible = "stm,m41t00",
+                               compatible = "st,m41t00",
                                             "dallas,ds1338";
                                reg = <0x68>;
                        };

diff --git a/arch/powerpc/boot/dts/xpedite5330.dts b/arch/powerpc/boot/dts/xpedite5330.dts
index 73f8620f1ce7eeb714d6691b01d588a0c935f055..86df8bc6ebbde405ea2afe9ae923e0440ec33c94 100644 (file)
--- a/arch/powerpc/boot/dts/xpedite5330.dts
+++ b/arch/powerpc/boot/dts/xpedite5330.dts
@@ -267,7 +267,7 @@ eeprom@54 {
                        };
 
                        rtc@68 {
-                               compatible = "stm,m41t00",
+                               compatible = "st,m41t00",
                                             "dallas,ds1338";
                                reg = <0x68>;
                        };

diff --git a/arch/powerpc/boot/dts/xpedite5370.dts b/arch/powerpc/boot/dts/xpedite5370.dts
index cd0ea2b993622a8fc389b24a3387b2be72932948..b8ade094f93264355efb6b6edd47bfb8877dfedc 100644 (file)
--- a/arch/powerpc/boot/dts/xpedite5370.dts
+++ b/arch/powerpc/boot/dts/xpedite5370.dts
@@ -229,7 +229,7 @@ eeprom@54 {
                        };
 
                        rtc@68 {
-                               compatible = "stm,m41t00",
+                               compatible = "st,m41t00",
                                             "dallas,ds1338";
                                reg = <0x68>;
                        };