* [PATCH v2 0/6] arm64: dts: renesas: move I2C aliases to board files
@ 2022-08-25 7:10 Wolfram Sang
2022-08-25 7:10 ` [PATCH v2 1/6] arm64: dts: renesas: r8a779{51|60|65}: put " Wolfram Sang
` (6 more replies)
0 siblings, 7 replies; 9+ messages in thread
From: Wolfram Sang @ 2022-08-25 7:10 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: devicetree, Wolfram Sang
Change since v1:
* converted r8a774a1 boards, too (Thanks, Geert!)
Old coverletter follows:
For R-Car Gen3 and Gen4, we had I2C aliases in per-SoC DTS include
files. That doesn't really fit as bus naming is a board property. This
series moves the aliases to the board files. The following procedure has
been applied to avoid regressions:
1) move the aliases from SoC files to board files. Keep the empty
alias-nodes in the SoC file and add the new aliases before existing
ones. This ensured that identical binaries[1] were created.
2) Once all aliases were moved and all binaries[1] stayed identical,
then the empty alias nodes from the SoC files were removed.
The result is this series based on the renesas-drivers tag
'renesas-drivers-2022-08-16-v6.0-rc1'.
It could be discussed if the aliases should be sorted alphabetically,
but I'd think this is a seperate series then.
I also leave it to Geert, if the commits should be squashed. At least
for reviewing, I think this separation makes sense, though.
Looking forward to comments,
Wolfram
[1] For desired binaries, of course. For r8a77961 boards, the binaries
did change. This was intended, though, because I wanted to add I2C
aliases there which were not present before. Also, the r8a779m* boards
now have I2C aliases, too.
Wolfram Sang (6):
arm64: dts: renesas: r8a779{51|60|65}: put I2C aliases to board files
arm64: dts: renesas: r8a77970: put I2C aliases to board files
arm64: dts: renesas: r8a77980: put I2C aliases to board files
arm64: dts: renesas: r8a77990: put I2C aliases to board files
arm64: dts: renesas: r8a779a0: put I2C aliases to board files
arm64: dts: renesas: r8a774a1: put I2C aliases to board files
arch/arm64/boot/dts/renesas/ebisu.dtsi | 8 ++++++++
arch/arm64/boot/dts/renesas/hihope-common.dtsi | 8 ++++++++
.../boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts | 8 ++++++++
arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 11 -----------
arch/arm64/boot/dts/renesas/r8a77951.dtsi | 11 -----------
arch/arm64/boot/dts/renesas/r8a77960.dtsi | 11 -----------
arch/arm64/boot/dts/renesas/r8a77965.dtsi | 11 -----------
arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 5 +++++
arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 5 +++++
arch/arm64/boot/dts/renesas/r8a77970.dtsi | 8 --------
arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 6 ++++++
arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 6 ++++++
arch/arm64/boot/dts/renesas/r8a77980.dtsi | 9 ---------
arch/arm64/boot/dts/renesas/r8a77990.dtsi | 11 -----------
arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 7 +++++++
arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 10 ----------
arch/arm64/boot/dts/renesas/salvator-common.dtsi | 8 ++++++++
arch/arm64/boot/dts/renesas/ulcb.dtsi | 8 ++++++++
18 files changed, 69 insertions(+), 82 deletions(-)
--
2.35.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 1/6] arm64: dts: renesas: r8a779{51|60|65}: put I2C aliases to board files
2022-08-25 7:10 [PATCH v2 0/6] arm64: dts: renesas: move I2C aliases to board files Wolfram Sang
@ 2022-08-25 7:10 ` Wolfram Sang
2022-08-25 7:10 ` [PATCH v2 2/6] arm64: dts: renesas: r8a77970: " Wolfram Sang
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Wolfram Sang @ 2022-08-25 7:10 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: devicetree, Wolfram Sang
I2C aliases are not a property of a SoC. They belong to board files
where they are named accordingly in the schematics.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
arch/arm64/boot/dts/renesas/r8a77951.dtsi | 11 -----------
arch/arm64/boot/dts/renesas/r8a77960.dtsi | 11 -----------
arch/arm64/boot/dts/renesas/r8a77965.dtsi | 11 -----------
arch/arm64/boot/dts/renesas/salvator-common.dtsi | 8 ++++++++
arch/arm64/boot/dts/renesas/ulcb.dtsi | 8 ++++++++
5 files changed, 16 insertions(+), 33 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a77951.dtsi b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
index a297af22a195..07c8763c1e77 100644
--- a/arch/arm64/boot/dts/renesas/r8a77951.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
@@ -21,17 +21,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- i2c0 = &i2c0;
- i2c1 = &i2c1;
- i2c2 = &i2c2;
- i2c3 = &i2c3;
- i2c4 = &i2c4;
- i2c5 = &i2c5;
- i2c6 = &i2c6;
- i2c7 = &i2c_dvfs;
- };
-
/*
* The external audio clocks are configured as 0 Hz fixed frequency
* clocks by default.
diff --git a/arch/arm64/boot/dts/renesas/r8a77960.dtsi b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
index 4159c23d3874..1424d4ad941f 100644
--- a/arch/arm64/boot/dts/renesas/r8a77960.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
@@ -16,17 +16,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- i2c0 = &i2c0;
- i2c1 = &i2c1;
- i2c2 = &i2c2;
- i2c3 = &i2c3;
- i2c4 = &i2c4;
- i2c5 = &i2c5;
- i2c6 = &i2c6;
- i2c7 = &i2c_dvfs;
- };
-
/*
* The external audio clocks are configured as 0 Hz fixed frequency
* clocks by default.
diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
index 21a5e1cdd9f1..997f29521f66 100644
--- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
@@ -21,17 +21,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- i2c0 = &i2c0;
- i2c1 = &i2c1;
- i2c2 = &i2c2;
- i2c3 = &i2c3;
- i2c4 = &i2c4;
- i2c5 = &i2c5;
- i2c6 = &i2c6;
- i2c7 = &i2c_dvfs;
- };
-
/*
* The external audio clocks are configured as 0 Hz fixed frequency
* clocks by default.
diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
index b7c7911858b2..d97473401819 100644
--- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
@@ -33,6 +33,14 @@
/ {
aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ i2c4 = &i2c4;
+ i2c5 = &i2c5;
+ i2c6 = &i2c6;
+ i2c7 = &i2c_dvfs;
serial0 = &scif2;
serial1 = &hscif1;
ethernet0 = &avb;
diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi
index 0772dfe4adff..29cedf4dc1a9 100644
--- a/arch/arm64/boot/dts/renesas/ulcb.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi
@@ -21,6 +21,14 @@ / {
model = "Renesas R-Car Gen3 ULCB board";
aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ i2c4 = &i2c4;
+ i2c5 = &i2c5;
+ i2c6 = &i2c6;
+ i2c7 = &i2c_dvfs;
serial0 = &scif2;
ethernet0 = &avb;
mmc0 = &sdhi2;
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 2/6] arm64: dts: renesas: r8a77970: put I2C aliases to board files
2022-08-25 7:10 [PATCH v2 0/6] arm64: dts: renesas: move I2C aliases to board files Wolfram Sang
2022-08-25 7:10 ` [PATCH v2 1/6] arm64: dts: renesas: r8a779{51|60|65}: put " Wolfram Sang
@ 2022-08-25 7:10 ` Wolfram Sang
2022-08-25 7:10 ` [PATCH v2 3/6] arm64: dts: renesas: r8a77980: " Wolfram Sang
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Wolfram Sang @ 2022-08-25 7:10 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: devicetree, Wolfram Sang
I2C aliases are not a property of a SoC. They belong to board files
where they are named accordingly in the schematics.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 5 +++++
arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 5 +++++
arch/arm64/boot/dts/renesas/r8a77970.dtsi | 8 --------
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a77970-eagle.dts b/arch/arm64/boot/dts/renesas/r8a77970-eagle.dts
index 49d1a929aef7..004a5eacd460 100644
--- a/arch/arm64/boot/dts/renesas/r8a77970-eagle.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77970-eagle.dts
@@ -15,6 +15,11 @@ / {
compatible = "renesas,eagle", "renesas,r8a77970";
aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ i2c4 = &i2c4;
serial0 = &scif0;
ethernet0 = &avb;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts b/arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts
index 39f3e6cbba3d..c2b65f8de547 100644
--- a/arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts
@@ -15,6 +15,11 @@ / {
compatible = "renesas,v3msk", "renesas,r8a77970";
aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ i2c4 = &i2c4;
serial0 = &scif0;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a77970.dtsi b/arch/arm64/boot/dts/renesas/r8a77970.dtsi
index 2703ef3a38c2..1df02facb796 100644
--- a/arch/arm64/boot/dts/renesas/r8a77970.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77970.dtsi
@@ -16,14 +16,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- i2c0 = &i2c0;
- i2c1 = &i2c1;
- i2c2 = &i2c2;
- i2c3 = &i2c3;
- i2c4 = &i2c4;
- };
-
/* External CAN clock - to be overridden by boards that provide it */
can_clk: can {
compatible = "fixed-clock";
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 3/6] arm64: dts: renesas: r8a77980: put I2C aliases to board files
2022-08-25 7:10 [PATCH v2 0/6] arm64: dts: renesas: move I2C aliases to board files Wolfram Sang
2022-08-25 7:10 ` [PATCH v2 1/6] arm64: dts: renesas: r8a779{51|60|65}: put " Wolfram Sang
2022-08-25 7:10 ` [PATCH v2 2/6] arm64: dts: renesas: r8a77970: " Wolfram Sang
@ 2022-08-25 7:10 ` Wolfram Sang
2022-08-25 7:10 ` [PATCH v2 4/6] arm64: dts: renesas: r8a77990: " Wolfram Sang
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Wolfram Sang @ 2022-08-25 7:10 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: devicetree, Wolfram Sang
I2C aliases are not a property of a SoC. They belong to board files
where they are named accordingly in the schematics.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 6 ++++++
arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 6 ++++++
arch/arm64/boot/dts/renesas/r8a77980.dtsi | 9 ---------
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a77980-condor.dts b/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
index 43ed033eb512..981cf4db0e54 100644
--- a/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
@@ -15,6 +15,12 @@ / {
compatible = "renesas,condor", "renesas,r8a77980";
aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ i2c4 = &i2c4;
+ i2c5 = &i2c5;
serial0 = &scif0;
ethernet0 = &gether;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts b/arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts
index 1d09d8867651..d168b0e7747d 100644
--- a/arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts
@@ -15,6 +15,12 @@ / {
compatible = "renesas,v3hsk", "renesas,r8a77980";
aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ i2c4 = &i2c4;
+ i2c5 = &i2c5;
serial0 = &scif0;
ethernet0 = &gether;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a77980.dtsi b/arch/arm64/boot/dts/renesas/r8a77980.dtsi
index 8594be72f221..a3af34191ca2 100644
--- a/arch/arm64/boot/dts/renesas/r8a77980.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77980.dtsi
@@ -16,15 +16,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- i2c0 = &i2c0;
- i2c1 = &i2c1;
- i2c2 = &i2c2;
- i2c3 = &i2c3;
- i2c4 = &i2c4;
- i2c5 = &i2c5;
- };
-
/* External CAN clock - to be overridden by boards that provide it */
can_clk: can {
compatible = "fixed-clock";
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 4/6] arm64: dts: renesas: r8a77990: put I2C aliases to board files
2022-08-25 7:10 [PATCH v2 0/6] arm64: dts: renesas: move I2C aliases to board files Wolfram Sang
` (2 preceding siblings ...)
2022-08-25 7:10 ` [PATCH v2 3/6] arm64: dts: renesas: r8a77980: " Wolfram Sang
@ 2022-08-25 7:10 ` Wolfram Sang
2022-08-25 7:10 ` [PATCH v2 5/6] arm64: dts: renesas: r8a779a0: " Wolfram Sang
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Wolfram Sang @ 2022-08-25 7:10 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: devicetree, Wolfram Sang
I2C aliases are not a property of a SoC. They belong to board files
where they are named accordingly in the schematics.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
arch/arm64/boot/dts/renesas/ebisu.dtsi | 8 ++++++++
arch/arm64/boot/dts/renesas/r8a77990.dtsi | 11 -----------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/ebisu.dtsi b/arch/arm64/boot/dts/renesas/ebisu.dtsi
index 8fc03491a11c..bbc29452d1be 100644
--- a/arch/arm64/boot/dts/renesas/ebisu.dtsi
+++ b/arch/arm64/boot/dts/renesas/ebisu.dtsi
@@ -13,6 +13,14 @@ / {
compatible = "renesas,ebisu";
aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ i2c4 = &i2c4;
+ i2c5 = &i2c5;
+ i2c6 = &i2c6;
+ i2c7 = &i2c7;
serial0 = &scif2;
ethernet0 = &avb;
mmc0 = &sdhi3;
diff --git a/arch/arm64/boot/dts/renesas/r8a77990.dtsi b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
index 565e9d85946e..3053b4b21497 100644
--- a/arch/arm64/boot/dts/renesas/r8a77990.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
@@ -14,17 +14,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- i2c0 = &i2c0;
- i2c1 = &i2c1;
- i2c2 = &i2c2;
- i2c3 = &i2c3;
- i2c4 = &i2c4;
- i2c5 = &i2c5;
- i2c6 = &i2c6;
- i2c7 = &i2c7;
- };
-
/*
* The external audio clocks are configured as 0 Hz fixed frequency
* clocks by default.
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 5/6] arm64: dts: renesas: r8a779a0: put I2C aliases to board files
2022-08-25 7:10 [PATCH v2 0/6] arm64: dts: renesas: move I2C aliases to board files Wolfram Sang
` (3 preceding siblings ...)
2022-08-25 7:10 ` [PATCH v2 4/6] arm64: dts: renesas: r8a77990: " Wolfram Sang
@ 2022-08-25 7:10 ` Wolfram Sang
2022-08-25 7:10 ` [PATCH v2 6/6] arm64: dts: renesas: r8a774a1: " Wolfram Sang
2022-08-26 14:54 ` [PATCH v2 0/6] arm64: dts: renesas: move " Geert Uytterhoeven
6 siblings, 0 replies; 9+ messages in thread
From: Wolfram Sang @ 2022-08-25 7:10 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: devicetree, Wolfram Sang
I2C aliases are not a property of a SoC. They belong to board files
where they are named accordingly in the schematics.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 7 +++++++
arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 10 ----------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi b/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi
index 53c4a26198e3..99b73e21c82c 100644
--- a/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi
@@ -16,6 +16,13 @@ / {
compatible = "renesas,falcon-cpu", "renesas,r8a779a0";
aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ i2c4 = &i2c4;
+ i2c5 = &i2c5;
+ i2c6 = &i2c6;
serial0 = &scif0;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
index 3d668709d8a8..3e1557a5b5e1 100644
--- a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
@@ -14,16 +14,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- i2c0 = &i2c0;
- i2c1 = &i2c1;
- i2c2 = &i2c2;
- i2c3 = &i2c3;
- i2c4 = &i2c4;
- i2c5 = &i2c5;
- i2c6 = &i2c6;
- };
-
/* External CAN clock - to be overridden by boards that provide it */
can_clk: can {
compatible = "fixed-clock";
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 6/6] arm64: dts: renesas: r8a774a1: put I2C aliases to board files
2022-08-25 7:10 [PATCH v2 0/6] arm64: dts: renesas: move I2C aliases to board files Wolfram Sang
` (4 preceding siblings ...)
2022-08-25 7:10 ` [PATCH v2 5/6] arm64: dts: renesas: r8a779a0: " Wolfram Sang
@ 2022-08-25 7:10 ` Wolfram Sang
2022-08-26 14:51 ` Geert Uytterhoeven
2022-08-26 14:54 ` [PATCH v2 0/6] arm64: dts: renesas: move " Geert Uytterhoeven
6 siblings, 1 reply; 9+ messages in thread
From: Wolfram Sang @ 2022-08-25 7:10 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: devicetree, Wolfram Sang
I2C aliases are not a property of a SoC. They belong to board files
where they are named accordingly in the schematics.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
arch/arm64/boot/dts/renesas/hihope-common.dtsi | 8 ++++++++
.../boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts | 8 ++++++++
arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 11 -----------
3 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/hihope-common.dtsi b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
index b062f41ee270..83104af2813e 100644
--- a/arch/arm64/boot/dts/renesas/hihope-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
@@ -10,6 +10,14 @@
/ {
aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ i2c4 = &i2c4;
+ i2c5 = &i2c5;
+ i2c6 = &i2c6;
+ i2c7 = &iic_pmic;
serial0 = &scif2;
serial1 = &hscif0;
mmc0 = &sdhi3;
diff --git a/arch/arm64/boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts b/arch/arm64/boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts
index 3cf2e076940f..9ae67263c0df 100644
--- a/arch/arm64/boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts
+++ b/arch/arm64/boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts
@@ -14,6 +14,14 @@ / {
compatible = "beacon,beacon-rzg2m", "renesas,r8a774a1";
aliases {
+ i2c0 = &i2c0;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ i2c4 = &i2c4;
+ i2c5 = &i2c5;
+ i2c6 = &i2c6;
+ i2c7 = &iic_pmic;
serial0 = &scif2;
serial1 = &hscif0;
serial2 = &hscif1;
diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
index e7d17776624d..aec62c93f9a3 100644
--- a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
@@ -17,17 +17,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- i2c0 = &i2c0;
- i2c1 = &i2c1;
- i2c2 = &i2c2;
- i2c3 = &i2c3;
- i2c4 = &i2c4;
- i2c5 = &i2c5;
- i2c6 = &i2c6;
- i2c7 = &iic_pmic;
- };
-
/*
* The external audio clocks are configured as 0 Hz fixed frequency
* clocks by default.
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2 6/6] arm64: dts: renesas: r8a774a1: put I2C aliases to board files
2022-08-25 7:10 ` [PATCH v2 6/6] arm64: dts: renesas: r8a774a1: " Wolfram Sang
@ 2022-08-26 14:51 ` Geert Uytterhoeven
0 siblings, 0 replies; 9+ messages in thread
From: Geert Uytterhoeven @ 2022-08-26 14:51 UTC (permalink / raw)
To: Wolfram Sang
Cc: Linux-Renesas,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
Hi Wolfram,
On Thu, Aug 25, 2022 at 9:11 AM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> I2C aliases are not a property of a SoC. They belong to board files
> where they are named accordingly in the schematics.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Thanks for your patch!
> --- a/arch/arm64/boot/dts/renesas/hihope-common.dtsi
> +++ b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
> @@ -10,6 +10,14 @@
>
> / {
> aliases {
> + i2c0 = &i2c0;
> + i2c1 = &i2c1;
> + i2c2 = &i2c2;
> + i2c3 = &i2c3;
> + i2c4 = &i2c4;
> + i2c5 = &i2c5;
> + i2c6 = &i2c6;
> + i2c7 = &iic_pmic;
> serial0 = &scif2;
> serial1 = &hscif0;
> mmc0 = &sdhi3;
Oops:
arch/arm64/boot/dts/renesas/hihope-common.dtsi:12.10-26.4: ERROR
(path_references): /aliases: Reference to non-existent node or label
"iic_pmic"
I've sent a fix: "[PATCH] arm64: dts: renesas: r8a774e1: Rename i2c_dvfs
to iic_pmic"
https://lore.kernel.org/r/7d60653d4d63904dc025a133297a53eb885fa064.1661525361.git.geert+renesas@glider.be
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 0/6] arm64: dts: renesas: move I2C aliases to board files
2022-08-25 7:10 [PATCH v2 0/6] arm64: dts: renesas: move I2C aliases to board files Wolfram Sang
` (5 preceding siblings ...)
2022-08-25 7:10 ` [PATCH v2 6/6] arm64: dts: renesas: r8a774a1: " Wolfram Sang
@ 2022-08-26 14:54 ` Geert Uytterhoeven
6 siblings, 0 replies; 9+ messages in thread
From: Geert Uytterhoeven @ 2022-08-26 14:54 UTC (permalink / raw)
To: Wolfram Sang
Cc: Linux-Renesas,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
Hi Wolfram.
On Thu, Aug 25, 2022 at 9:11 AM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> Change since v1:
> * converted r8a774a1 boards, too (Thanks, Geert!)
>
> Old coverletter follows:
>
> For R-Car Gen3 and Gen4, we had I2C aliases in per-SoC DTS include
> files. That doesn't really fit as bus naming is a board property. This
> series moves the aliases to the board files. The following procedure has
> been applied to avoid regressions:
>
> 1) move the aliases from SoC files to board files. Keep the empty
> alias-nodes in the SoC file and add the new aliases before existing
> ones. This ensured that identical binaries[1] were created.
>
> 2) Once all aliases were moved and all binaries[1] stayed identical,
> then the empty alias nodes from the SoC files were removed.
>
> The result is this series based on the renesas-drivers tag
> 'renesas-drivers-2022-08-16-v6.0-rc1'.
>
> It could be discussed if the aliases should be sorted alphabetically,
> but I'd think this is a seperate series then.
>
> I also leave it to Geert, if the commits should be squashed. At least
> for reviewing, I think this separation makes sense, though.
Thanks for the update!
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
i.e. will queue in renesas-devel for v6.1.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-08-26 14:55 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-25 7:10 [PATCH v2 0/6] arm64: dts: renesas: move I2C aliases to board files Wolfram Sang
2022-08-25 7:10 ` [PATCH v2 1/6] arm64: dts: renesas: r8a779{51|60|65}: put " Wolfram Sang
2022-08-25 7:10 ` [PATCH v2 2/6] arm64: dts: renesas: r8a77970: " Wolfram Sang
2022-08-25 7:10 ` [PATCH v2 3/6] arm64: dts: renesas: r8a77980: " Wolfram Sang
2022-08-25 7:10 ` [PATCH v2 4/6] arm64: dts: renesas: r8a77990: " Wolfram Sang
2022-08-25 7:10 ` [PATCH v2 5/6] arm64: dts: renesas: r8a779a0: " Wolfram Sang
2022-08-25 7:10 ` [PATCH v2 6/6] arm64: dts: renesas: r8a774a1: " Wolfram Sang
2022-08-26 14:51 ` Geert Uytterhoeven
2022-08-26 14:54 ` [PATCH v2 0/6] arm64: dts: renesas: move " Geert Uytterhoeven
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.