ARM: dts: uniphier: remove U-Boot own EEPROM compatible and property

The compatible string "i2c-eeprom" is U-Boot own compatible, which
has never been approved by the DT community. "u-boot,i2c-offset-len"
is also a U-Boot own hack.

Linux adds "atmel,*" as generic compatibles, and U-Boot also followed
it by commit d7e28918aa3f ("i2c_eeprom: Add reading support").

The U-Boot own hack is no longer needed. Just sync with Linux.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/dts/uniphier-ld11-global.dts b/arch/arm/dts/uniphier-ld11-global.dts
index 744b36e28a33588ec9bc5686a400b8fec351c351..7968d524351b3e83ce227784164cf690f5daa158 100644 (file)
--- a/arch/arm/dts/uniphier-ld11-global.dts
+++ b/arch/arm/dts/uniphier-ld11-global.dts
@@ -132,7 +132,7 @@
        };
 
        eeprom@50 {
-               compatible = "st,24c64", "atmel,24c64", "i2c-eeprom";
+               compatible = "st,24c64", "atmel,24c64";
                reg = <0x50>;
                pagesize = <32>;
        };

diff --git a/arch/arm/dts/uniphier-pro4-ace.dts b/arch/arm/dts/uniphier-pro4-ace.dts
index ce8ea7b79bbf3f34ac80efecbe9749c7eb2f7e6c..92cc48dd86d030ca59f68f96baa5746a6e4c94c6 100644 (file)
--- a/arch/arm/dts/uniphier-pro4-ace.dts
+++ b/arch/arm/dts/uniphier-pro4-ace.dts
@@ -50,10 +50,9 @@
        status = "okay";
 
        eeprom@54 {
-               compatible = "st,24c64", "atmel,24c64", "i2c-eeprom";
+               compatible = "st,24c64", "atmel,24c64";
                reg = <0x54>;
                pagesize = <32>;
-               u-boot,i2c-offset-len = <2>;
        };
 };
 

diff --git a/arch/arm/dts/uniphier-pro4-sanji.dts b/arch/arm/dts/uniphier-pro4-sanji.dts
index 686dd3af7e957f2ff4d99cb704d44fd4bc2b45f7..3b68a7c605c2a41182c5f76e19366b2980ff5966 100644 (file)
--- a/arch/arm/dts/uniphier-pro4-sanji.dts
+++ b/arch/arm/dts/uniphier-pro4-sanji.dts
@@ -45,10 +45,9 @@
        status = "okay";
 
        eeprom@54 {
-               compatible = "st,24c64", "atmel,24c64", "i2c-eeprom";
+               compatible = "st,24c64", "atmel,24c64";
                reg = <0x54>;
                pagesize = <32>;
-               u-boot,i2c-offset-len = <2>;
        };
 };
 

diff --git a/arch/arm/dts/uniphier-pxs2-gentil.dts b/arch/arm/dts/uniphier-pxs2-gentil.dts
index b13d6277bf13020ce85de4b186d17d081400a2cc..e27fd4f2a5690802fb317eb5e9359c3804acbeaa 100644 (file)
--- a/arch/arm/dts/uniphier-pxs2-gentil.dts
+++ b/arch/arm/dts/uniphier-pxs2-gentil.dts
@@ -48,10 +48,9 @@
        status = "okay";
 
        eeprom@54 {
-               compatible = "st,24c64", "atmel,24c64", "i2c-eeprom";
+               compatible = "st,24c64", "atmel,24c64";
                reg = <0x54>;
                pagesize = <32>;
-               u-boot,i2c-offset-len = <2>;
        };
 };
 

diff --git a/arch/arm/dts/uniphier-ref-daughter.dtsi b/arch/arm/dts/uniphier-ref-daughter.dtsi
index 9240a313b933181ce910c63608d5508b09685118..a11897669c26d88c15cf8a390cf1b7b945809c80 100644 (file)
--- a/arch/arm/dts/uniphier-ref-daughter.dtsi
+++ b/arch/arm/dts/uniphier-ref-daughter.dtsi
@@ -7,9 +7,8 @@
 
 &i2c0 {
        eeprom@50 {
-               compatible = "microchip,24lc128", "i2c-eeprom";
+               compatible = "microchip,24lc128", "atmel,24c128";
                reg = <0x50>;
                pagesize = <64>;
-               u-boot,i2c-offset-len = <2>;
        };
 };