ARM: dts: aspeed: Fix/add I2C device vendor prefixes
Subsystems (2)
Rob Herring (Arm)
maintainerPATCH 1/1 ARM: dts: aspeed: Fix/add I2C device vendor prefixes
The ASpeed DTS files have various I2C devices with missing or incorrect vendor prefixes in their compatible strings. This hasn't really mattered and doesn't impact ABI compatibility as I2C devices get matched with their vendor prefix stripped.
With this, the "maxim,max31790" nodes now validate and have some warnings. Remove the spurious "#address-cells" and "#size-cells" properties to fix the warnings.
--- .../aspeed-bmc-arm-stardragon4800-rep2.dts | 2 +- .../dts/aspeed/aspeed-bmc-facebook-harma.dts | 8 ++----- .../aspeed/aspeed-bmc-facebook-minerva.dts | 24 +++++-------------- .../aspeed/aspeed-bmc-facebook-tiogapass.dts | 2 +- .../dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts | 2 +- .../dts/aspeed/aspeed-bmc-opp-palmetto.dts | 2 +- .../boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts | 4 ++-- 7 files changed, 14 insertions(+), 30 deletions(-)
arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts +1 -1
@@ -171,7 +171,7 @@ eeprom@50 { reg = <0x50>; }; dps650ab@58 { - compatible = "dps650ab"; + compatible = "delta,dps650ab"; reg = <0x58>; }; };
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts +2 -6
@@ -184,10 +184,8 @@ &i2c0 { status = "okay"; pwm@5e{ - compatible = "max31790"; + compatible = "maxim,max31790"; reg = <0x5e>; - #address-cells = <1>; - #size-cells = <0>; }; power-sensor@40 {
@@ -258,10 +256,8 @@ &i2c2 { status = "okay"; pwm@5e{ - compatible = "max31790"; + compatible = "maxim,max31790"; reg = <0x5e>; - #address-cells = <1>; - #size-cells = <0>; }; power-sensor@40 {
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts +6 -18
@@ -313,10 +313,8 @@ eeprom@50 { }; pwm@5e{ - compatible = "max31790"; + compatible = "maxim,max31790"; reg = <0x5e>; - #address-cells = <1>; - #size-cells = <0>; }; power-sensor@40 {
@@ -436,10 +434,8 @@ eeprom@50 { }; pwm@5e{ - compatible = "max31790"; + compatible = "maxim,max31790"; reg = <0x5e>; - #address-cells = <1>; - #size-cells = <0>; }; power-sensor@40 {
@@ -559,10 +555,8 @@ eeprom@50 { }; pwm@5e{ - compatible = "max31790"; + compatible = "maxim,max31790"; reg = <0x5e>; - #address-cells = <1>; - #size-cells = <0>; }; power-sensor@40 {
@@ -682,10 +676,8 @@ eeprom@50 { }; pwm@5e{ - compatible = "max31790"; + compatible = "maxim,max31790"; reg = <0x5e>; - #address-cells = <1>; - #size-cells = <0>; }; power-sensor@40 {
@@ -805,10 +797,8 @@ eeprom@50 { }; pwm@5e{ - compatible = "max31790"; + compatible = "maxim,max31790"; reg = <0x5e>; - #address-cells = <1>; - #size-cells = <0>; }; power-sensor@40 {
@@ -927,10 +917,8 @@ eeprom@50 { }; pwm@5e{ - compatible = "max31790"; + compatible = "maxim,max31790"; reg = <0x5e>; - #address-cells = <1>; - #size-cells = <0>; }; power-sensor@40 {
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-tiogapass.dts +1 -1
@@ -508,7 +508,7 @@ &i2c7 { status = "okay"; //HSC, AirMax Conn A adm1278@45 { - compatible = "adm1275"; + compatible = "adi,adm1275"; reg = <0x45>; shunt-resistor-micro-ohms = <250>; };
arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts +1 -1
@@ -211,7 +211,7 @@ &i2c1 { status = "okay"; bus-frequency = <90000>; HotSwap@10 { - compatible = "adm1272"; + compatible = "adi,adm1272"; reg = <0x10>; };
arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts +1 -1
@@ -151,7 +151,7 @@ eeprom@50 { }; rtc@68 { - compatible = "dallas,ds3231"; + compatible = "maxim,ds3231"; reg = <0x68>; }; };
arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts +2 -2
@@ -509,7 +509,7 @@ U197_PCA9546_CH1: i2c@1 { reg = <1>; cpu0_pvccin@60 { - compatible = "isil,raa229004"; + compatible = "renesas,raa229004"; reg = <0x60>; };
@@ -530,7 +530,7 @@ U197_PCA9546_CH2: i2c@2 { reg = <2>; cpu1_pvccin@72 { - compatible = "isil,raa229004"; + compatible = "renesas,raa229004"; reg = <0x72>; };
Signature · 1 line
2.50.1
Andrew Jeffery
maintainerHi Rob,
Quoted 18 lines · Rob Herring (Arm)
The ASpeed DTS files have various I2C devices with missing or incorrect vendor prefixes in their compatible strings. This hasn't really mattered and doesn't impact ABI compatibility as I2C devices get matched with their vendor prefix stripped.
With this, the "maxim,max31790" nodes now validate and have some warnings. Remove the spurious "#address-cells" and "#size-cells" properties to fix the warnings.
Signed-off-by Rob Herring (Arm) <[email protected]>---
.../aspeed-bmc-arm-stardragon4800-rep2.dts | 2 +- .../dts/aspeed/aspeed-bmc-facebook-harma.dts | 8 ++----- .../aspeed/aspeed-bmc-facebook-minerva.dts | 24 +++++-------------- .../aspeed/aspeed-bmc-facebook-tiogapass.dts | 2 +-.../dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts| 2 +- .../dts/aspeed/aspeed-bmc-opp-palmetto.dts | 2 +-.../boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts| 4 ++--
Quoted 2 lines
7 files changed, 14 insertions(+), 30 deletions(-)
I see you've applied this to your tree. Sorry for being slow on the up- take, I've been focusing on other things recently. Happy to take it though, if you're happy to drop it?
Andrew
Andrew Jeffery
maintainerQuoted 24 lines · Andrew Jeffery
Hi Rob,
Quoted 18 lines · Rob Herring (Arm)
The ASpeed DTS files have various I2C devices with missing or incorrect vendor prefixes in their compatible strings. This hasn't really mattered and doesn't impact ABI compatibility as I2C devices get matched with their vendor prefix stripped.
With this, the "maxim,max31790" nodes now validate and have some warnings. Remove the spurious "#address-cells" and "#size-cells" properties to fix the warnings.
Signed-off-by Rob Herring (Arm) <[email protected]>---
.../aspeed-bmc-arm-stardragon4800-rep2.dts | 2 +- .../dts/aspeed/aspeed-bmc-facebook-harma.dts | 8 ++----- .../aspeed/aspeed-bmc-facebook-minerva.dts | 24 +++++-------------- .../aspeed/aspeed-bmc-facebook-tiogapass.dts | 2 +-.../dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts| 2 +- .../dts/aspeed/aspeed-bmc-opp-palmetto.dts | 2 +-.../boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts| 4 ++--Quoted 2 lines
7 files changed, 14 insertions(+), 30 deletions(-)
Quoted 3 lines
I see you've applied this to your tree. Sorry for being slow on the up- take, I've been focusing on other things recently. Happy to take it though, if you're happy to drop it?
Actually, do you mind dropping it from your tree? It conflicts with Krzysztof's patch that I'd already applied:
https://lore.kernel.org/all/[email protected]/
I've applied your patch here with a note in the trailer:
Andrew
Rob Herring
maintainerQuoted 30 lines · Andrew Jeffery
Quoted 24 lines · Andrew Jeffery
Hi Rob,
Quoted 10 lines · Rob Herring (Arm)
The ASpeed DTS files have various I2C devices with missing or incorrect vendor prefixes in their compatible strings. This hasn't really mattered and doesn't impact ABI compatibility as I2C devices get matched with their vendor prefix stripped.
With this, the "maxim,max31790" nodes now validate and have some warnings. Remove the spurious "#address-cells" and "#size-cells" properties to fix the warnings.
Signed-off-by Rob Herring (Arm) <[email protected]>Quoted 10 lines
--- .../aspeed-bmc-arm-stardragon4800-rep2.dts | 2 +- .../dts/aspeed/aspeed-bmc-facebook-harma.dts | 8 ++----- .../aspeed/aspeed-bmc-facebook-minerva.dts | 24 +++++-------------- .../aspeed/aspeed-bmc-facebook-tiogapass.dts | 2 +- .../dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts | 2 +- .../dts/aspeed/aspeed-bmc-opp-palmetto.dts | 2 +- .../boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts | 4 ++-- 7 files changed, 14 insertions(+), 30 deletions(-)Quoted 3 lines
I see you've applied this to your tree. Sorry for being slow on the up- take, I've been focusing on other things recently. Happy to take it though, if you're happy to drop it?
Quoted 8 lines
Actually, do you mind dropping it from your tree? It conflicts with Krzysztof's patch that I'd already applied:
https://lore.kernel.org/all/[email protected]/
I've applied your patch here with a note in the trailer:
I've dropped it. That was inadvertent.
Rob