From f75ec82571cd2f7bbe3c88d99a6fd5b5d16b0b9e Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 3 Sep 2019 20:58:10 +0100
Subject: [PATCH] RPi btuart: Sync with upstream 0.1.11

---
 .../scripts/rpi-btuart                        | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart
index fb89ef84e6..b9c6cee09d 100755
--- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart
+++ b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart
@@ -1,14 +1,22 @@
 #!/bin/sh
 
 HCIATTACH=/usr/bin/hciattach
-SERIAL=$(awk '/^Serial/{ print $3 }' /proc/cpuinfo)
-B1=${SERIAL:10:2}
-B2=${SERIAL:12:2}
-B3=${SERIAL:14:2}
-BDADDR=$(printf b8:27:eb:%02x:%02x:%02x $((0x$B1 ^ 0xaa)) $((0x$B2 ^ 0xaa)) $((0x$B3 ^ 0xaa)))
+if grep -q "Pi 4" /proc/device-tree/model; then
+  BDADDR=
+else
+  SERIAL=$(cat /proc/device-tree/serial-number | cut -c9-)
+  B1=${SERIAL:2:2}
+  B2=${SERIAL:4:2}
+  B3=${SERIAL:6:2}
+  BDADDR=$(printf b8:27:eb:%02x:%02x:%02x $((0x$B1 ^ 0xaa)) $((0x$B2 ^ 0xaa)) $((0x$B3 ^ 0xaa)))
+fi
 
-if [ "$(cat /proc/device-tree/aliases/uart0)" = "$(cat /proc/device-tree/aliases/serial1)" ] ; then
-  if [ "$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')" = "16" ] ; then
+uart0="$(cat /proc/device-tree/aliases/uart0)"
+serial1="$(cat /proc/device-tree/aliases/serial1)"
+
+if [ "$uart0" = "$serial1" ] ; then
+  uart0_pins="$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')"
+  if [ "$uart0_pins" = "16" ] ; then
     $HCIATTACH /dev/serial1 bcm43xx 3000000 flow - $BDADDR
   else
     $HCIATTACH /dev/serial1 bcm43xx 921600 noflow - $BDADDR