* [PATCH 1/3] arm64: dts: renesas: falcon: Move console config to CPU board DTS
2021-03-16 15:47 [PATCH 0/3] arm64: dts: renesas: falcon: Restructuring Geert Uytterhoeven
@ 2021-03-16 15:47 ` Geert Uytterhoeven
2021-03-16 15:47 ` [PATCH 2/3] arm64: dts: renesas: falcon: Move watchdog " Geert Uytterhoeven
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2021-03-16 15:47 UTC (permalink / raw)
To: Magnus Damm, Yoshihiro Shimoda, Wolfram Sang, Hoang Vo
Cc: linux-renesas-soc, linux-arm-kernel, Geert Uytterhoeven
The serial console is located on the Falcon CPU board. Hence move
serial console configuration from the main Falcon DTS file to the DTS
file that describes the CPU board.
Fixes: 63070d7c2270e8de ("arm64: dts: renesas: Add Renesas Falcon boards support")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 8 ++++++++
arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 5 -----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi b/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi
index 286a5d5b9b08ff88..44dbd34eecb43fb4 100644
--- a/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi
@@ -12,6 +12,14 @@ / {
model = "Renesas Falcon CPU board";
compatible = "renesas,falcon-cpu", "renesas,r8a779a0";
+ aliases {
+ serial0 = &scif0;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
memory@48000000 {
device_type = "memory";
/* first 128MB is reserved for secure area. */
diff --git a/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts b/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts
index 7bc964c36f331270..d6a9eddb14d9e9cc 100644
--- a/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts
+++ b/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts
@@ -16,11 +16,6 @@ / {
aliases {
ethernet0 = &avb0;
- serial0 = &scif0;
- };
-
- chosen {
- stdout-path = "serial0:115200n8";
};
};
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] arm64: dts: renesas: falcon: Move watchdog config to CPU board DTS
2021-03-16 15:47 [PATCH 0/3] arm64: dts: renesas: falcon: Restructuring Geert Uytterhoeven
2021-03-16 15:47 ` [PATCH 1/3] arm64: dts: renesas: falcon: Move console config to CPU board DTS Geert Uytterhoeven
@ 2021-03-16 15:47 ` Geert Uytterhoeven
2021-03-16 15:47 ` [PATCH 3/3] arm64: dts: renesas: falcon: Move AVB0 to main DTS Geert Uytterhoeven
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2021-03-16 15:47 UTC (permalink / raw)
To: Magnus Damm, Yoshihiro Shimoda, Wolfram Sang, Hoang Vo
Cc: linux-renesas-soc, linux-arm-kernel, Geert Uytterhoeven
The 32 kHz oscillator driving the R-Car V3U watchdog is located on the
Falcon CPU board. Hence move the watchdog configuration from the main
Falcon DTS file to the DTS file that describes the CPU board.
Fixes: d207dc500bbcf8c6 ("arm64: dts: renesas: falcon: Enable watchdog timer")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 5 +++++
arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 5 -----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi b/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi
index 44dbd34eecb43fb4..97d40e3e05ff3b1b 100644
--- a/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi
@@ -186,6 +186,11 @@ scif_clk_pins: scif_clk {
};
};
+&rwdt {
+ timeout-sec = <60>;
+ status = "okay";
+};
+
&scif0 {
pinctrl-0 = <&scif0_pins>;
pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts b/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts
index d6a9eddb14d9e9cc..04cd2ae5b4f4892e 100644
--- a/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts
+++ b/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts
@@ -27,8 +27,3 @@ eeprom@51 {
pagesize = <8>;
};
};
-
-&rwdt {
- timeout-sec = <60>;
- status = "okay";
-};
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] arm64: dts: renesas: falcon: Move AVB0 to main DTS
2021-03-16 15:47 [PATCH 0/3] arm64: dts: renesas: falcon: Restructuring Geert Uytterhoeven
2021-03-16 15:47 ` [PATCH 1/3] arm64: dts: renesas: falcon: Move console config to CPU board DTS Geert Uytterhoeven
2021-03-16 15:47 ` [PATCH 2/3] arm64: dts: renesas: falcon: Move watchdog " Geert Uytterhoeven
@ 2021-03-16 15:47 ` Geert Uytterhoeven
2021-03-17 8:37 ` [PATCH 0/3] arm64: dts: renesas: falcon: Restructuring Wolfram Sang
2021-03-17 9:03 ` Niklas Söderlund
4 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2021-03-16 15:47 UTC (permalink / raw)
To: Magnus Damm, Yoshihiro Shimoda, Wolfram Sang, Hoang Vo
Cc: linux-renesas-soc, linux-arm-kernel, Geert Uytterhoeven
The Ethernet PHY for the first AVB instance is located on the Falcon
BreakOut board. Hence move its description from the DTS file that
describes the CPU board to the main Falcon DTS file.
Fixes: e8ac55a5e70a9522 ("arm64: dts: renesas: falcon: Add Ethernet-AVB0 support")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
.../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 34 -----------------
.../boot/dts/renesas/r8a779a0-falcon.dts | 37 +++++++++++++++++++
2 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi b/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi
index 97d40e3e05ff3b1b..e9133f9348df8969 100644
--- a/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi
@@ -60,22 +60,6 @@ reg_3p3v: regulator-3p3v {
};
};
-&avb0 {
- pinctrl-0 = <&avb0_pins>;
- pinctrl-names = "default";
- phy-handle = <&phy0>;
- tx-internal-delay-ps = <2000>;
- status = "okay";
-
- phy0: ethernet-phy@0 {
- rxc-skew-ps = <1500>;
- reg = <0>;
- interrupt-parent = <&gpio4>;
- interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
- reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;
- };
-};
-
&extal_clk {
clock-frequency = <16666666>;
};
@@ -136,24 +120,6 @@ &pfc {
pinctrl-0 = <&scif_clk_pins>;
pinctrl-names = "default";
- avb0_pins: avb0 {
- mux {
- groups = "avb0_link", "avb0_mdio", "avb0_rgmii", "avb0_txcrefclk";
- function = "avb0";
- };
-
- pins_mdio {
- groups = "avb0_mdio";
- drive-strength = <21>;
- };
-
- pins_mii {
- groups = "avb0_rgmii";
- drive-strength = <21>;
- };
-
- };
-
i2c0_pins: i2c0 {
groups = "i2c0";
function = "i2c0";
diff --git a/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts b/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts
index 04cd2ae5b4f4892e..687f019e79f059a1 100644
--- a/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts
+++ b/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts
@@ -19,6 +19,22 @@ aliases {
};
};
+&avb0 {
+ pinctrl-0 = <&avb0_pins>;
+ pinctrl-names = "default";
+ phy-handle = <&phy0>;
+ tx-internal-delay-ps = <2000>;
+ status = "okay";
+
+ phy0: ethernet-phy@0 {
+ rxc-skew-ps = <1500>;
+ reg = <0>;
+ interrupt-parent = <&gpio4>;
+ interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
+ reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;
+ };
+};
+
&i2c0 {
eeprom@51 {
compatible = "rohm,br24g01", "atmel,24c01";
@@ -27,3 +43,24 @@ eeprom@51 {
pagesize = <8>;
};
};
+
+&pfc {
+ avb0_pins: avb0 {
+ mux {
+ groups = "avb0_link", "avb0_mdio", "avb0_rgmii",
+ "avb0_txcrefclk";
+ function = "avb0";
+ };
+
+ pins_mdio {
+ groups = "avb0_mdio";
+ drive-strength = <21>;
+ };
+
+ pins_mii {
+ groups = "avb0_rgmii";
+ drive-strength = <21>;
+ };
+
+ };
+};
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/3] arm64: dts: renesas: falcon: Restructuring
2021-03-16 15:47 [PATCH 0/3] arm64: dts: renesas: falcon: Restructuring Geert Uytterhoeven
` (2 preceding siblings ...)
2021-03-16 15:47 ` [PATCH 3/3] arm64: dts: renesas: falcon: Move AVB0 to main DTS Geert Uytterhoeven
@ 2021-03-17 8:37 ` Wolfram Sang
2021-03-17 9:03 ` Niklas Söderlund
4 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2021-03-17 8:37 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Magnus Damm, Yoshihiro Shimoda, Hoang Vo, linux-renesas-soc,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 817 bytes --]
On Tue, Mar 16, 2021 at 04:47:02PM +0100, Geert Uytterhoeven wrote:
> Hi all,
>
> This patch series restructures the devices nodes in the Renesas Falcon
> DTS board stack to better match the actual board stack structure.
> The DTB generated after this series is the same as before, according to
> scripts/dtc/dtx_diff.
>
> I plan to queue this in renesas-devel for v5.13.
>
> Geert Uytterhoeven (3):
> arm64: dts: renesas: falcon: Move console config to CPU board DTS
> arm64: dts: renesas: falcon: Move watchdog config to CPU board DTS
> arm64: dts: renesas: falcon: Move AVB0 to main DTS
Yes, it is better this way:
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Console, watchdog and eth0 still work:
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 0/3] arm64: dts: renesas: falcon: Restructuring
2021-03-16 15:47 [PATCH 0/3] arm64: dts: renesas: falcon: Restructuring Geert Uytterhoeven
` (3 preceding siblings ...)
2021-03-17 8:37 ` [PATCH 0/3] arm64: dts: renesas: falcon: Restructuring Wolfram Sang
@ 2021-03-17 9:03 ` Niklas Söderlund
4 siblings, 0 replies; 6+ messages in thread
From: Niklas Söderlund @ 2021-03-17 9:03 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Magnus Damm, Yoshihiro Shimoda, Wolfram Sang, Hoang Vo,
linux-renesas-soc, linux-arm-kernel
Hi Geert,
Thanks for your work.
On 2021-03-16 16:47:02 +0100, Geert Uytterhoeven wrote:
> Hi all,
>
> This patch series restructures the devices nodes in the Renesas Falcon
> DTS board stack to better match the actual board stack structure.
> The DTB generated after this series is the same as before, according to
> scripts/dtc/dtx_diff.
>
> I plan to queue this in renesas-devel for v5.13.
>
> Geert Uytterhoeven (3):
> arm64: dts: renesas: falcon: Move console config to CPU board DTS
> arm64: dts: renesas: falcon: Move watchdog config to CPU board DTS
> arm64: dts: renesas: falcon: Move AVB0 to main DTS
These looks good to me,
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
>
> .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 47 +++++--------------
> .../boot/dts/renesas/r8a779a0-falcon.dts | 39 ++++++++++++---
> 2 files changed, 46 insertions(+), 40 deletions(-)
>
> --
> 2.25.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
--
Regards,
Niklas Söderlund
^ permalink raw reply [flat|nested] 6+ messages in thread