| Message ID | 20200228125721.22470-3-yamada.masahiro@socionext.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] ARM: dts: uniphier: rename DT nodes to follow json-schema | expand |
On Fri, Feb 28, 2020 at 9:58 PM Masahiro Yamada <yamada.masahiro at socionext.com> wrote: > > 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 at socionext.com> > --- Applied to u-boot-uniphier. > > arch/arm/dts/uniphier-ld11-global.dts | 2 +- > arch/arm/dts/uniphier-pro4-ace.dts | 3 +-- > arch/arm/dts/uniphier-pro4-sanji.dts | 3 +-- > arch/arm/dts/uniphier-pxs2-gentil.dts | 3 +-- > arch/arm/dts/uniphier-ref-daughter.dtsi | 3 +-- > 5 files changed, 5 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/dts/uniphier-ld11-global.dts b/arch/arm/dts/uniphier-ld11-global.dts > index 744b36e28a33..7968d524351b 100644 > --- a/arch/arm/dts/uniphier-ld11-global.dts > +++ b/arch/arm/dts/uniphier-ld11-global.dts > @@ -132,7 +132,7 @@ > }; > > eeprom at 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 ce8ea7b79bbf..92cc48dd86d0 100644 > --- a/arch/arm/dts/uniphier-pro4-ace.dts > +++ b/arch/arm/dts/uniphier-pro4-ace.dts > @@ -50,10 +50,9 @@ > status = "okay"; > > eeprom at 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 686dd3af7e95..3b68a7c605c2 100644 > --- a/arch/arm/dts/uniphier-pro4-sanji.dts > +++ b/arch/arm/dts/uniphier-pro4-sanji.dts > @@ -45,10 +45,9 @@ > status = "okay"; > > eeprom at 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 b13d6277bf13..e27fd4f2a569 100644 > --- a/arch/arm/dts/uniphier-pxs2-gentil.dts > +++ b/arch/arm/dts/uniphier-pxs2-gentil.dts > @@ -48,10 +48,9 @@ > status = "okay"; > > eeprom at 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 9240a313b933..a11897669c26 100644 > --- a/arch/arm/dts/uniphier-ref-daughter.dtsi > +++ b/arch/arm/dts/uniphier-ref-daughter.dtsi > @@ -7,9 +7,8 @@ > > &i2c0 { > eeprom at 50 { > - compatible = "microchip,24lc128", "i2c-eeprom"; > + compatible = "microchip,24lc128", "atmel,24c128"; > reg = <0x50>; > pagesize = <64>; > - u-boot,i2c-offset-len = <2>; > }; > }; > -- > 2.17.1 >
diff --git a/arch/arm/dts/uniphier-ld11-global.dts b/arch/arm/dts/uniphier-ld11-global.dts index 744b36e28a33..7968d524351b 100644 --- a/arch/arm/dts/uniphier-ld11-global.dts +++ b/arch/arm/dts/uniphier-ld11-global.dts @@ -132,7 +132,7 @@ }; eeprom at 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 ce8ea7b79bbf..92cc48dd86d0 100644 --- a/arch/arm/dts/uniphier-pro4-ace.dts +++ b/arch/arm/dts/uniphier-pro4-ace.dts @@ -50,10 +50,9 @@ status = "okay"; eeprom at 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 686dd3af7e95..3b68a7c605c2 100644 --- a/arch/arm/dts/uniphier-pro4-sanji.dts +++ b/arch/arm/dts/uniphier-pro4-sanji.dts @@ -45,10 +45,9 @@ status = "okay"; eeprom at 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 b13d6277bf13..e27fd4f2a569 100644 --- a/arch/arm/dts/uniphier-pxs2-gentil.dts +++ b/arch/arm/dts/uniphier-pxs2-gentil.dts @@ -48,10 +48,9 @@ status = "okay"; eeprom at 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 9240a313b933..a11897669c26 100644 --- a/arch/arm/dts/uniphier-ref-daughter.dtsi +++ b/arch/arm/dts/uniphier-ref-daughter.dtsi @@ -7,9 +7,8 @@ &i2c0 { eeprom at 50 { - compatible = "microchip,24lc128", "i2c-eeprom"; + compatible = "microchip,24lc128", "atmel,24c128"; reg = <0x50>; pagesize = <64>; - u-boot,i2c-offset-len = <2>; }; };
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 at socionext.com> --- arch/arm/dts/uniphier-ld11-global.dts | 2 +- arch/arm/dts/uniphier-pro4-ace.dts | 3 +-- arch/arm/dts/uniphier-pro4-sanji.dts | 3 +-- arch/arm/dts/uniphier-pxs2-gentil.dts | 3 +-- arch/arm/dts/uniphier-ref-daughter.dtsi | 3 +-- 5 files changed, 5 insertions(+), 9 deletions(-)