powerpc/fsl: Add generic compatible string for I2C EEPROM

The at24 driver allows to register I2C EEPROM chips using different vendor
and devices, but the I2C subsystem does not take the vendor into account
when matching using the I2C table since it only has device entries.

But when matching using an OF table, both the vendor and device has to be
taken into account so the driver defines only a set of compatible strings
using the "atmel" vendor as a generic fallback for compatible I2C devices.

So add this generic fallback to the device node compatible string to make
the device to match the driver using the OF device ID table.

Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/boot/dts/fsl/b4qds.dtsi b/arch/powerpc/boot/dts/fsl/b4qds.dtsi
index 3785ef826d0734a4cac3c3774d6a07c6ff8f951f..999efd3bc1674f337ae2d0a680dae373505de6a9 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/b4qds.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4qds.dtsi
@@ -166,19 +166,19 @@
                                        reg = <0>;
 
                                        eeprom@50 {
-                                               compatible = "at24,24c64";
+                                               compatible = "atmel,24c64";
                                                reg = <0x50>;
                                        };
                                        eeprom@51 {
-                                               compatible = "at24,24c256";
+                                               compatible = "atmel,24c256";
                                                reg = <0x51>;
                                        };
                                        eeprom@53 {
-                                               compatible = "at24,24c256";
+                                               compatible = "atmel,24c256";
                                                reg = <0x53>;
                                        };
                                        eeprom@57 {
-                                               compatible = "at24,24c256";
+                                               compatible = "atmel,24c256";
                                                reg = <0x57>;
                                        };
                                        rtc@68 {

diff --git a/arch/powerpc/boot/dts/fsl/c293pcie.dts b/arch/powerpc/boot/dts/fsl/c293pcie.dts
index 66709788429da7a103f0e41ae122fbdf21a6cfdf..5e905e0857cf9d2fc0aa23f36e5e8c2b53b409c6 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/c293pcie.dts
+++ b/arch/powerpc/boot/dts/fsl/c293pcie.dts
@@ -153,7 +153,7 @@
 &soc {
        i2c@3000 {
                eeprom@50 {
-                       compatible = "st,24c1024";
+                       compatible = "st,24c1024", "atmel,24c1024";
                        reg = <0x50>;
                };
 

diff --git a/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi b/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
index a8e4ba070104ebba852e7c52a4dab34c22c0202e..2ca9cee2ddeb25479be85330d8644a58cdc18d57 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
@@ -89,7 +89,7 @@
 &board_soc {
        i2c@3000 {
                eeprom@50 {
-                       compatible = "st,24c256";
+                       compatible = "st,24c256", "atmel,24c256";
                        reg = <0x50>;
                };
 

diff --git a/arch/powerpc/boot/dts/fsl/p1023rdb.dts b/arch/powerpc/boot/dts/fsl/p1023rdb.dts
index 9716ca64651cbca879743ef61ea604e09b10dbe1..ead928364bebeec5c08006264cf7313cf3886438 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p1023rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/p1023rdb.dts
@@ -79,7 +79,7 @@
 
                i2c@3000 {
                        eeprom@53 {
-                               compatible = "at24,24c04";
+                               compatible = "atmel,24c04";
                                reg = <0x53>;
                        };
 

diff --git a/arch/powerpc/boot/dts/fsl/p2041rdb.dts b/arch/powerpc/boot/dts/fsl/p2041rdb.dts
index e50fea95a853cb18239cce36c6edcec1276ee6b1..950816b9d6e1bb9e1194fd9a13a25a040bd0fea1 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p2041rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/p2041rdb.dts
@@ -127,7 +127,7 @@
                                reg = <0x48>;
                        };
                        eeprom@50 {
-                               compatible = "at24,24c256";
+                               compatible = "atmel,24c256";
                                reg = <0x50>;
                        };
                        rtc@68 {
@@ -142,7 +142,7 @@
 
                i2c@118100 {
                        eeprom@50 {
-                               compatible = "at24,24c256";
+                               compatible = "atmel,24c256";
                                reg = <0x50>;
                        };
                };

diff --git a/arch/powerpc/boot/dts/fsl/p3041ds.dts b/arch/powerpc/boot/dts/fsl/p3041ds.dts
index 40748e415adbab4c448a4ef8cffa70f260d7d599..6f5f7283c533b1de2112b643a9fd419d8931297a 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p3041ds.dts
+++ b/arch/powerpc/boot/dts/fsl/p3041ds.dts
@@ -124,11 +124,11 @@
 
                i2c@118100 {
                        eeprom@51 {
-                               compatible = "at24,24c256";
+                               compatible = "atmel,24c256";
                                reg = <0x51>;
                        };
                        eeprom@52 {
-                               compatible = "at24,24c256";
+                               compatible = "atmel,24c256";
                                reg = <0x52>;
                        };
                };

diff --git a/arch/powerpc/boot/dts/fsl/p4080ds.dts b/arch/powerpc/boot/dts/fsl/p4080ds.dts
index 816b9788d5f675858cda98d25517d04181a3efe9..65e20152e22f9e930d0b2e117b9a0b223da95f93 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p4080ds.dts
+++ b/arch/powerpc/boot/dts/fsl/p4080ds.dts
@@ -125,11 +125,11 @@
 
                i2c@118100 {
                        eeprom@51 {
-                               compatible = "at24,24c256";
+                               compatible = "atmel,24c256";
                                reg = <0x51>;
                        };
                        eeprom@52 {
-                               compatible = "at24,24c256";
+                               compatible = "atmel,24c256";
                                reg = <0x52>;
                        };
                        rtc@68 {

diff --git a/arch/powerpc/boot/dts/fsl/p5020ds.dts b/arch/powerpc/boot/dts/fsl/p5020ds.dts
index cd6f37386111a434955a398bbf848db7b727845d..b24adf902d8de192eadc90aed0c94b0625095250 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p5020ds.dts
+++ b/arch/powerpc/boot/dts/fsl/p5020ds.dts
@@ -124,11 +124,11 @@
 
                i2c@118100 {
                        eeprom@51 {
-                               compatible = "at24,24c256";
+                               compatible = "atmel,24c256";
                                reg = <0x51>;
                        };
                        eeprom@52 {
-                               compatible = "at24,24c256";
+                               compatible = "atmel,24c256";
                                reg = <0x52>;
                        };
                };

diff --git a/arch/powerpc/boot/dts/fsl/p5040ds.dts b/arch/powerpc/boot/dts/fsl/p5040ds.dts
index 45084738cf4e5978d202b6a49606f1b7ce1d7a37..30850b3228e08dd2f9bf8a5cf253f465e10ca388 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/p5040ds.dts
+++ b/arch/powerpc/boot/dts/fsl/p5040ds.dts
@@ -133,11 +133,11 @@
 
                i2c@118100 {
                        eeprom@51 {
-                               compatible = "at24,24c256";
+                               compatible = "atmel,24c256";
                                reg = <0x51>;
                        };
                        eeprom@52 {
-                               compatible = "at24,24c256";
+                               compatible = "atmel,24c256";
                                reg = <0x52>;
                        };
                };

diff --git a/arch/powerpc/boot/dts/fsl/t208xqds.dtsi b/arch/powerpc/boot/dts/fsl/t208xqds.dtsi
index ec080bd01b0979b55f932c8d107c0d26212ace1b..db4139999b28ebf48ceb5b46a8e177430e974bae 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/t208xqds.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t208xqds.dtsi
@@ -147,17 +147,17 @@
                                        reg = <0x0>;
 
                                        eeprom@50 {
-                                               compatible = "at24,24c512";
+                                               compatible = "atmel,24c512";
                                                reg = <0x50>;
                                        };
 
                                        eeprom@51 {
-                                               compatible = "at24,24c02";
+                                               compatible = "atmel,24c02";
                                                reg = <0x51>;
                                        };
 
                                        eeprom@57 {
-                                               compatible = "at24,24c02";
+                                               compatible = "atmel,24c02";
                                                reg = <0x57>;
                                        };
 
@@ -174,7 +174,7 @@
                                        reg = <0x1>;
 
                                        eeprom@55 {
-                                               compatible = "at24,24c02";
+                                               compatible = "atmel,24c02";
                                                reg = <0x55>;
                                        };
                                };

diff --git a/arch/powerpc/boot/dts/fsl/t4240qds.dts b/arch/powerpc/boot/dts/fsl/t4240qds.dts
index 9573ceada07c2c79f394ee2c7275bb12b6e51a44..c0913ac5aaadb742ff5f4b16beef666aa2a93955 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/t4240qds.dts
+++ b/arch/powerpc/boot/dts/fsl/t4240qds.dts
@@ -377,27 +377,27 @@
                                        reg = <0>;
 
                                        eeprom@51 {
-                                               compatible = "at24,24c256";
+                                               compatible = "atmel,24c256";
                                                reg = <0x51>;
                                        };
                                        eeprom@52 {
-                                               compatible = "at24,24c256";
+                                               compatible = "atmel,24c256";
                                                reg = <0x52>;
                                        };
                                        eeprom@53 {
-                                               compatible = "at24,24c256";
+                                               compatible = "atmel,24c256";
                                                reg = <0x53>;
                                        };
                                        eeprom@54 {
-                                               compatible = "at24,24c256";
+                                               compatible = "atmel,24c256";
                                                reg = <0x54>;
                                        };
                                        eeprom@55 {
-                                               compatible = "at24,24c256";
+                                               compatible = "atmel,24c256";
                                                reg = <0x55>;
                                        };
                                        eeprom@56 {
-                                               compatible = "at24,24c256";
+                                               compatible = "atmel,24c256";
                                                reg = <0x56>;
                                        };
                                        rtc@68 {

diff --git a/arch/powerpc/boot/dts/fsl/t4240rdb.dts b/arch/powerpc/boot/dts/fsl/t4240rdb.dts
index 8166c660712a42c721403cd98262b9c74309dd82..15eb0a3f7290cb06e091e5bef930c1182813d550 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/t4240rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/t4240rdb.dts
@@ -130,15 +130,15 @@
                                reg = <0x2f>;
                        };
                        eeprom@52 {
-                               compatible = "at24,24c256";
+                               compatible = "atmel,24c256";
                                reg = <0x52>;
                        };
                        eeprom@54 {
-                               compatible = "at24,24c256";
+                               compatible = "atmel,24c256";
                                reg = <0x54>;
                        };
                        eeprom@56 {
-                               compatible = "at24,24c256";
+                               compatible = "atmel,24c256";
                                reg = <0x56>;
                        };
                        rtc@68 {