summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2021-03-16 16:47:03 +0100
committerGeert Uytterhoeven <geert+renesas@glider.be>2021-03-22 09:25:48 +0100
commite86ff34cc44a49aeae2af74444560b17a0a96c78 (patch)
treea64d6b3ed5d46bcc1935ba05d740759d190ff88b
parentarm64: dts: renesas: r8a77980: Fix vin4-7 endpoint binding (diff)
downloadlinux-e86ff34cc44a49aeae2af74444560b17a0a96c78.tar.xz
linux-e86ff34cc44a49aeae2af74444560b17a0a96c78.zip
arm64: dts: renesas: falcon: Move console config to CPU board DTS
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> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> Link: https://lore.kernel.org/r/20210316154705.2433528-2-geert+renesas@glider.be
-rw-r--r--arch/arm64/boot/dts/renesas/r8a779a0-falcon-cpu.dtsi8
-rw-r--r--arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts5
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 286a5d5b9b08..44dbd34eecb4 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 7bc964c36f33..d6a9eddb14d9 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";
};
};