Message ID | 20181123125138.22489-1-thierry.reding@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [v2] dt-bindings: i2c: Use correct vendor prefix for Atmel | expand |
On Fri, Nov 23, 2018 at 01:51:38PM +0100, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > The "at," prefix was never correct for Atmel, so fix the few occurrences > that got it wrong. Use "atmel," instead. > > While at it, remove the at,24c08 compatible string from the list of > trivial devices because it is already documented in eeprom/at24.txt. > > Signed-off-by: Thierry Reding <treding@nvidia.com> Peter, I'd assume you are okay with me applying the patch directly?
On 2018-11-27 13:50, Wolfram Sang wrote: > On Fri, Nov 23, 2018 at 01:51:38PM +0100, Thierry Reding wrote: >> From: Thierry Reding <treding@nvidia.com> >> >> The "at," prefix was never correct for Atmel, so fix the few occurrences >> that got it wrong. Use "atmel," instead. >> >> While at it, remove the at,24c08 compatible string from the list of >> trivial devices because it is already documented in eeprom/at24.txt. >> >> Signed-off-by: Thierry Reding <treding@nvidia.com> > > Peter, I'd assume you are okay with me applying the patch directly? Absolutely, go ahead. Acked-by: Peter Rosin <peda@axentia.se> Cheers, Peter
On Fri, Nov 23, 2018 at 01:51:38PM +0100, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > The "at," prefix was never correct for Atmel, so fix the few occurrences > that got it wrong. Use "atmel," instead. > > While at it, remove the at,24c08 compatible string from the list of > trivial devices because it is already documented in eeprom/at24.txt. > > Signed-off-by: Thierry Reding <treding@nvidia.com> Applied to for-current, thanks!
On Tue, Nov 27, 2018 at 6:50 AM Wolfram Sang <wsa@the-dreams.de> wrote: > > On Fri, Nov 23, 2018 at 01:51:38PM +0100, Thierry Reding wrote: > > From: Thierry Reding <treding@nvidia.com> > > > > The "at," prefix was never correct for Atmel, so fix the few occurrences > > that got it wrong. Use "atmel," instead. > > > > While at it, remove the at,24c08 compatible string from the list of > > trivial devices because it is already documented in eeprom/at24.txt. > > > > Signed-off-by: Thierry Reding <treding@nvidia.com> > > Peter, I'd assume you are okay with me applying the patch directly? Didn't we agree that I take trivial devices changes? Normally, it doesn't really matter, but I'll have to delay landing the json-schema conversion because this will conflict. Rob
> Didn't we agree that I take trivial devices changes? Normally, it > doesn't really matter, but I'll have to delay landing the json-schema > conversion because this will conflict. Oh, sorry, I missed that! I haven't send my pull request to Linus, so I can easily drop this patch again and apply a version not touching trivial-devices instead.
On Mon, Dec 03, 2018 at 10:00:35PM +0100, Wolfram Sang wrote: > > > Didn't we agree that I take trivial devices changes? Normally, it > > doesn't really matter, but I'll have to delay landing the json-schema > > conversion because this will conflict. > > Oh, sorry, I missed that! I haven't send my pull request to Linus, so I > can easily drop this patch again and apply a version not touching > trivial-devices instead. For the record, I really dropped this patch from my for-current queue and will apply it to my for-next queue without the 'trivial-devices' change once we agreed how to handle Bartosz' incremental patch on top of it. I hope this fits your needs.
On Sat, Dec 01, 2018 at 12:19:15AM +0100, Wolfram Sang wrote: > On Fri, Nov 23, 2018 at 01:51:38PM +0100, Thierry Reding wrote: > > From: Thierry Reding <treding@nvidia.com> > > > > The "at," prefix was never correct for Atmel, so fix the few occurrences > > that got it wrong. Use "atmel," instead. > > > > While at it, remove the at,24c08 compatible string from the list of > > trivial devices because it is already documented in eeprom/at24.txt. > > > > Signed-off-by: Thierry Reding <treding@nvidia.com> > > Applied to for-current, thanks! Reconsidered (as discussed) and applied to for-next with 'trivial-devices' hunk droppend and Bartosz' patch squashed in.
diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt b/Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt index 1e98c6b3a721..c661b9083ec6 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt @@ -43,7 +43,7 @@ Example: reg = <0>; eeprom@50 { - compatible = "at,24c02"; + compatible = "atmel,24c02"; reg = <0x50>; }; }; diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt b/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt index ccf6c86ed076..30ac6a60f041 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt @@ -54,7 +54,7 @@ Example: reg = <2>; eeprom@54 { - compatible = "at,24c08"; + compatible = "atmel,24c08"; reg = <0x54>; }; }; diff --git a/Documentation/devicetree/bindings/i2c/nxp,pca9541.txt b/Documentation/devicetree/bindings/i2c/nxp,pca9541.txt index 0fbbc6970ec5..42bfc09c8918 100644 --- a/Documentation/devicetree/bindings/i2c/nxp,pca9541.txt +++ b/Documentation/devicetree/bindings/i2c/nxp,pca9541.txt @@ -22,7 +22,7 @@ Example: #size-cells = <0>; eeprom@54 { - compatible = "at,24c08"; + compatible = "atmel,24c08"; reg = <0x54>; }; }; diff --git a/Documentation/devicetree/bindings/trivial-devices.txt b/Documentation/devicetree/bindings/trivial-devices.txt index 6ab001fa1ed4..94beb5a63ac2 100644 --- a/Documentation/devicetree/bindings/trivial-devices.txt +++ b/Documentation/devicetree/bindings/trivial-devices.txt @@ -21,7 +21,6 @@ adi,adt7490 +/-1C TDM Extended Temp Range I.C adi,adxl345 Three-Axis Digital Accelerometer adi,adxl346 Three-Axis Digital Accelerometer (backward-compatibility value "adi,adxl345" must be listed too) ams,iaq-core AMS iAQ-Core VOC Sensor -at,24c08 i2c serial eeprom (24cxx) atmel,at97sc3204t i2c trusted platform module (TPM) capella,cm32181 CM32181: Ambient Light Sensor capella,cm3232 CM3232: Ambient Light Sensor