Unverified Commit 98dcd5d4 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'bcm2835-dt-next-2018-04-30' into devicetree/next 



This pull request brings in Raspberry Pi 3 B+ support and connects
HDMI hotplug, LEDs, and wifi/bluetooth on the Raspberry Pi 3.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 0c0d1c90 bdd6d1fe

Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ Raspberry Pi 3 Model B 
Required root node properties:

compatible = "raspberrypi,3-model-b", "brcm,bcm2837";



Raspberry Pi 3 Model B+

Required root node properties:

compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837";



Raspberry Pi Compute Module

Required root node properties:

compatible = "raspberrypi,compute-module", "brcm,bcm2835";

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ 
	bcm2835-rpi-a-plus.dtb \

	bcm2836-rpi-2-b.dtb \

	bcm2837-rpi-3-b.dtb \

	bcm2837-rpi-3-b-plus.dtb \

	bcm2835-rpi-zero.dtb \

	bcm2835-rpi-zero-w.dtb

dtb-$(CONFIG_ARCH_BCM_5301X) += \

arch/arm/boot/dts/bcm2835-rpi-a-plus.dts

+6 −0
Original line number Diff line number Diff line
@@ -101,6 +101,12 @@ &hdmi { 
	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

};



&pwm {

	pinctrl-names = "default";

	pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

arch/arm/boot/dts/bcm2835-rpi-a.dts

+6 −0
Original line number Diff line number Diff line
@@ -96,6 +96,12 @@ &hdmi { 
	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

};



&pwm {

	pinctrl-names = "default";

	pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

arch/arm/boot/dts/bcm2835-rpi-b-plus.dts

+6 −0
Original line number Diff line number Diff line
@@ -103,6 +103,12 @@ &hdmi { 
	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

};



&pwm {

	pinctrl-names = "default";

	pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;

	status = "okay";

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;