* [PATCH] arm: dts: aspeed: Use standard 'i2c' bus node name
@ 2024-05-31 19:31 Rob Herring (Arm)
2024-06-04 1:53 ` Andrew Jeffery
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Rob Herring (Arm) @ 2024-05-31 19:31 UTC (permalink / raw)
To: Krzysztof Kozlowski, Conor Dooley, Joel Stanley, Andrew Jeffery
Cc: devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
The standard node name for I2C buses is 'i2c'.
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
arch/arm/boot/dts/aspeed/aspeed-g4.dtsi | 28 +++++++++++-----------
arch/arm/boot/dts/aspeed/aspeed-g5.dtsi | 28 +++++++++++-----------
arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 32 ++++++++++++-------------
3 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
index 857cb26ed6d7..c669ec202085 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
@@ -463,7 +463,7 @@ i2c_ic: interrupt-controller@0 {
interrupt-controller;
};
- i2c0: i2c-bus@40 {
+ i2c0: i2c@40 {
#address-cells = <1>;
#size-cells = <0>;
@@ -478,7 +478,7 @@ i2c0: i2c-bus@40 {
/* Does not need pinctrl properties */
};
- i2c1: i2c-bus@80 {
+ i2c1: i2c@80 {
#address-cells = <1>;
#size-cells = <0>;
@@ -493,7 +493,7 @@ i2c1: i2c-bus@80 {
/* Does not need pinctrl properties */
};
- i2c2: i2c-bus@c0 {
+ i2c2: i2c@c0 {
#address-cells = <1>;
#size-cells = <0>;
@@ -509,7 +509,7 @@ i2c2: i2c-bus@c0 {
status = "disabled";
};
- i2c3: i2c-bus@100 {
+ i2c3: i2c@100 {
#address-cells = <1>;
#size-cells = <0>;
@@ -525,7 +525,7 @@ i2c3: i2c-bus@100 {
status = "disabled";
};
- i2c4: i2c-bus@140 {
+ i2c4: i2c@140 {
#address-cells = <1>;
#size-cells = <0>;
@@ -541,7 +541,7 @@ i2c4: i2c-bus@140 {
status = "disabled";
};
- i2c5: i2c-bus@180 {
+ i2c5: i2c@180 {
#address-cells = <1>;
#size-cells = <0>;
@@ -557,7 +557,7 @@ i2c5: i2c-bus@180 {
status = "disabled";
};
- i2c6: i2c-bus@1c0 {
+ i2c6: i2c@1c0 {
#address-cells = <1>;
#size-cells = <0>;
@@ -573,7 +573,7 @@ i2c6: i2c-bus@1c0 {
status = "disabled";
};
- i2c7: i2c-bus@300 {
+ i2c7: i2c@300 {
#address-cells = <1>;
#size-cells = <0>;
@@ -589,7 +589,7 @@ i2c7: i2c-bus@300 {
status = "disabled";
};
- i2c8: i2c-bus@340 {
+ i2c8: i2c@340 {
#address-cells = <1>;
#size-cells = <0>;
@@ -605,7 +605,7 @@ i2c8: i2c-bus@340 {
status = "disabled";
};
- i2c9: i2c-bus@380 {
+ i2c9: i2c@380 {
#address-cells = <1>;
#size-cells = <0>;
@@ -621,7 +621,7 @@ i2c9: i2c-bus@380 {
status = "disabled";
};
- i2c10: i2c-bus@3c0 {
+ i2c10: i2c@3c0 {
#address-cells = <1>;
#size-cells = <0>;
@@ -637,7 +637,7 @@ i2c10: i2c-bus@3c0 {
status = "disabled";
};
- i2c11: i2c-bus@400 {
+ i2c11: i2c@400 {
#address-cells = <1>;
#size-cells = <0>;
@@ -653,7 +653,7 @@ i2c11: i2c-bus@400 {
status = "disabled";
};
- i2c12: i2c-bus@440 {
+ i2c12: i2c@440 {
#address-cells = <1>;
#size-cells = <0>;
@@ -669,7 +669,7 @@ i2c12: i2c-bus@440 {
status = "disabled";
};
- i2c13: i2c-bus@480 {
+ i2c13: i2c@480 {
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
index e6f3cf3c721e..6e05cbcce49c 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
@@ -592,7 +592,7 @@ i2c_ic: interrupt-controller@0 {
interrupt-controller;
};
- i2c0: i2c-bus@40 {
+ i2c0: i2c@40 {
#address-cells = <1>;
#size-cells = <0>;
@@ -607,7 +607,7 @@ i2c0: i2c-bus@40 {
/* Does not need pinctrl properties */
};
- i2c1: i2c-bus@80 {
+ i2c1: i2c@80 {
#address-cells = <1>;
#size-cells = <0>;
@@ -622,7 +622,7 @@ i2c1: i2c-bus@80 {
/* Does not need pinctrl properties */
};
- i2c2: i2c-bus@c0 {
+ i2c2: i2c@c0 {
#address-cells = <1>;
#size-cells = <0>;
@@ -638,7 +638,7 @@ i2c2: i2c-bus@c0 {
status = "disabled";
};
- i2c3: i2c-bus@100 {
+ i2c3: i2c@100 {
#address-cells = <1>;
#size-cells = <0>;
@@ -654,7 +654,7 @@ i2c3: i2c-bus@100 {
status = "disabled";
};
- i2c4: i2c-bus@140 {
+ i2c4: i2c@140 {
#address-cells = <1>;
#size-cells = <0>;
@@ -670,7 +670,7 @@ i2c4: i2c-bus@140 {
status = "disabled";
};
- i2c5: i2c-bus@180 {
+ i2c5: i2c@180 {
#address-cells = <1>;
#size-cells = <0>;
@@ -686,7 +686,7 @@ i2c5: i2c-bus@180 {
status = "disabled";
};
- i2c6: i2c-bus@1c0 {
+ i2c6: i2c@1c0 {
#address-cells = <1>;
#size-cells = <0>;
@@ -702,7 +702,7 @@ i2c6: i2c-bus@1c0 {
status = "disabled";
};
- i2c7: i2c-bus@300 {
+ i2c7: i2c@300 {
#address-cells = <1>;
#size-cells = <0>;
@@ -718,7 +718,7 @@ i2c7: i2c-bus@300 {
status = "disabled";
};
- i2c8: i2c-bus@340 {
+ i2c8: i2c@340 {
#address-cells = <1>;
#size-cells = <0>;
@@ -734,7 +734,7 @@ i2c8: i2c-bus@340 {
status = "disabled";
};
- i2c9: i2c-bus@380 {
+ i2c9: i2c@380 {
#address-cells = <1>;
#size-cells = <0>;
@@ -750,7 +750,7 @@ i2c9: i2c-bus@380 {
status = "disabled";
};
- i2c10: i2c-bus@3c0 {
+ i2c10: i2c@3c0 {
#address-cells = <1>;
#size-cells = <0>;
@@ -766,7 +766,7 @@ i2c10: i2c-bus@3c0 {
status = "disabled";
};
- i2c11: i2c-bus@400 {
+ i2c11: i2c@400 {
#address-cells = <1>;
#size-cells = <0>;
@@ -782,7 +782,7 @@ i2c11: i2c-bus@400 {
status = "disabled";
};
- i2c12: i2c-bus@440 {
+ i2c12: i2c@440 {
#address-cells = <1>;
#size-cells = <0>;
@@ -798,7 +798,7 @@ i2c12: i2c-bus@440 {
status = "disabled";
};
- i2c13: i2c-bus@480 {
+ i2c13: i2c@480 {
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
index 7fb421153596..0c00882f111a 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
+++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
@@ -905,7 +905,7 @@ udma: dma-controller@1e79e000 {
#include "aspeed-g6-pinctrl.dtsi"
&i2c {
- i2c0: i2c-bus@80 {
+ i2c0: i2c@80 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0x80 0x80>;
@@ -919,7 +919,7 @@ i2c0: i2c-bus@80 {
status = "disabled";
};
- i2c1: i2c-bus@100 {
+ i2c1: i2c@100 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0x100 0x80>;
@@ -933,7 +933,7 @@ i2c1: i2c-bus@100 {
status = "disabled";
};
- i2c2: i2c-bus@180 {
+ i2c2: i2c@180 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0x180 0x80>;
@@ -947,7 +947,7 @@ i2c2: i2c-bus@180 {
status = "disabled";
};
- i2c3: i2c-bus@200 {
+ i2c3: i2c@200 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0x200 0x80>;
@@ -961,7 +961,7 @@ i2c3: i2c-bus@200 {
status = "disabled";
};
- i2c4: i2c-bus@280 {
+ i2c4: i2c@280 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0x280 0x80>;
@@ -975,7 +975,7 @@ i2c4: i2c-bus@280 {
status = "disabled";
};
- i2c5: i2c-bus@300 {
+ i2c5: i2c@300 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0x300 0x80>;
@@ -989,7 +989,7 @@ i2c5: i2c-bus@300 {
status = "disabled";
};
- i2c6: i2c-bus@380 {
+ i2c6: i2c@380 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0x380 0x80>;
@@ -1003,7 +1003,7 @@ i2c6: i2c-bus@380 {
status = "disabled";
};
- i2c7: i2c-bus@400 {
+ i2c7: i2c@400 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0x400 0x80>;
@@ -1017,7 +1017,7 @@ i2c7: i2c-bus@400 {
status = "disabled";
};
- i2c8: i2c-bus@480 {
+ i2c8: i2c@480 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0x480 0x80>;
@@ -1031,7 +1031,7 @@ i2c8: i2c-bus@480 {
status = "disabled";
};
- i2c9: i2c-bus@500 {
+ i2c9: i2c@500 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0x500 0x80>;
@@ -1045,7 +1045,7 @@ i2c9: i2c-bus@500 {
status = "disabled";
};
- i2c10: i2c-bus@580 {
+ i2c10: i2c@580 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0x580 0x80>;
@@ -1059,7 +1059,7 @@ i2c10: i2c-bus@580 {
status = "disabled";
};
- i2c11: i2c-bus@600 {
+ i2c11: i2c@600 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0x600 0x80>;
@@ -1073,7 +1073,7 @@ i2c11: i2c-bus@600 {
status = "disabled";
};
- i2c12: i2c-bus@680 {
+ i2c12: i2c@680 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0x680 0x80>;
@@ -1087,7 +1087,7 @@ i2c12: i2c-bus@680 {
status = "disabled";
};
- i2c13: i2c-bus@700 {
+ i2c13: i2c@700 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0x700 0x80>;
@@ -1101,7 +1101,7 @@ i2c13: i2c-bus@700 {
status = "disabled";
};
- i2c14: i2c-bus@780 {
+ i2c14: i2c@780 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0x780 0x80>;
@@ -1115,7 +1115,7 @@ i2c14: i2c-bus@780 {
status = "disabled";
};
- i2c15: i2c-bus@800 {
+ i2c15: i2c@800 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0x800 0x80>;
--
2.43.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] arm: dts: aspeed: Use standard 'i2c' bus node name
2024-05-31 19:31 [PATCH] arm: dts: aspeed: Use standard 'i2c' bus node name Rob Herring (Arm)
@ 2024-06-04 1:53 ` Andrew Jeffery
2024-06-07 9:44 ` kernel test robot
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Andrew Jeffery @ 2024-06-04 1:53 UTC (permalink / raw)
To: Rob Herring (Arm), Krzysztof Kozlowski, Conor Dooley,
Joel Stanley
Cc: devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
On Fri, 2024-05-31 at 14:31 -0500, Rob Herring (Arm) wrote:
> The standard node name for I2C buses is 'i2c'.
>
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Thanks, I've applied this a tree for Joel to pick up.
Andrew
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] arm: dts: aspeed: Use standard 'i2c' bus node name
2024-05-31 19:31 [PATCH] arm: dts: aspeed: Use standard 'i2c' bus node name Rob Herring (Arm)
2024-06-04 1:53 ` Andrew Jeffery
@ 2024-06-07 9:44 ` kernel test robot
2024-06-23 12:21 ` Krzysztof Kozlowski
2024-06-24 1:55 ` Joel Stanley
3 siblings, 0 replies; 7+ messages in thread
From: kernel test robot @ 2024-06-07 9:44 UTC (permalink / raw)
To: Rob Herring (Arm), Krzysztof Kozlowski, Conor Dooley,
Joel Stanley, Andrew Jeffery
Cc: llvm, oe-kbuild-all, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
Hi Rob,
kernel test robot noticed the following build warnings:
[auto build test WARNING on robh/for-next]
[also build test WARNING on krzk/for-next linus/master v6.10-rc2 next-20240607]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Rob-Herring-Arm/arm-dts-aspeed-Use-standard-i2c-bus-node-name/20240601-033514
base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
patch link: https://lore.kernel.org/r/20240531193115.3814887-1-robh%40kernel.org
patch subject: [PATCH] arm: dts: aspeed: Use standard 'i2c' bus node name
compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240607/202406071717.2B7aM49z-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202406071717.2B7aM49z-lkp@intel.com/
dtcheck warnings: (new ones prefixed by >>)
>> arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts:541.10-555.4: Warning (avoid_unnecessary_addr_size): /ahb/apb/bus@1e78a000/i2c@480/gpio@77: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
vim +541 arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts
36d96827f480e9 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Quan Nguyen 2022-08-17 532
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 533 &i2c8 {
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 534 status = "okay";
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 535
e998856086a41d arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-10-05 536 temperature-sensor@48 {
e998856086a41d arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-10-05 537 compatible = "ti,tmp112";
e998856086a41d arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-10-05 538 reg = <0x48>;
e998856086a41d arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-10-05 539 };
e998856086a41d arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-10-05 540
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 @541 gpio@77 {
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 542 compatible = "nxp,pca9539";
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 543 reg = <0x77>;
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 544 gpio-controller;
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 545 #address-cells = <1>;
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 546 #size-cells = <0>;
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 547 #gpio-cells = <2>;
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 548
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 549 bmc-ocp0-en-hog {
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 550 gpio-hog;
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 551 gpios = <7 GPIO_ACTIVE_LOW>;
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 552 output-high;
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 553 line-name = "bmc-ocp0-en-n";
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 554 };
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 555 };
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 556 };
695cb117ac2a36 arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts Chanh Nguyen 2023-02-28 557
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] arm: dts: aspeed: Use standard 'i2c' bus node name
2024-05-31 19:31 [PATCH] arm: dts: aspeed: Use standard 'i2c' bus node name Rob Herring (Arm)
2024-06-04 1:53 ` Andrew Jeffery
2024-06-07 9:44 ` kernel test robot
@ 2024-06-23 12:21 ` Krzysztof Kozlowski
2024-06-24 1:55 ` Joel Stanley
3 siblings, 0 replies; 7+ messages in thread
From: Krzysztof Kozlowski @ 2024-06-23 12:21 UTC (permalink / raw)
To: Krzysztof Kozlowski, Conor Dooley, Joel Stanley, Andrew Jeffery,
Rob Herring (Arm)
Cc: Krzysztof Kozlowski, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel
On Fri, 31 May 2024 14:31:14 -0500, Rob Herring (Arm) wrote:
> The standard node name for I2C buses is 'i2c'.
>
>
This one is waiting for 3 weeks and I think it wasn't applied. Let me know if
someone else should take it instead.
Applied, thanks!
[1/1] arm: dts: aspeed: Use standard 'i2c' bus node name
https://git.kernel.org/krzk/linux-dt/c/11afaf16a6540754d618179bd01791fc03480146
Best regards,
--
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] arm: dts: aspeed: Use standard 'i2c' bus node name
2024-05-31 19:31 [PATCH] arm: dts: aspeed: Use standard 'i2c' bus node name Rob Herring (Arm)
` (2 preceding siblings ...)
2024-06-23 12:21 ` Krzysztof Kozlowski
@ 2024-06-24 1:55 ` Joel Stanley
2024-06-24 4:46 ` Krzysztof Kozlowski
3 siblings, 1 reply; 7+ messages in thread
From: Joel Stanley @ 2024-06-24 1:55 UTC (permalink / raw)
To: Rob Herring (Arm)
Cc: Krzysztof Kozlowski, Conor Dooley, Andrew Jeffery, devicetree,
linux-arm-kernel, linux-aspeed, linux-kernel
On Sat, 1 Jun 2024 at 05:01, Rob Herring (Arm) <robh@kernel.org> wrote:
>
> The standard node name for I2C buses is 'i2c'.
Unfortunately this can't be merged, as it will break userspace. There
is a lot of code out there that looks up devices based on the device
tree node path:
https://github.com/openbmc/phosphor-state-manager/blob/3c1351cc2b63178876ef68f4107c9804d2e17dcc/meson.options#L140
Cheers,
Joel
>
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> ---
> arch/arm/boot/dts/aspeed/aspeed-g4.dtsi | 28 +++++++++++-----------
> arch/arm/boot/dts/aspeed/aspeed-g5.dtsi | 28 +++++++++++-----------
> arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 32 ++++++++++++-------------
> 3 files changed, 44 insertions(+), 44 deletions(-)
>
> diff --git a/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
> index 857cb26ed6d7..c669ec202085 100644
> --- a/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
> +++ b/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
> @@ -463,7 +463,7 @@ i2c_ic: interrupt-controller@0 {
> interrupt-controller;
> };
>
> - i2c0: i2c-bus@40 {
> + i2c0: i2c@40 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -478,7 +478,7 @@ i2c0: i2c-bus@40 {
> /* Does not need pinctrl properties */
> };
>
> - i2c1: i2c-bus@80 {
> + i2c1: i2c@80 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -493,7 +493,7 @@ i2c1: i2c-bus@80 {
> /* Does not need pinctrl properties */
> };
>
> - i2c2: i2c-bus@c0 {
> + i2c2: i2c@c0 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -509,7 +509,7 @@ i2c2: i2c-bus@c0 {
> status = "disabled";
> };
>
> - i2c3: i2c-bus@100 {
> + i2c3: i2c@100 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -525,7 +525,7 @@ i2c3: i2c-bus@100 {
> status = "disabled";
> };
>
> - i2c4: i2c-bus@140 {
> + i2c4: i2c@140 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -541,7 +541,7 @@ i2c4: i2c-bus@140 {
> status = "disabled";
> };
>
> - i2c5: i2c-bus@180 {
> + i2c5: i2c@180 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -557,7 +557,7 @@ i2c5: i2c-bus@180 {
> status = "disabled";
> };
>
> - i2c6: i2c-bus@1c0 {
> + i2c6: i2c@1c0 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -573,7 +573,7 @@ i2c6: i2c-bus@1c0 {
> status = "disabled";
> };
>
> - i2c7: i2c-bus@300 {
> + i2c7: i2c@300 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -589,7 +589,7 @@ i2c7: i2c-bus@300 {
> status = "disabled";
> };
>
> - i2c8: i2c-bus@340 {
> + i2c8: i2c@340 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -605,7 +605,7 @@ i2c8: i2c-bus@340 {
> status = "disabled";
> };
>
> - i2c9: i2c-bus@380 {
> + i2c9: i2c@380 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -621,7 +621,7 @@ i2c9: i2c-bus@380 {
> status = "disabled";
> };
>
> - i2c10: i2c-bus@3c0 {
> + i2c10: i2c@3c0 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -637,7 +637,7 @@ i2c10: i2c-bus@3c0 {
> status = "disabled";
> };
>
> - i2c11: i2c-bus@400 {
> + i2c11: i2c@400 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -653,7 +653,7 @@ i2c11: i2c-bus@400 {
> status = "disabled";
> };
>
> - i2c12: i2c-bus@440 {
> + i2c12: i2c@440 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -669,7 +669,7 @@ i2c12: i2c-bus@440 {
> status = "disabled";
> };
>
> - i2c13: i2c-bus@480 {
> + i2c13: i2c@480 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> diff --git a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
> index e6f3cf3c721e..6e05cbcce49c 100644
> --- a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
> +++ b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
> @@ -592,7 +592,7 @@ i2c_ic: interrupt-controller@0 {
> interrupt-controller;
> };
>
> - i2c0: i2c-bus@40 {
> + i2c0: i2c@40 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -607,7 +607,7 @@ i2c0: i2c-bus@40 {
> /* Does not need pinctrl properties */
> };
>
> - i2c1: i2c-bus@80 {
> + i2c1: i2c@80 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -622,7 +622,7 @@ i2c1: i2c-bus@80 {
> /* Does not need pinctrl properties */
> };
>
> - i2c2: i2c-bus@c0 {
> + i2c2: i2c@c0 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -638,7 +638,7 @@ i2c2: i2c-bus@c0 {
> status = "disabled";
> };
>
> - i2c3: i2c-bus@100 {
> + i2c3: i2c@100 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -654,7 +654,7 @@ i2c3: i2c-bus@100 {
> status = "disabled";
> };
>
> - i2c4: i2c-bus@140 {
> + i2c4: i2c@140 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -670,7 +670,7 @@ i2c4: i2c-bus@140 {
> status = "disabled";
> };
>
> - i2c5: i2c-bus@180 {
> + i2c5: i2c@180 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -686,7 +686,7 @@ i2c5: i2c-bus@180 {
> status = "disabled";
> };
>
> - i2c6: i2c-bus@1c0 {
> + i2c6: i2c@1c0 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -702,7 +702,7 @@ i2c6: i2c-bus@1c0 {
> status = "disabled";
> };
>
> - i2c7: i2c-bus@300 {
> + i2c7: i2c@300 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -718,7 +718,7 @@ i2c7: i2c-bus@300 {
> status = "disabled";
> };
>
> - i2c8: i2c-bus@340 {
> + i2c8: i2c@340 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -734,7 +734,7 @@ i2c8: i2c-bus@340 {
> status = "disabled";
> };
>
> - i2c9: i2c-bus@380 {
> + i2c9: i2c@380 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -750,7 +750,7 @@ i2c9: i2c-bus@380 {
> status = "disabled";
> };
>
> - i2c10: i2c-bus@3c0 {
> + i2c10: i2c@3c0 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -766,7 +766,7 @@ i2c10: i2c-bus@3c0 {
> status = "disabled";
> };
>
> - i2c11: i2c-bus@400 {
> + i2c11: i2c@400 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -782,7 +782,7 @@ i2c11: i2c-bus@400 {
> status = "disabled";
> };
>
> - i2c12: i2c-bus@440 {
> + i2c12: i2c@440 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -798,7 +798,7 @@ i2c12: i2c-bus@440 {
> status = "disabled";
> };
>
> - i2c13: i2c-bus@480 {
> + i2c13: i2c@480 {
> #address-cells = <1>;
> #size-cells = <0>;
>
> diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
> index 7fb421153596..0c00882f111a 100644
> --- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
> +++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
> @@ -905,7 +905,7 @@ udma: dma-controller@1e79e000 {
> #include "aspeed-g6-pinctrl.dtsi"
>
> &i2c {
> - i2c0: i2c-bus@80 {
> + i2c0: i2c@80 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0x80 0x80>;
> @@ -919,7 +919,7 @@ i2c0: i2c-bus@80 {
> status = "disabled";
> };
>
> - i2c1: i2c-bus@100 {
> + i2c1: i2c@100 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0x100 0x80>;
> @@ -933,7 +933,7 @@ i2c1: i2c-bus@100 {
> status = "disabled";
> };
>
> - i2c2: i2c-bus@180 {
> + i2c2: i2c@180 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0x180 0x80>;
> @@ -947,7 +947,7 @@ i2c2: i2c-bus@180 {
> status = "disabled";
> };
>
> - i2c3: i2c-bus@200 {
> + i2c3: i2c@200 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0x200 0x80>;
> @@ -961,7 +961,7 @@ i2c3: i2c-bus@200 {
> status = "disabled";
> };
>
> - i2c4: i2c-bus@280 {
> + i2c4: i2c@280 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0x280 0x80>;
> @@ -975,7 +975,7 @@ i2c4: i2c-bus@280 {
> status = "disabled";
> };
>
> - i2c5: i2c-bus@300 {
> + i2c5: i2c@300 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0x300 0x80>;
> @@ -989,7 +989,7 @@ i2c5: i2c-bus@300 {
> status = "disabled";
> };
>
> - i2c6: i2c-bus@380 {
> + i2c6: i2c@380 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0x380 0x80>;
> @@ -1003,7 +1003,7 @@ i2c6: i2c-bus@380 {
> status = "disabled";
> };
>
> - i2c7: i2c-bus@400 {
> + i2c7: i2c@400 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0x400 0x80>;
> @@ -1017,7 +1017,7 @@ i2c7: i2c-bus@400 {
> status = "disabled";
> };
>
> - i2c8: i2c-bus@480 {
> + i2c8: i2c@480 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0x480 0x80>;
> @@ -1031,7 +1031,7 @@ i2c8: i2c-bus@480 {
> status = "disabled";
> };
>
> - i2c9: i2c-bus@500 {
> + i2c9: i2c@500 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0x500 0x80>;
> @@ -1045,7 +1045,7 @@ i2c9: i2c-bus@500 {
> status = "disabled";
> };
>
> - i2c10: i2c-bus@580 {
> + i2c10: i2c@580 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0x580 0x80>;
> @@ -1059,7 +1059,7 @@ i2c10: i2c-bus@580 {
> status = "disabled";
> };
>
> - i2c11: i2c-bus@600 {
> + i2c11: i2c@600 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0x600 0x80>;
> @@ -1073,7 +1073,7 @@ i2c11: i2c-bus@600 {
> status = "disabled";
> };
>
> - i2c12: i2c-bus@680 {
> + i2c12: i2c@680 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0x680 0x80>;
> @@ -1087,7 +1087,7 @@ i2c12: i2c-bus@680 {
> status = "disabled";
> };
>
> - i2c13: i2c-bus@700 {
> + i2c13: i2c@700 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0x700 0x80>;
> @@ -1101,7 +1101,7 @@ i2c13: i2c-bus@700 {
> status = "disabled";
> };
>
> - i2c14: i2c-bus@780 {
> + i2c14: i2c@780 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0x780 0x80>;
> @@ -1115,7 +1115,7 @@ i2c14: i2c-bus@780 {
> status = "disabled";
> };
>
> - i2c15: i2c-bus@800 {
> + i2c15: i2c@800 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0x800 0x80>;
> --
> 2.43.0
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] arm: dts: aspeed: Use standard 'i2c' bus node name
2024-06-24 1:55 ` Joel Stanley
@ 2024-06-24 4:46 ` Krzysztof Kozlowski
2024-06-24 16:49 ` Rob Herring
0 siblings, 1 reply; 7+ messages in thread
From: Krzysztof Kozlowski @ 2024-06-24 4:46 UTC (permalink / raw)
To: Joel Stanley, Rob Herring (Arm)
Cc: Krzysztof Kozlowski, Conor Dooley, Andrew Jeffery, devicetree,
linux-arm-kernel, linux-aspeed, linux-kernel
On 24/06/2024 03:55, Joel Stanley wrote:
> On Sat, 1 Jun 2024 at 05:01, Rob Herring (Arm) <robh@kernel.org> wrote:
>>
>> The standard node name for I2C buses is 'i2c'.
>
> Unfortunately this can't be merged, as it will break userspace. There
> is a lot of code out there that looks up devices based on the device
> tree node path:
>
> https://github.com/openbmc/phosphor-state-manager/blob/3c1351cc2b63178876ef68f4107c9804d2e17dcc/meson.options#L140
Eh, thanks for sharing.
That's totally stupid user-space. The sysfs path to /sys/devices, or
some grep by compatible, would be fine, but iterating over firmware/DT
is just wrong.
Reminds me USB and ChromeOS. They could fix their userspace, so probably
folks here can as well. I filled a bug.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] arm: dts: aspeed: Use standard 'i2c' bus node name
2024-06-24 4:46 ` Krzysztof Kozlowski
@ 2024-06-24 16:49 ` Rob Herring
0 siblings, 0 replies; 7+ messages in thread
From: Rob Herring @ 2024-06-24 16:49 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Joel Stanley, Krzysztof Kozlowski, Conor Dooley, Andrew Jeffery,
devicetree, linux-arm-kernel, linux-aspeed, linux-kernel
On Sun, Jun 23, 2024 at 10:47 PM Krzysztof Kozlowski <krzk@kernel.org> wrote:
>
> On 24/06/2024 03:55, Joel Stanley wrote:
> > On Sat, 1 Jun 2024 at 05:01, Rob Herring (Arm) <robh@kernel.org> wrote:
> >>
> >> The standard node name for I2C buses is 'i2c'.
> >
> > Unfortunately this can't be merged, as it will break userspace. There
> > is a lot of code out there that looks up devices based on the device
> > tree node path:
> >
> > https://github.com/openbmc/phosphor-state-manager/blob/3c1351cc2b63178876ef68f4107c9804d2e17dcc/meson.options#L140
>
> Eh, thanks for sharing.
>
> That's totally stupid user-space. The sysfs path to /sys/devices, or
> some grep by compatible, would be fine, but iterating over firmware/DT
> is just wrong.
Agreed, but Greg (and maybe it is actually documented somewhere) will
tell you that /sys/devices or /sys/bus/ paths are not ABI. /sys/class
is the ABI path.
Rob
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-06-24 16:49 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-31 19:31 [PATCH] arm: dts: aspeed: Use standard 'i2c' bus node name Rob Herring (Arm)
2024-06-04 1:53 ` Andrew Jeffery
2024-06-07 9:44 ` kernel test robot
2024-06-23 12:21 ` Krzysztof Kozlowski
2024-06-24 1:55 ` Joel Stanley
2024-06-24 4:46 ` Krzysztof Kozlowski
2024-06-24 16:49 ` Rob Herring
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).