jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-02 15:37:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

RPi: Revert "ARM: dts: bcm283x: Fix console path on RPi3"

Browse Source
This commit is contained in:
MilhouseVH 2017-12-01 20:16:55 +00:00
parent 20ea8d9216
commit 8a984193b3
1 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
packages/linux/patches/default/linux-999-revert_ARM_dts_bcm283x_Fix_console_path_on_RPi3.patch Normal file
View File

@ -0,0 +1,70 @@
From f30eeb3a0eee3f2527e09488b41ca305c8c1ac8c Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Fri, 1 Dec 2017 20:13:51 +0000
Subject: [PATCH] Revert "ARM: dts: bcm283x: Fix console path on RPi3"
This reverts commit f08f58a2bf68900a84e782b8c7ad701c0654173c.
---
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 9 ++++++---
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 5 -----
arch/arm/boot/dts/bcm283x.dtsi | 7 +------
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
index b8565fc..82651c3 100644
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -18,9 +18,12 @@
compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
model = "Raspberry Pi Zero W";
- chosen {
- /* 8250 auxiliary UART instead of pl011 */
- stdout-path = "serial1:115200n8";
+ /* Needed by firmware to properly init UARTs */
+ aliases {
+ uart0 = "/soc/serial@7e201000";
+ uart1 = "/soc/serial@7e215040";
+ serial0 = "/soc/serial@7e201000";
+ serial1 = "/soc/serial@7e215040";
};
leds {
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
index eb1a28d..b375f40 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -9,11 +9,6 @@
compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
model = "Raspberry Pi 3 Model B";
- chosen {
- /* 8250 auxiliary UART instead of pl011 */
- stdout-path = "serial1:115200n8";
- };
-
memory {
reg = <0 0x40000000>;
};
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index 013431e..431dcfc 100644
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -20,13 +20,8 @@
#address-cells = <1>;
#size-cells = <1>;
- aliases {
- serial0 = &uart0;
- serial1 = &uart1;
- };
-
chosen {
- stdout-path = "serial0:115200n8";
+ bootargs = "earlyprintk console=ttyAMA0";
};
thermal-zones {
--
2.14.1