ARM: dts: omap: 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: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/am335x-baltos.dtsi b/arch/arm/boot/dts/am335x-baltos.dtsi
index d42b98f15e8b97aaa5956047b51bd1d4a8d610ed..ec6052c521ef33d085f701632e95961caf97b667 100644 (file)
--- a/arch/arm/boot/dts/am335x-baltos.dtsi
+++ b/arch/arm/boot/dts/am335x-baltos.dtsi
@@ -255,7 +255,7 @@
        };
 
        at24@50 {
-               compatible = "at24,24c02";
+               compatible = "atmel,24c02";
                pagesize = <8>;
                reg = <0x50>;
        };

diff --git a/arch/arm/boot/dts/am335x-base0033.dts b/arch/arm/boot/dts/am335x-base0033.dts
index c2bee452dab820c714f6fb119be756765bb2e6a8..29782be076057904bd636a557f5d5db94f019061 100644 (file)
--- a/arch/arm/boot/dts/am335x-base0033.dts
+++ b/arch/arm/boot/dts/am335x-base0033.dts
@@ -89,7 +89,7 @@
 
 &i2c0 {
        eeprom: eeprom@50 {
-               compatible = "at,24c256";
+               compatible = "atmel,24c256";
                reg = <0x50>;
        };
 };

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index bf6b26abe35b5d4587c2dc880477f9881a76a716..1d154444dfef245bf60e6336da038d1ff766512e 100644 (file)
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -232,7 +232,7 @@
        };
 
        baseboard_eeprom: baseboard_eeprom@50 {
-               compatible = "at,24c256";
+               compatible = "atmel,24c256";
                reg = <0x50>;
 
                #address-cells = <1>;
@@ -251,7 +251,7 @@
        clock-frequency = <100000>;
 
        cape_eeprom0: cape_eeprom0@54 {
-               compatible = "at,24c256";
+               compatible = "atmel,24c256";
                reg = <0x54>;
                #address-cells = <1>;
                #size-cells = <1>;
@@ -261,7 +261,7 @@
        };
 
        cape_eeprom1: cape_eeprom1@55 {
-               compatible = "at,24c256";
+               compatible = "atmel,24c256";
                reg = <0x55>;
                #address-cells = <1>;
                #size-cells = <1>;
@@ -271,7 +271,7 @@
        };
 
        cape_eeprom2: cape_eeprom2@56 {
-               compatible = "at,24c256";
+               compatible = "atmel,24c256";
                reg = <0x56>;
                #address-cells = <1>;
                #size-cells = <1>;
@@ -281,7 +281,7 @@
        };
 
        cape_eeprom3: cape_eeprom3@57 {
-               compatible = "at,24c256";
+               compatible = "atmel,24c256";
                reg = <0x57>;
                #address-cells = <1>;
                #size-cells = <1>;

diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts
index 807494bc722ba3934c61fe378a46f2079a5be33e..946d7069f41711df7d691b29ea56f64930996c44 100644 (file)
--- a/arch/arm/boot/dts/am335x-nano.dts
+++ b/arch/arm/boot/dts/am335x-nano.dts
@@ -224,7 +224,7 @@
        };
 
        eeprom@53 {
-               compatible = "microchip,24c02";
+               compatible = "microchip,24c02", "atmel,24c02";
                reg = <0x53>;
                pagesize = <8>;
        };

diff --git a/arch/arm/boot/dts/am335x-pepper.dts b/arch/arm/boot/dts/am335x-pepper.dts
index 30e2f8770aaf846431ebbc798fb12927985ddd80..03c7d77023c6a303213328ab6bde8de5f9f32288 100644 (file)
--- a/arch/arm/boot/dts/am335x-pepper.dts
+++ b/arch/arm/boot/dts/am335x-pepper.dts
@@ -67,7 +67,7 @@
        };
 
        eeprom: eeprom@50 {
-               compatible = "at,24c256";
+               compatible = "atmel,24c256";
                reg = <0x50>;
        };
 

diff --git a/arch/arm/boot/dts/am335x-shc.dts b/arch/arm/boot/dts/am335x-shc.dts
index bf8727a19ece554917920241f83c8c26b5f09a33..4f6a286ea293fa64710acb1e4585749c73cda3d9 100644 (file)
--- a/arch/arm/boot/dts/am335x-shc.dts
+++ b/arch/arm/boot/dts/am335x-shc.dts
@@ -188,7 +188,7 @@
        };
 
        at24@50 {
-               compatible = "at24,24c32";
+               compatible = "atmel,24c32";
                pagesize = <32>;
                reg = <0x50>;
        };

diff --git a/arch/arm/boot/dts/am335x-sl50.dts b/arch/arm/boot/dts/am335x-sl50.dts
index c5d2589c55fc3ddfab5909413e7bbfe59aba50f7..a82a4042eb9d63c987987ee2d8055a68e0dba435 100644 (file)
--- a/arch/arm/boot/dts/am335x-sl50.dts
+++ b/arch/arm/boot/dts/am335x-sl50.dts
@@ -309,7 +309,7 @@
        };
 
        eeprom: eeprom@50 {
-               compatible = "at,24c256";
+               compatible = "atmel,24c256";
                reg = <0x50>;
        };
 

