iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This pull request brings in a fix for default serial console setup on

Browse Source 
RPi3, so it now comes up with no config.txt/cmdline.txt settings in
 the firmware.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE/JuuFDWp9/ZkuCBXtdYpNtH8nugFAlnX+yoACgkQtdYpNtH8
 nui1EA/+I731RqdL+jbZdsw3/f0QWZeIL9iUvQmdi0XYpqd7PjK/CptDadY4vmwS
 XNqcfI9B6HAa7pj3skP5zOFkrdp/h4pfIvQ2IcsXEUTd0O0C82aI7R+CaaY9WC++
 p6xlowYggSiw86Mkr/5Azbg/+zU6ZQWKnNeI+gpKGe84Ze5+r91zYjgz4t86+sVJ
 2m2E06rBQsYvIS/YA+otfmDIIiUcC/2ads11WmC6Cufx8bOxEdOrLaoiwUwHHYRY
 SRCyupkkDggUVZUTTFp1DNRfXbfiMBJuEKOMCulhVIXPEKGWYorg5ywdk3TodyFl
 /G05HigHCLsb9S8QOajRFzp/mgzXU0WxdkEmAlaTspKU4MGdQ24WdcG5HYxJPovE
 acdsvPjmDdPTb3+mRhvbMgcdmkkT5+KHYmjlV51CHyn9wB0gH9uhoYj+orz1ksTb
 fx/0pzkGOqMW4gJ+/0aJPjQ4H1QTTbPSiKgm1dvwsivSXOJuabPrsCRP99xaZ0UY
 Utns2Ok3uL4MT0mRjO6cWOcU9eo+ZgaXFYTFgcgFvZ7lAAJpX0FGOTQyKngg0gjZ
 5J5Lu8C56COe5PAwakgsvhgXQpVOYC1DsGmhY4VxJI9aIz62FW8WgrtvDA36cuS6
 3pwrf7I2uMJKZDAMy4OeXV1OBm+DQXgaR2tari3lSrJFZyweKnE=
 =5wQi
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJZ2AAgAAoJEIfQlpxEBwcEsnUQALmmVmBxNYK4+nS0MVCMP8gH
 jndaUXi4MbG0Cj/vtFX0wmp98UNM3cYIDW/U618qpd8/C6ODfC+HM+55L+MeqKMN
 Ikztkfc5LnNfC6EgDvCAsFdcvBFHcwORyKpZztHsAGiwZg8lXASfD2uipy/Xevzz
 IV6P/h6k82oMfV3HsDGvuWrbIMTIyXmzbCOG6eqAov1b400Pk6NT6WObVu4xdI3G
 nuO1OQN9MWqgOWupOhkY61WVHximRuGxLKO7RIyVAjmuXjdyPSoVww4wT/l6rGuj
 6IxyhciYYuQh/jKKJiGPjT5pimR+433iei7NoN+P9KeZKFZcqJPQH+Qs60gA+ftA
 cxDzLpdZN8LmP90NeO1SARVxm0dpTn/eoLrJctr/wi59VkX0nf9YFN7m1tPR6lim
 IIL4xZLqRN3qXedkH6kQgTZiaDYh0n4SCb75/oKQ/CEHqL18Om9vUyKoemJhWF7O
 sasHBohfv/4flrTyLzgcq3AJwlBsptEMK5NQOVyz0MW618IltL5VfF6VNXcn3FwK
 6gH7NkFNvnwRIkwghglwQ27jIIsKIghnKEUgsNKEAX1ZnrBz+7/cwt0rmvel4Hp+
 H7JTVDPoV1od+HZdkKjMz7k8rNtvjMaNbYMJZKF67bLnc3mrzKIeic0dlUGeEj+Y
 LJwqF0TVuffEq+o8VwmY
 =ZWtt
 -----END PGP SIGNATURE-----

Merge tag 'bcm2835-dt-fixes-2017-10-06' into devicetree/fixes

This pull request brings in a fix for default serial console setup on
RPi3, so it now comes up with no config.txt/cmdline.txt settings in
the firmware.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Florian Fainelli 2017-10-06 15:11:23 -07:00
commit 80a86dbd98
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
View File

@ -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 {

5
arch/arm/boot/dts/bcm2837-rpi-3-b.dts
View File

@ -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>;
};

7
arch/arm/boot/dts/bcm283x.dtsi
View File

@ -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 {