powerpc/83xx: 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/mpc8308_p1m.dts b/arch/powerpc/boot/dts/mpc8308_p1m.dts
index 57f86cdf9f36e4fcde7f844731bfa3047be45d0a..cab933b3957a5c93b5dbad18e5236802497bd697 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8308_p1m.dts
+++ b/arch/powerpc/boot/dts/mpc8308_p1m.dts
@@ -123,7 +123,7 @@
                        interrupt-parent = <&ipic>;
                        dfsrr;
                        fram@50 {
-                               compatible = "ramtron,24c64";
+                               compatible = "ramtron,24c64", "atmel,24c64";
                                reg = <0x50>;
                        };
                };

diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index 90aed3ac2f69088121cc5c2f868239927b7ee121..648a85858eb5c941a6fecf361c5602cbf77cd1d7 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -92,7 +92,7 @@
                        dfsrr;
 
                        eeprom: at24@50 {
-                               compatible = "st,24c256";
+                               compatible = "st,24c256", "atmel,24c256";
                                reg = <0x50>;
                        };
 
@@ -130,7 +130,7 @@
                        };
 
                        spd: at24@51 {
-                               compatible = "at24,spd";
+                               compatible = "atmel,spd";
                                reg = <0x51>;
                        };
 

diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts
index e32613963ab00618a823e90b64460f08912905a7..5e85d8c93bca6b9de7eebbbd08c8ad4c01eef8c5 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8377_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts
@@ -150,7 +150,7 @@
                                };
 
                                at24@50 {
-                                       compatible = "at24,24c256";
+                                       compatible = "atmel,24c256";
                                        reg = <0x50>;
                                };
 

diff --git a/arch/powerpc/boot/dts/mpc8377_wlan.dts b/arch/powerpc/boot/dts/mpc8377_wlan.dts
index c0c790168b96a824f726b45236ee86f1152d8b0c..fee15fcbb46fd9b71bd9658ae74c0e11a5a5a563 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8377_wlan.dts
+++ b/arch/powerpc/boot/dts/mpc8377_wlan.dts
@@ -135,7 +135,7 @@
                                dfsrr;
 
                                at24@50 {
-                                       compatible = "at24,24c256";
+                                       compatible = "atmel,24c256";
                                        reg = <0x50>;
                                };
 

diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts
index 71842fcd621f70927067effc46aac4bc79cab658..e973d61956b9bc0d9961d5c09413dbec2348b4be 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8378_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts
@@ -150,7 +150,7 @@
                                };
 
                                at24@50 {
-                                       compatible = "at24,24c256";
+                                       compatible = "atmel,24c256";
                                        reg = <0x50>;
                                };
 

diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts
index e442a29b2fe039be3deb30554af4c8d45b6f5bc0..ed5d12ff2ee02f3323972cd22f8ef4e44ffc9b8c 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8379_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts
@@ -148,7 +148,7 @@
                                };
 
                                at24@50 {
-                                       compatible = "at24,24c256";
+                                       compatible = "atmel,24c256";
                                        reg = <0x50>;
                                };