Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cb4261d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-4.14/devicetree-fixes' of http://github.com/Broadcom/stblinux into fixes 

Pull "Broadcom devicetree fixes for 4.14" from Florian Fainelli:

This pull request contains Broadcom ARM-based SoC Device Tree fixes for 4.14,
please pull the following:

- Loic fixes the console path on the Raspberry Pi 3 which was not correctly set
  and would cause all sorts of confusion between the Bluetooth controller and the
  kernel console

* tag 'arm-soc/for-4.14/devicetree-fixes' of http://github.com/Broadcom/stblinux:
  ARM: dts: bcm283x: Fix console path on RPi3
parents 8a5776a5 80a86dbd

arch/arm/boot/dts/bcm2835-rpi-zero-w.dts

+3 −6
Original line number Diff line number Diff line
@@ -18,12 +18,9 @@ 
	compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";

	model = "Raspberry Pi Zero W";



	/* Needed by firmware to properly init UARTs */

	aliases {

		uart0 = "/soc/serial@7e201000";

		uart1 = "/soc/serial@7e215040";

		serial0 = "/soc/serial@7e201000";

		serial1 = "/soc/serial@7e215040";

	chosen {

		/* 8250 auxiliary UART instead of pl011 */

		stdout-path = "serial1:115200n8";

	};



	leds {

arch/arm/boot/dts/bcm2837-rpi-3-b.dts

+5 −0
Original line number Diff line number Diff line
@@ -8,6 +8,11 @@ 
	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>;

	};

arch/arm/boot/dts/bcm283x.dtsi

+6 −1
Original line number Diff line number Diff line
@@ -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 {