* [PATCH] dt-bindings: i2c: Use correct vendor prefix for Atmel
@ 2018-11-23 12:10 Thierry Reding
2018-11-23 12:40 ` Peter Rosin
2018-11-23 12:51 ` [PATCH v2] " Thierry Reding
0 siblings, 2 replies; 11+ messages in thread
From: Thierry Reding @ 2018-11-23 12:10 UTC (permalink / raw)
To: Rob Herring; +Cc: Wolfram Sang, linux-i2c, devicetree, linux-kernel
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.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt | 2 +-
Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt | 2 +-
Documentation/devicetree/bindings/i2c/nxp,pca9541.txt | 2 +-
Documentation/devicetree/bindings/trivial-devices.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
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..b7a7eaf2979a 100644
--- a/Documentation/devicetree/bindings/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/trivial-devices.txt
@@ -21,7 +21,7 @@ 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,24c08 i2c serial eeprom (24cxx)
atmel,at97sc3204t i2c trusted platform module (TPM)
capella,cm32181 CM32181: Ambient Light Sensor
capella,cm3232 CM3232: Ambient Light Sensor
--
2.19.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] dt-bindings: i2c: Use correct vendor prefix for Atmel
2018-11-23 12:10 [PATCH] dt-bindings: i2c: Use correct vendor prefix for Atmel Thierry Reding
@ 2018-11-23 12:40 ` Peter Rosin
2018-11-23 12:47 ` Thierry Reding
2018-11-23 12:51 ` [PATCH v2] " Thierry Reding
1 sibling, 1 reply; 11+ messages in thread
From: Peter Rosin @ 2018-11-23 12:40 UTC (permalink / raw)
To: Thierry Reding, Rob Herring
Cc: Wolfram Sang, linux-i2c, devicetree, linux-kernel
On 2018-11-23 13:10, 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.
Fully agreed. However, given that atmel,24c08 is documented in .../eeprom/at24.txt
I think it would be better to remove at,24c08 from trivial-devices.txt
Cheers,
Peter
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
> Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt | 2 +-
> Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt | 2 +-
> Documentation/devicetree/bindings/i2c/nxp,pca9541.txt | 2 +-
> Documentation/devicetree/bindings/trivial-devices.txt | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> 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..b7a7eaf2979a 100644
> --- a/Documentation/devicetree/bindings/trivial-devices.txt
> +++ b/Documentation/devicetree/bindings/trivial-devices.txt
> @@ -21,7 +21,7 @@ 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,24c08 i2c serial eeprom (24cxx)
> atmel,at97sc3204t i2c trusted platform module (TPM)
> capella,cm32181 CM32181: Ambient Light Sensor
> capella,cm3232 CM3232: Ambient Light Sensor
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] dt-bindings: i2c: Use correct vendor prefix for Atmel
2018-11-23 12:40 ` Peter Rosin
@ 2018-11-23 12:47 ` Thierry Reding
0 siblings, 0 replies; 11+ messages in thread
From: Thierry Reding @ 2018-11-23 12:47 UTC (permalink / raw)
To: Peter Rosin
Cc: Rob Herring, Wolfram Sang, linux-i2c, devicetree, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
On Fri, Nov 23, 2018 at 12:40:19PM +0000, Peter Rosin wrote:
> On 2018-11-23 13:10, 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.
>
> Fully agreed. However, given that atmel,24c08 is documented in .../eeprom/at24.txt
> I think it would be better to remove at,24c08 from trivial-devices.txt
Good point, will respin.
Thanks,
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2] dt-bindings: i2c: Use correct vendor prefix for Atmel
2018-11-23 12:10 [PATCH] dt-bindings: i2c: Use correct vendor prefix for Atmel Thierry Reding
2018-11-23 12:40 ` Peter Rosin
@ 2018-11-23 12:51 ` Thierry Reding
2018-11-27 12:50 ` Wolfram Sang
2018-11-30 23:19 ` Wolfram Sang
1 sibling, 2 replies; 11+ messages in thread
From: Thierry Reding @ 2018-11-23 12:51 UTC (permalink / raw)
To: Rob Herring; +Cc: Wolfram Sang, linux-i2c, devicetree, linux-kernel
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>
---
Changes in v2:
- remove at,24c08 compatible from trivial-devices since it is already
documented in Documentation/devicetree/bindings/eeprom/at24.txt
Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt | 2 +-
Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt | 2 +-
Documentation/devicetree/bindings/i2c/nxp,pca9541.txt | 2 +-
Documentation/devicetree/bindings/trivial-devices.txt | 1 -
4 files changed, 3 insertions(+), 4 deletions(-)
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
--
2.19.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v2] dt-bindings: i2c: Use correct vendor prefix for Atmel
2018-11-23 12:51 ` [PATCH v2] " Thierry Reding
@ 2018-11-27 12:50 ` Wolfram Sang
2018-11-27 15:48 ` Peter Rosin
2018-12-03 20:50 ` Rob Herring
2018-11-30 23:19 ` Wolfram Sang
1 sibling, 2 replies; 11+ messages in thread
From: Wolfram Sang @ 2018-11-27 12:50 UTC (permalink / raw)
To: Thierry Reding, Peter Rosin
Cc: Rob Herring, linux-i2c, devicetree, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 512 bytes --]
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?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] dt-bindings: i2c: Use correct vendor prefix for Atmel
2018-11-27 12:50 ` Wolfram Sang
@ 2018-11-27 15:48 ` Peter Rosin
2018-12-03 20:50 ` Rob Herring
1 sibling, 0 replies; 11+ messages in thread
From: Peter Rosin @ 2018-11-27 15:48 UTC (permalink / raw)
To: Wolfram Sang, Thierry Reding
Cc: Rob Herring, linux-i2c, devicetree, linux-kernel
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] dt-bindings: i2c: Use correct vendor prefix for Atmel
2018-11-23 12:51 ` [PATCH v2] " Thierry Reding
2018-11-27 12:50 ` Wolfram Sang
@ 2018-11-30 23:19 ` Wolfram Sang
2018-12-11 19:49 ` Wolfram Sang
1 sibling, 1 reply; 11+ messages in thread
From: Wolfram Sang @ 2018-11-30 23:19 UTC (permalink / raw)
To: Thierry Reding; +Cc: Rob Herring, linux-i2c, devicetree, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
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!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] dt-bindings: i2c: Use correct vendor prefix for Atmel
2018-11-27 12:50 ` Wolfram Sang
2018-11-27 15:48 ` Peter Rosin
@ 2018-12-03 20:50 ` Rob Herring
2018-12-03 21:00 ` Wolfram Sang
1 sibling, 1 reply; 11+ messages in thread
From: Rob Herring @ 2018-12-03 20:50 UTC (permalink / raw)
To: Wolfram Sang
Cc: Thierry Reding, Peter Rosin, Linux I2C, devicetree, linux-kernel
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] dt-bindings: i2c: Use correct vendor prefix for Atmel
2018-12-03 20:50 ` Rob Herring
@ 2018-12-03 21:00 ` Wolfram Sang
2018-12-07 13:11 ` Wolfram Sang
0 siblings, 1 reply; 11+ messages in thread
From: Wolfram Sang @ 2018-12-03 21:00 UTC (permalink / raw)
To: Rob Herring
Cc: Thierry Reding, Peter Rosin, Linux I2C, devicetree, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 347 bytes --]
> 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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] dt-bindings: i2c: Use correct vendor prefix for Atmel
2018-12-03 21:00 ` Wolfram Sang
@ 2018-12-07 13:11 ` Wolfram Sang
0 siblings, 0 replies; 11+ messages in thread
From: Wolfram Sang @ 2018-12-07 13:11 UTC (permalink / raw)
To: Rob Herring
Cc: Thierry Reding, Peter Rosin, Linux I2C, devicetree, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 686 bytes --]
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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] dt-bindings: i2c: Use correct vendor prefix for Atmel
2018-11-30 23:19 ` Wolfram Sang
@ 2018-12-11 19:49 ` Wolfram Sang
0 siblings, 0 replies; 11+ messages in thread
From: Wolfram Sang @ 2018-12-11 19:49 UTC (permalink / raw)
To: Thierry Reding; +Cc: Rob Herring, linux-i2c, devicetree, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 688 bytes --]
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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2018-12-11 19:49 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-23 12:10 [PATCH] dt-bindings: i2c: Use correct vendor prefix for Atmel Thierry Reding
2018-11-23 12:40 ` Peter Rosin
2018-11-23 12:47 ` Thierry Reding
2018-11-23 12:51 ` [PATCH v2] " Thierry Reding
2018-11-27 12:50 ` Wolfram Sang
2018-11-27 15:48 ` Peter Rosin
2018-12-03 20:50 ` Rob Herring
2018-12-03 21:00 ` Wolfram Sang
2018-12-07 13:11 ` Wolfram Sang
2018-11-30 23:19 ` Wolfram Sang
2018-12-11 19:49 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).