87 lines
2.4 KiB
Diff
87 lines
2.4 KiB
Diff
|
From a92507095467d77f4fd05f54ae8d299459c2c3a3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||
|
|
Date: Sun, 10 Sep 2017 19:29:23 +0100
|
||
|
|
Subject: [PATCH 1/2] ARM: dts: bcm283x: Use stdout-path instead of console
|
||
|
|
bootarg
|
||
|
|
|
||
|
|
Add the serial port config to "chosen/stdout-path".
|
||
|
|
Create serial0/1 aliases referring to uart0 ant uart1 paths.
|
||
|
|
Remove unneeded earlyprintk.
|
||
|
|
|
||
|
|
Signed-off-by: Loic Poulain <loic.poulain@xxxxxxxxx>
|
||
|
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||
|
|
---
|
||
|
|
arch/arm/boot/dts/bcm283x.dtsi | 7 ++++++-
|
||
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
|
||
|
|
index 431dcfc900c0..013431e3d7c3 100644
|
||
|
|
--- a/arch/arm/boot/dts/bcm283x.dtsi
|
||
|
|
+++ b/arch/arm/boot/dts/bcm283x.dtsi
|
||
|
|
@@ -20,8 +20,13 @@
|
||
|
|
#address-cells = <1>;
|
||
|
|
#size-cells = <1>;
|
||
|
|
|
||
|
|
+ aliases {
|
||
|
|
+ serial0 = &uart0;
|
||
|
|
+ serial1 = &uart1;
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
chosen {
|
||
|
|
- bootargs = "earlyprintk console=ttyAMA0";
|
||
|
|
+ stdout-path = "serial0:115200n8";
|
||
|
|
};
|
||
|
|
|
||
|
|
thermal-zones {
|
||
|
|
--
|
||
|
|
2.13.5
|
||
|
|
|
||
|
|
From 50252c318fe2fcfcbd0832fa835e7fd1fafd7d2d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||
|
|
Date: Sun, 10 Sep 2017 19:30:02 +0100
|
||
|
|
Subject: [PATCH 2/2] ARM: dts: bcm2837-rpi-3-b: Add bcm43438 serial slave
|
||
|
|
|
||
|
|
Add BCM43438 (bluetooth) as a slave device of uart0 (pl011/ttyAMA0).
|
||
|
|
This allows to automatically insert the bcm43438 to the bluetooth
|
||
|
|
subsystem instead of relying on userspace helpers (hciattach).
|
||
|
|
|
||
|
|
Overwrite chosen/stdout-path to use 8250 aux uart as console.
|
||
|
|
|
||
|
|
Signed-off-by: Loic Poulain <loic.poulain@xxxxxxxxx>
|
||
|
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||
|
|
---
|
||
|
|
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 10 ++++++++++
|
||
|
|
1 file changed, 10 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
||
|
|
index 20725ca487f3..e4488cb3067e 100644
|
||
|
|
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
||
|
|
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
|
||
|
|
@@ -8,6 +8,11 @@
|
||
|
|
compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
|
||
|
|
model = "Raspberry Pi 3 Model B";
|
||
|
|
|
||
|
|
+ chosen {
|
||
|
|
+ /* 8250 auxiliar UART instead of pl011 */
|
||
|
|
+ stdout-path = "serial1:115200n8";
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
memory {
|
||
|
|
reg = <0 0x40000000>;
|
||
|
|
};
|
||
|
|
@@ -24,6 +29,11 @@
|
||
|
|
pinctrl-names = "default";
|
||
|
|
pinctrl-0 = <&uart0_gpio32 &gpclk2_gpio43>;
|
||
|
|
status = "okay";
|
||
|
|
+
|
||
|
|
+ bluetooth {
|
||
|
|
+ compatible = "brcm,bcm43438-bt";
|
||
|
|
+ max-speed = <2000000>;
|
||
|
|
+ };
|
||
|
|
};
|
||
|
|
|
||
|
|
/* uart1 is mapped to the pin header */
|
||
|
|
--
|
||
|
|
2.13.5
|
||
|
|
|