diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2017-10-23 10:09:16 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2017-10-23 10:09:16 -0500 |
commit | 679cf2a896924e43247bdef6a9a57b757d010121 (patch) | |
tree | 62bafa7635029952b9fc3d3ba98d2e6bb3ecaa15 /bcm2837-bluetooth-support.patch | |
parent | 98fdf67b1551c7d417d51e5b8c98dca9ad0d226c (diff) | |
download | kernel-679cf2a896924e43247bdef6a9a57b757d010121.tar.gz kernel-679cf2a896924e43247bdef6a9a57b757d010121.tar.xz kernel-679cf2a896924e43247bdef6a9a57b757d010121.zip |
Linux v4.14-rc6
Diffstat (limited to 'bcm2837-bluetooth-support.patch')
-rw-r--r-- | bcm2837-bluetooth-support.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/bcm2837-bluetooth-support.patch b/bcm2837-bluetooth-support.patch index 3f57583db..c272c1efe 100644 --- a/bcm2837-bluetooth-support.patch +++ b/bcm2837-bluetooth-support.patch @@ -1,41 +1,3 @@ -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 @@ -57,18 +19,6 @@ diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-r 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>; |