From 989ba681d2eb2dd37ec89dd973d14e30716ea5f93d1c6723dc41bdcbe6af0c01 Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gardet@opensuse.org>
Date: Thu, 12 Mar 2020 11:46:39 +0000
Subject: [PATCH] Accepting request 784240 from
 home:nsaenzjulienne:branches:hardware:boot

- Add uboot-bcm2835-pl011-overlay.dts which fixes booting in RPi, RPi2, RPi0 (bsc#1166414)

OBS-URL: https://build.opensuse.org/request/show/784240
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/raspberrypi-firmware-dt?expand=0&rev=46
---
 raspberrypi-firmware-dt.changes |  5 +++++
 raspberrypi-firmware-dt.spec    |  3 ++-
 uboot-bcm2835-pl011-overlay.dts | 20 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 uboot-bcm2835-pl011-overlay.dts

diff --git a/raspberrypi-firmware-dt.changes b/raspberrypi-firmware-dt.changes
index 9631470..f62ffb0 100644
--- a/raspberrypi-firmware-dt.changes
+++ b/raspberrypi-firmware-dt.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 11 17:17:54 UTC 2020 - Nicolas Patricio Saenz Julienne <nsaenzjulienne@suse.com>
+
+- Add uboot-bcm2835-pl011-overlay.dts which fixes booting in RPi, RPi2, RPi0 (bsc#1166414)
+
 -------------------------------------------------------------------
 Wed Mar  4 18:13:12 UTC 2020 - Nicolas Patricio Saenz Julienne <nsaenzjulienne@suse.com>
 
diff --git a/raspberrypi-firmware-dt.spec b/raspberrypi-firmware-dt.spec
index 0a6f05d..6bcdd02 100644
--- a/raspberrypi-firmware-dt.spec
+++ b/raspberrypi-firmware-dt.spec
@@ -28,6 +28,7 @@ Source1:        disable-vc4-overlay.dts
 Source2:        rpi4-cma-overlay.dts
 Source3:        rpi4-thermal.dts
 Source4:        rpi4-gpio-names-overlay.dts
+Source5:        uboot-bcm2835-pl011-overlay.dts
 Source100:      get-from-git.sh
 Patch0:         remove-vmmc-emmc2.patch
 Patch1:         pcie-dma-ranges.patch
@@ -61,7 +62,7 @@ for dts in arch/arm/boot/dts/bcm27*dts arch/arm64/boot/dts/broadcom/bcm27*dts; d
 done
 
 export DTC_FLAGS="-R 0 -p 0 -@ -H epapr"
-for dts in arch/arm/boot/dts/overlays/*dts %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4}; do
+for dts in arch/arm/boot/dts/overlays/*dts %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}; do
     target=$(basename ${dts%*.dts})
     target=${target%*-overlay}
     mkdir -p $PPDIR/overlays
diff --git a/uboot-bcm2835-pl011-overlay.dts b/uboot-bcm2835-pl011-overlay.dts
new file mode 100644
index 0000000..1f06f0a
--- /dev/null
+++ b/uboot-bcm2835-pl011-overlay.dts
@@ -0,0 +1,20 @@
+/*
+ * As opposed to the upstream/downstream kernel, u-boot needs a special
+ * compatible string to access RPi, RPi2 and RPi0's serial consoles. This was
+ * removed from both upstream and downstream Linux's device-trees as there is
+ * no existing binding or use for it. While we fix this in upstream u-boot,
+ * this overlay fixes booting on those platforms.
+ */
+/dts-v1/;
+/plugin/;
+
+/{
+	compatible = "brcm,bcm2835";
+
+	fragment@0 {
+		target = <&uart0>;
+		__overlay__ {
+			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
+		};
+	};
+};