diff --git a/arch/arm/boot/dts/am437x-idk-evm.dts b/arch/arm/boot/dts/am437x-idk-evm.dts
index c1f7f9336e644925eead9afa54fef4ddbfcaf6e3..5e364473067fadec33bbeea6b55107edeef0e45b 100644 (file)
--- a/arch/arm/boot/dts/am437x-idk-evm.dts
+++ b/arch/arm/boot/dts/am437x-idk-evm.dts
@@ -339,7 +339,7 @@
        clock-frequency = <400000>;
 
        at24@50 {
-               compatible = "at24,24c256";
+               compatible = "atmel,24c256";
                pagesize = <64>;
                reg = <0x50>;
        };

diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
index 4dc54bee2f36311cd5db14d2b80ebbc615aeb3cc..a62e1583da04189613a821fb02ed7d226415774a 100644 (file)
--- a/arch/arm/boot/dts/am437x-sk-evm.dts
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -511,7 +511,7 @@
        };
 
        at24@50 {
-               compatible = "at24,24c256";
+               compatible = "atmel,24c256";
                pagesize = <64>;
                reg = <0x50>;
        };

diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index 9acd4ccdec4e24fa21a9488814b0fc929fd1cc40..f6648ab10d29ee482d9236f0486e456d3673136c 100644 (file)
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -477,7 +477,7 @@
        };
 
        at24@50 {
-               compatible = "at24,24c256";
+               compatible = "atmel,24c256";
                pagesize = <64>;
                reg = <0x50>;
        };

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
index 585d792a8fdd125f57a3bf8f0e509241ea7c357d..fdfe5b16b806298a1aac3a136a873dfc2ab891df 100644 (file)
--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
@@ -388,7 +388,7 @@
        };
 
        eeprom: eeprom@50 {
-               compatible = "at,24c32";
+               compatible = "atmel,24c32";
                reg = <0x50>;
        };
 };

diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
index 57b9a028a49a688e0be95c39fed043c828c93223..fccd5383243cc1cf8924e8464a699f0d6dbdd726 100644 (file)
--- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
@@ -188,7 +188,7 @@
        clock-frequency = <400000>;
 
        at24@50 {
-               compatible = "at24,24c02";
+               compatible = "atmel,24c02";
                pagesize = <16>;
                reg = <0x50>;
        };

diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi
index b3a8b1f24499afe232d752ba16e15e45e4280d5b..43a0456e3dcc50d280c8c446124b7543cf6fd11e 100644 (file)
--- a/arch/arm/boot/dts/omap3-gta04.dtsi
+++ b/arch/arm/boot/dts/omap3-gta04.dtsi
@@ -418,7 +418,7 @@
 
        /* RFID EEPROM */
        m24lr64@50 {
-               compatible = "at,24c64";
+               compatible = "atmel,24c64";
                reg = <0x50>;
        };
 };

diff --git a/arch/arm/boot/dts/omap3-sb-t35.dtsi b/arch/arm/boot/dts/omap3-sb-t35.dtsi
index 91e15af789497a3d3af2117b8771b053f91340a1..4476fb685a1bf664de95111a259fa288cbb8a8d7 100644 (file)
--- a/arch/arm/boot/dts/omap3-sb-t35.dtsi
+++ b/arch/arm/boot/dts/omap3-sb-t35.dtsi
@@ -89,7 +89,7 @@
        clock-frequency = <400000>;
 
        at24@50 {
-               compatible = "at24,24c02";
+               compatible = "atmel,24c02";
                pagesize = <16>;
                reg = <0x50>;
        };

diff --git a/arch/arm/boot/dts/omap4-var-som-om44.dtsi b/arch/arm/boot/dts/omap4-var-som-om44.dtsi
index 758b6eb7ae43d975dc7df149a763b8fb605eceb4..6500bfc8d1309a26198893583bb00861d5a69a1e 100644 (file)
--- a/arch/arm/boot/dts/omap4-var-som-om44.dtsi
+++ b/arch/arm/boot/dts/omap4-var-som-om44.dtsi
@@ -241,7 +241,7 @@
        };
 
        eeprom@50 {
-               compatible = "microchip,24c32";
+               compatible = "microchip,24c32", "atmel,24c32";
                reg = <0x50>;
        };
 };

diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts
index b153f604932a8856291d349227d0221d1210d57f..78397f66d0b2d5611cf665ffbf72f2ac02035413 100644 (file)
--- a/arch/arm/boot/dts/omap5-cm-t54.dts
+++ b/arch/arm/boot/dts/omap5-cm-t54.dts
@@ -404,7 +404,7 @@
        clock-frequency = <400000>;
 
        at24@50 {
-               compatible = "at24,24c02";
+               compatible = "atmel,24c02";
                pagesize = <16>;
                reg = <0x50>;
        };

diff --git a/arch/arm/boot/dts/omap5-sbc-t54.dts b/arch/arm/boot/dts/omap5-sbc-t54.dts
index 337bbbc01a350602ea00ca52c92482537c502351..7b8810d13257eb6d984fac0d64427a97239c7de6 100644 (file)
--- a/arch/arm/boot/dts/omap5-sbc-t54.dts
+++ b/arch/arm/boot/dts/omap5-sbc-t54.dts
@@ -44,7 +44,7 @@
        clock-frequency = <400000>;
 
        at24@50 {
-               compatible = "at24,24c02";
+               compatible = "atmel,24c02";
                pagesize = <16>;
                reg = <0x50>;
        };