aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Agner <stefan@agner.ch>2016-06-26 05:34:05 -0400
committerRob Herring <robh@kernel.org>2016-07-22 15:53:05 -0400
commit5edc2aae16bcea00bedddfadad94313de3d5dff1 (patch)
treed75b9fa616572dd4500af7fd60524f92f2bd3eec
parent0e13f99d3a4816a3996a69721388b4cf1a982cf8 (diff)
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>
-rw-r--r--arch/powerpc/boot/dts/ac14xx.dts2
-rw-r--r--arch/powerpc/boot/dts/akebono.dts2
-rw-r--r--arch/powerpc/boot/dts/bluestone.dts2
-rw-r--r--arch/powerpc/boot/dts/canyonlands.dts2
-rw-r--r--arch/powerpc/boot/dts/currituck.dts2
-rw-r--r--arch/powerpc/boot/dts/fsl/mpc8569mds.dts2
-rw-r--r--arch/powerpc/boot/dts/fsl/p1022rdk.dts2
-rw-r--r--arch/powerpc/boot/dts/glacier.dts2
-rw-r--r--arch/powerpc/boot/dts/icon.dts2
-rw-r--r--arch/powerpc/boot/dts/mpc5121ads.dts2
-rw-r--r--arch/powerpc/boot/dts/mpc8349emitx.dts2
-rw-r--r--arch/powerpc/boot/dts/mpc836x_rdk.dts2
-rw-r--r--arch/powerpc/boot/dts/pdm360ng.dts2
-rw-r--r--arch/powerpc/boot/dts/sam440ep.dts2
-rw-r--r--arch/powerpc/boot/dts/xcalibur1501.dts2
-rw-r--r--arch/powerpc/boot/dts/xpedite5200.dts2
-rw-r--r--arch/powerpc/boot/dts/xpedite5200_xmon.dts2
-rw-r--r--arch/powerpc/boot/dts/xpedite5301.dts2
-rw-r--r--arch/powerpc/boot/dts/xpedite5330.dts2
-rw-r--r--arch/powerpc/boot/dts/xpedite5370.dts2
20 files changed, 20 insertions, 20 deletions
diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac14xx.dts
index a1b883730b31..27fcabc2f857 100644
--- a/arch/powerpc/boot/dts/ac14xx.dts
+++ b/arch/powerpc/boot/dts/ac14xx.dts
@@ -231,7 +231,7 @@
231 }; 231 };
232 232
233 rtc@68 { 233 rtc@68 {
234 compatible = "stm,m41t00"; 234 compatible = "st,m41t00";
235 reg = <0x68>; 235 reg = <0x68>;
236 }; 236 };
237 }; 237 };
diff --git a/arch/powerpc/boot/dts/akebono.dts b/arch/powerpc/boot/dts/akebono.dts
index f92ecfed3d2f..e61d5dc598c1 100644
--- a/arch/powerpc/boot/dts/akebono.dts
+++ b/arch/powerpc/boot/dts/akebono.dts
@@ -224,7 +224,7 @@
224 #address-cells = <1>; 224 #address-cells = <1>;
225 #size-cells = <0>; 225 #size-cells = <0>;
226 rtc@68 { 226 rtc@68 {
227 compatible = "stm,m41t80", "m41st85"; 227 compatible = "st,m41t80", "m41st85";
228 reg = <0x68>; 228 reg = <0x68>;
229 }; 229 };
230 }; 230 };
diff --git a/arch/powerpc/boot/dts/bluestone.dts b/arch/powerpc/boot/dts/bluestone.dts
index 7daaca324c01..b0b26d8d68a2 100644
--- a/arch/powerpc/boot/dts/bluestone.dts
+++ b/arch/powerpc/boot/dts/bluestone.dts
@@ -279,7 +279,7 @@
279 #address-cells = <1>; 279 #address-cells = <1>;
280 #size-cells = <0>; 280 #size-cells = <0>;
281 rtc@68 { 281 rtc@68 {
282 compatible = "stm,m41t80"; 282 compatible = "st,m41t80";
283 reg = <0x68>; 283 reg = <0x68>;
284 interrupt-parent = <&UIC0>; 284 interrupt-parent = <&UIC0>;
285 interrupts = <0x9 0x8>; 285 interrupts = <0x9 0x8>;
diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts
index 549c24c4c388..0d6ac92d0f5e 100644
--- a/arch/powerpc/boot/dts/canyonlands.dts
+++ b/arch/powerpc/boot/dts/canyonlands.dts
@@ -319,7 +319,7 @@
319 #address-cells = <1>; 319 #address-cells = <1>;
320 #size-cells = <0>; 320 #size-cells = <0>;
321 rtc@68 { 321 rtc@68 {
322 compatible = "stm,m41t80"; 322 compatible = "st,m41t80";
323 reg = <0x68>; 323 reg = <0x68>;
324 interrupt-parent = <&UIC2>; 324 interrupt-parent = <&UIC2>;
325 interrupts = <0x19 0x8>; 325 interrupts = <0x19 0x8>;
diff --git a/arch/powerpc/boot/dts/currituck.dts b/arch/powerpc/boot/dts/currituck.dts
index d2c8a872308e..4191e1850ea1 100644
--- a/arch/powerpc/boot/dts/currituck.dts
+++ b/arch/powerpc/boot/dts/currituck.dts
@@ -116,7 +116,7 @@
116 #address-cells = <1>; 116 #address-cells = <1>;
117 #size-cells = <0>; 117 #size-cells = <0>;
118 rtc@68 { 118 rtc@68 {
119 compatible = "stm,m41t80", "m41st85"; 119 compatible = "st,m41t80", "m41st85";
120 reg = <0x68>; 120 reg = <0x68>;
121 }; 121 };
122 }; 122 };
diff --git a/arch/powerpc/boot/dts/fsl/mpc8569mds.dts b/arch/powerpc/boot/dts/fsl/mpc8569mds.dts
index a95ff7d2392c..8e94448f296c 100644
--- a/arch/powerpc/boot/dts/fsl/mpc8569mds.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8569mds.dts
@@ -232,7 +232,7 @@
232 mode = "cpu-qe"; 232 mode = "cpu-qe";
233 233
234 serial-flash@0 { 234 serial-flash@0 {
235 compatible = "stm,m25p40"; 235 compatible = "st,m25p40";
236 reg = <0>; 236 reg = <0>;
237 spi-max-frequency = <25000000>; 237 spi-max-frequency = <25000000>;
238 }; 238 };
diff --git a/arch/powerpc/boot/dts/fsl/p1022rdk.dts b/arch/powerpc/boot/dts/fsl/p1022rdk.dts
index d505d7c51903..29e8af1e3711 100644
--- a/arch/powerpc/boot/dts/fsl/p1022rdk.dts
+++ b/arch/powerpc/boot/dts/fsl/p1022rdk.dts
@@ -57,7 +57,7 @@
57 clock-frequency = <12288000>; 57 clock-frequency = <12288000>;
58 }; 58 };
59 rtc@68 { 59 rtc@68 {
60 compatible = "stm,m41t62"; 60 compatible = "st,m41t62";
61 reg = <0x68>; 61 reg = <0x68>;
62 }; 62 };
63 adt7461@4c{ 63 adt7461@4c{
diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts
index 2000060386d7..a7a802f4ffdd 100644
--- a/arch/powerpc/boot/dts/glacier.dts
+++ b/arch/powerpc/boot/dts/glacier.dts
@@ -287,7 +287,7 @@
287 #address-cells = <1>; 287 #address-cells = <1>;
288 #size-cells = <0>; 288 #size-cells = <0>;
289 rtc@68 { 289 rtc@68 {
290 compatible = "stm,m41t80"; 290 compatible = "st,m41t80";
291 reg = <0x68>; 291 reg = <0x68>;
292 interrupt-parent = <&UIC2>; 292 interrupt-parent = <&UIC2>;
293 interrupts = <0x19 0x8>; 293 interrupts = <0x19 0x8>;
diff --git a/arch/powerpc/boot/dts/icon.dts b/arch/powerpc/boot/dts/icon.dts
index abcd0caeccae..9c94fd737f7c 100644
--- a/arch/powerpc/boot/dts/icon.dts
+++ b/arch/powerpc/boot/dts/icon.dts
@@ -256,7 +256,7 @@
256 #size-cells = <0>; 256 #size-cells = <0>;
257 257
258 rtc@68 { 258 rtc@68 {
259 compatible = "stm,m41t00"; 259 compatible = "st,m41t00";
260 reg = <0x68>; 260 reg = <0x68>;
261 }; 261 };
262 }; 262 };
diff --git a/arch/powerpc/boot/dts/mpc5121ads.dts b/arch/powerpc/boot/dts/mpc5121ads.dts
index c228a0a232a6..75888ce2c792 100644
--- a/arch/powerpc/boot/dts/mpc5121ads.dts
+++ b/arch/powerpc/boot/dts/mpc5121ads.dts
@@ -99,7 +99,7 @@
99 }; 99 };
100 100
101 rtc@68 { 101 rtc@68 {
102 compatible = "stm,m41t62"; 102 compatible = "st,m41t62";
103 reg = <0x68>; 103 reg = <0x68>;
104 }; 104 };
105 }; 105 };
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index cf8542401a3c..90aed3ac2f69 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -92,7 +92,7 @@
92 dfsrr; 92 dfsrr;
93 93
94 eeprom: at24@50 { 94 eeprom: at24@50 {
95 compatible = "st-micro,24c256"; 95 compatible = "st,24c256";
96 reg = <0x50>; 96 reg = <0x50>;
97 }; 97 };
98 98
diff --git a/arch/powerpc/boot/dts/mpc836x_rdk.dts b/arch/powerpc/boot/dts/mpc836x_rdk.dts
index daeacbdcf8b4..47c5fc64e433 100644
--- a/arch/powerpc/boot/dts/mpc836x_rdk.dts
+++ b/arch/powerpc/boot/dts/mpc836x_rdk.dts
@@ -416,7 +416,7 @@
416 gpios = <&qe_pio_e 18 0>; 416 gpios = <&qe_pio_e 18 0>;
417 417
418 flash { 418 flash {
419 compatible = "stm,nand512-a"; 419 compatible = "st,nand512-a";
420 }; 420 };
421 }; 421 };
422 422
diff --git a/arch/powerpc/boot/dts/pdm360ng.dts b/arch/powerpc/boot/dts/pdm360ng.dts
index 871c16d1ad5e..0cec7244abe7 100644
--- a/arch/powerpc/boot/dts/pdm360ng.dts
+++ b/arch/powerpc/boot/dts/pdm360ng.dts
@@ -103,7 +103,7 @@
103 }; 103 };
104 104
105 rtc@68 { 105 rtc@68 {
106 compatible = "stm,m41t00"; 106 compatible = "st,m41t00";
107 reg = <0x68>; 107 reg = <0x68>;
108 }; 108 };
109 }; 109 };
diff --git a/arch/powerpc/boot/dts/sam440ep.dts b/arch/powerpc/boot/dts/sam440ep.dts
index f0663be10421..088361cf4636 100644
--- a/arch/powerpc/boot/dts/sam440ep.dts
+++ b/arch/powerpc/boot/dts/sam440ep.dts
@@ -196,7 +196,7 @@
196 interrupt-parent = <&UIC0>; 196 interrupt-parent = <&UIC0>;
197 interrupts = <2 4>; 197 interrupts = <2 4>;
198 rtc@68 { 198 rtc@68 {
199 compatible = "stm,m41t80"; 199 compatible = "st,m41t80";
200 reg = <0x68>; 200 reg = <0x68>;
201 }; 201 };
202 }; 202 };
diff --git a/arch/powerpc/boot/dts/xcalibur1501.dts b/arch/powerpc/boot/dts/xcalibur1501.dts
index c409cbafb126..1f2952dce77d 100644
--- a/arch/powerpc/boot/dts/xcalibur1501.dts
+++ b/arch/powerpc/boot/dts/xcalibur1501.dts
@@ -238,7 +238,7 @@
238 }; 238 };
239 239
240 rtc@68 { 240 rtc@68 {
241 compatible = "stm,m41t00", 241 compatible = "st,m41t00",
242 "dallas,ds1338"; 242 "dallas,ds1338";
243 reg = <0x68>; 243 reg = <0x68>;
244 }; 244 };
diff --git a/arch/powerpc/boot/dts/xpedite5200.dts b/arch/powerpc/boot/dts/xpedite5200.dts
index 8fd7b7031357..5b10e56a1d8e 100644
--- a/arch/powerpc/boot/dts/xpedite5200.dts
+++ b/arch/powerpc/boot/dts/xpedite5200.dts
@@ -130,7 +130,7 @@
130 }; 130 };
131 131
132 rtc@68 { 132 rtc@68 {
133 compatible = "stm,m41t00", 133 compatible = "st,m41t00",
134 "dallas,ds1338"; 134 "dallas,ds1338";
135 reg = <0x68>; 135 reg = <0x68>;
136 }; 136 };
diff --git a/arch/powerpc/boot/dts/xpedite5200_xmon.dts b/arch/powerpc/boot/dts/xpedite5200_xmon.dts
index 0baa8283d08c..646acfbef0dd 100644
--- a/arch/powerpc/boot/dts/xpedite5200_xmon.dts
+++ b/arch/powerpc/boot/dts/xpedite5200_xmon.dts
@@ -134,7 +134,7 @@
134 }; 134 };
135 135
136 rtc@68 { 136 rtc@68 {
137 compatible = "stm,m41t00", 137 compatible = "st,m41t00",
138 "dallas,ds1338"; 138 "dallas,ds1338";
139 reg = <0x68>; 139 reg = <0x68>;
140 }; 140 };
diff --git a/arch/powerpc/boot/dts/xpedite5301.dts b/arch/powerpc/boot/dts/xpedite5301.dts
index 04cb410da48b..7bcc94ffe53d 100644
--- a/arch/powerpc/boot/dts/xpedite5301.dts
+++ b/arch/powerpc/boot/dts/xpedite5301.dts
@@ -231,7 +231,7 @@
231 }; 231 };
232 232
233 rtc@68 { 233 rtc@68 {
234 compatible = "stm,m41t00", 234 compatible = "st,m41t00",
235 "dallas,ds1338"; 235 "dallas,ds1338";
236 reg = <0x68>; 236 reg = <0x68>;
237 }; 237 };
diff --git a/arch/powerpc/boot/dts/xpedite5330.dts b/arch/powerpc/boot/dts/xpedite5330.dts
index 73f8620f1ce7..86df8bc6ebbd 100644
--- a/arch/powerpc/boot/dts/xpedite5330.dts
+++ b/arch/powerpc/boot/dts/xpedite5330.dts
@@ -267,7 +267,7 @@
267 }; 267 };
268 268
269 rtc@68 { 269 rtc@68 {
270 compatible = "stm,m41t00", 270 compatible = "st,m41t00",
271 "dallas,ds1338"; 271 "dallas,ds1338";
272 reg = <0x68>; 272 reg = <0x68>;
273 }; 273 };
diff --git a/arch/powerpc/boot/dts/xpedite5370.dts b/arch/powerpc/boot/dts/xpedite5370.dts
index cd0ea2b99362..b8ade094f932 100644
--- a/arch/powerpc/boot/dts/xpedite5370.dts
+++ b/arch/powerpc/boot/dts/xpedite5370.dts
@@ -229,7 +229,7 @@
229 }; 229 };
230 230
231 rtc@68 { 231 rtc@68 {
232 compatible = "stm,m41t00", 232 compatible = "st,m41t00",
233 "dallas,ds1338"; 233 "dallas,ds1338";
234 reg = <0x68>; 234 reg = <0x68>;
235 }; 235 };