This is a note to let you know that I've just added the patch titled
arm64: dts: renesas: falcon: Move console config to CPU board DTS
to the 5.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm64-dts-renesas-falcon-move-console-config-to-cpu-board-dts.patch
and it can be found in the queue-5.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From e86ff34cc44a49aeae2af74444560b17a0a96c78 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Date: Tue, 16 Mar 2021 16:47:03 +0100
Subject: arm64: dts: renesas: falcon: Move console config to CPU board DTS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
commit e86ff34cc44a49aeae2af74444560b17a0a96c78 upstream.
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@xxxxxxxxx>
Reviewed-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
Tested-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20210316154705.2433528-2-geert+renesas@xxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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(-)
--- 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. */
--- a/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts
+++ b/arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts
@@ -14,11 +14,6 @@
aliases {
ethernet0 = &avb0;
- serial0 = &scif0;
- };
-
- chosen {
- stdout-path = "serial0:115200n8";
};
};
Patches currently in stable-queue which might be from geert+renesas@xxxxxxxxx are
queue-5.12/dt-bindings-pci-rcar-pci-host-document-missing-r-car-h1-support.patch
queue-5.12/dt-bindings-media-renesas-vin-make-resets-optional-on-r-car-gen1.patch
queue-5.12/arm64-dts-renesas-falcon-move-console-config-to-cpu-board-dts.patch
queue-5.12/dt-bindings-thermal-rcar-gen3-thermal-support-five-tsc-nodes-on-r8a779a0.patch
