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

Unverified Commit ad41eacc authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'bcm2835-dt-next-2017-08-07' into devicetree/next 



This pull request brings in a new DT for the Raspberry Pi Zero W.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 092ccf04 2c7c040c

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

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ Raspberry Pi Zero 
Required root node properties:

compatible = "raspberrypi,model-zero", "brcm,bcm2835";



Raspberry Pi Zero W

Required root node properties:

compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";



Generic BCM2835 board

Required root node properties:

compatible = "brcm,bcm2835";

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ 
	bcm2835-rpi-a-plus.dtb \

	bcm2836-rpi-2-b.dtb \

	bcm2837-rpi-3-b.dtb \

	bcm2835-rpi-zero.dtb

	bcm2835-rpi-zero.dtb \

	bcm2835-rpi-zero-w.dtb

dtb-$(CONFIG_ARCH_BCM_5301X) += \

	bcm4708-asus-rt-ac56u.dtb \

	bcm4708-asus-rt-ac68u.dtb \

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

+6 −0
Original line number Diff line number Diff line
@@ -99,3 +99,9 @@ 
&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

	status = "okay";

};

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

+6 −0
Original line number Diff line number Diff line
@@ -94,3 +94,9 @@ 
&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

	status = "okay";

};

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

+6 −0
Original line number Diff line number Diff line
@@ -101,3 +101,9 @@ 
&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_gpio14>;

	status = "okay";

};