dt-bindings: i2c: Use correct vendor prefix for Atmel

PATCH Superseded Thierry Reding 4 participants 11 messages Nov 23, 2018 – Dec 11, 2018

Subsystems (4)

Device tree bindings I2C subsystem host drivers I2C muxes LTC4306 I2C multiplexer driver

lore

Share & tools

lore

Thierry Reding

author

2018-11-23 12:10 UTC #0 lore raw

PATCH 1/1 dt-bindings: i2c: Use correct vendor prefix for Atmel

From: Thierry Reding <[email protected]>

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 <[email protected]>

---
 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(-)

Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt +1 -1

index 1e98c6b3a721..c661b9083ec6 100644
@@ -43,7 +43,7 @@ Example:
 			reg = <0>;
 
 			eeprom@50 {
-				compatible = "at,24c02";
+				compatible = "atmel,24c02";
 				reg = <0x50>;
 			};
 		};

Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt +1 -1

index ccf6c86ed076..30ac6a60f041 100644
@@ -54,7 +54,7 @@ Example:
 			reg = <2>;
 
 			eeprom@54 {
-				compatible = "at,24c08";
+				compatible = "atmel,24c08";
 				reg = <0x54>;
 			};
 		};

Documentation/devicetree/bindings/i2c/nxp,pca9541.txt +1 -1

index 0fbbc6970ec5..42bfc09c8918 100644
@@ -22,7 +22,7 @@ Example:
 			#size-cells = <0>;
 
 			eeprom@54 {
-				compatible = "at,24c08";
+				compatible = "atmel,24c08";
 				reg = <0x54>;
 			};
 		};

Documentation/devicetree/bindings/trivial-devices.txt +1 -1

index 6ab001fa1ed4..b7a7eaf2979a 100644
@@ -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

Signature · 1 line

2.19.1

Peter Rosin

2018-11-23 12:40 UTC #1 lore raw

Quoted 4 lines · Thierry Reding

From: Thierry Reding <[email protected]>
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

Quoted 61 lines

Signed-off-by Thierry Reding <[email protected]>

---
 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(-)

Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt +1 -1

index 1e98c6b3a721..c661b9083ec6 100644
@@ -43,7 +43,7 @@ Example:
 			reg = <0>;
 
 			eeprom@50 {
-				compatible = "at,24c02";
+				compatible = "atmel,24c02";
 				reg = <0x50>;
 			};
 		};

Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt +1 -1

index ccf6c86ed076..30ac6a60f041 100644
@@ -54,7 +54,7 @@ Example:
 			reg = <2>;
 
 			eeprom@54 {
-				compatible = "at,24c08";
+				compatible = "atmel,24c08";
 				reg = <0x54>;
 			};
 		};

Documentation/devicetree/bindings/i2c/nxp,pca9541.txt +1 -1

index 0fbbc6970ec5..42bfc09c8918 100644
@@ -22,7 +22,7 @@ Example:
 			#size-cells = <0>;
 
 			eeprom@54 {
-				compatible = "at,24c08";
+				compatible = "atmel,24c08";
 				reg = <0x54>;
 			};
 		};

Documentation/devicetree/bindings/trivial-devices.txt +1 -1

index 6ab001fa1ed4..b7a7eaf2979a 100644
@@ -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

Thierry Reding

author

2018-11-23 12:47 UTC #2 lore raw

Quoted 8 lines · Peter Rosin

Quoted 4 lines · Thierry Reding
From: Thierry Reding <[email protected]>
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

Thierry Reding

author

2018-11-23 12:51 UTC #3 lore raw

PATCH v2 1/1 dt-bindings: i2c: Use correct vendor prefix for Atmel

In reply to Thierry Reding

From: Thierry Reding <[email protected]>

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 <[email protected]>

---
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(-)

Documentation/devicetree/bindings/i2c/i2c-mux-ltc4306.txt +1 -1

index 1e98c6b3a721..c661b9083ec6 100644
@@ -43,7 +43,7 @@ Example:
 			reg = <0>;
 
 			eeprom@50 {
-				compatible = "at,24c02";
+				compatible = "atmel,24c02";
 				reg = <0x50>;
 			};
 		};

Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt +1 -1

index ccf6c86ed076..30ac6a60f041 100644
@@ -54,7 +54,7 @@ Example:
 			reg = <2>;
 
 			eeprom@54 {
-				compatible = "at,24c08";
+				compatible = "atmel,24c08";
 				reg = <0x54>;
 			};
 		};

Documentation/devicetree/bindings/i2c/nxp,pca9541.txt +1 -1

index 0fbbc6970ec5..42bfc09c8918 100644
@@ -22,7 +22,7 @@ Example:
 			#size-cells = <0>;
 
 			eeprom@54 {
-				compatible = "at,24c08";
+				compatible = "atmel,24c08";
 				reg = <0x54>;
 			};
 		};

Documentation/devicetree/bindings/trivial-devices.txt +0 -1

index 6ab001fa1ed4..94beb5a63ac2 100644
@@ -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

Signature · 1 line

2.19.1

Wolfram Sang

2018-11-27 12:50 UTC #4 lore raw

Quoted 9 lines · Thierry Reding

From: Thierry Reding <[email protected]>
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 <[email protected]>

Peter, I'd assume you are okay with me applying the patch directly?

Peter Rosin

Acked-by

2018-11-27 15:48 UTC #5 lore raw

Quoted 6 lines · Wolfram Sang

Quoted 5 lines · Thierry Reding
From: Thierry Reding <[email protected]>
The "at," prefix was never correct for Atmel, so fix the few occurrences that got it wrong. Use "atmel," instead.

Quoted 6 lines

Quoted 4 lines
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 <[email protected]>
Peter, I'd assume you are okay with me applying the patch directly?

Absolutely, go ahead.

Acked-by Peter Rosin <[email protected]>

Cheers,
Peter

Rob Herring

2018-12-03 20:50 UTC #6 lore raw

In reply to Wolfram Sang

Quoted 7 lines · Wolfram Sang

Quoted 5 lines · Thierry Reding
From: Thierry Reding <[email protected]>
The "at," prefix was never correct for Atmel, so fix the few occurrences that got it wrong. Use "atmel," instead.

Quoted 6 lines

Quoted 4 lines
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 <[email protected]>
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

Wolfram Sang

2018-12-03 21:00 UTC #7 lore raw

Quoted 4 lines

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.

Wolfram Sang

2018-12-07 13:11 UTC #8 lore raw

Quoted 8 lines · Wolfram Sang

Quoted 4 lines
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.

Wolfram Sang

Applied

2018-11-30 23:19 UTC #9 lore raw

In reply to Thierry Reding

Quoted 9 lines · Thierry Reding

From: Thierry Reding <[email protected]>
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 <[email protected]>

Applied to for-current, thanks!

Wolfram Sang

2018-12-11 19:49 UTC #10 lore raw

Quoted 6 lines · Wolfram Sang

Quoted 5 lines · Thierry Reding
From: Thierry Reding <[email protected]>
The "at," prefix was never correct for Atmel, so fix the few occurrences that got it wrong. Use "atmel," instead.

Quoted 6 lines

Quoted 4 lines
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 <[email protected]>
Applied to for-current, thanks!

Reconsidered (as discussed) and applied to for-next with 'trivial-devices' hunk droppend and Bartosz' patch squashed in.