5291fbf999
To make HDMI CEC work, we have to compile MESON_DRM as a module (see #1717). However, this essentially reverts #1347, which fixed the reboot problem by compiling the driver into the kernel. Hence we need to reintroduce the earlier fix from #1345, which reverts the offending commit causing the reboot problem.
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From dcaf2dc71dd62487eb37561682934414a5795e0e Mon Sep 17 00:00:00 2001
|
|
Message-Id: <dcaf2dc71dd62487eb37561682934414a5795e0e.1642331593.git.stefan@agner.ch>
|
|
In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
|
|
References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1642331593.git.stefan@agner.ch>
|
|
From: Hyeonki Hong <hhk7734@gmail.com>
|
|
Date: Fri, 27 Mar 2020 17:05:22 +0900
|
|
Subject: [PATCH 07/10] arm64: dts: meson: add uart_A node
|
|
|
|
The UART_A is available through J3 pin 8/10 and documented to be
|
|
available as UART by default.
|
|
|
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|
---
|
|
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
|
index dd345c6aa4b5..cec346178e3d 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
|
@@ -12,6 +12,7 @@
|
|
/ {
|
|
aliases {
|
|
serial0 = &uart_AO;
|
|
+ serial1 = &uart_A;
|
|
ethernet0 = ðmac;
|
|
rtc0 = &rtc;
|
|
rtc1 = &vrtc;
|
|
@@ -728,6 +729,12 @@ &toddr_c {
|
|
status = "okay";
|
|
};
|
|
|
|
+&uart_A {
|
|
+ status = "okay";
|
|
+ pinctrl-0 = <&uart_a_pins>;
|
|
+ pinctrl-names = "default";
|
|
+};
|
|
+
|
|
&uart_AO {
|
|
status = "okay";
|
|
pinctrl-0 = <&uart_ao_a_pins>;
|
|
--
|
|
2.34.1
|
|
|