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

Unverified Commit 7260ecd2 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'bcm2835-dt-next-2016-08-29' into devicetree/next 



This pull request brings in support for Raspberry Pi Zero.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 2f8bc002 c8336249

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

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

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



Raspberry Pi Zero

Required root node properties:

compatible = "raspberrypi,model-zero", "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
@@ -69,7 +69,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ 
	bcm2835-rpi-b-rev2.dtb \

	bcm2835-rpi-b-plus.dtb \

	bcm2835-rpi-a-plus.dtb \

	bcm2836-rpi-2-b.dtb

	bcm2836-rpi-2-b.dtb \

	bcm2835-rpi-zero.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

+1 −0
Original line number Diff line number Diff line 
/dts-v1/;

#include "bcm2835.dtsi"

#include "bcm2835-rpi.dtsi"

#include "bcm283x-rpi-usb-host.dtsi"



/ {

	compatible = "raspberrypi,model-a-plus", "brcm,bcm2835";

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

+1 −0
Original line number Diff line number Diff line 
/dts-v1/;

#include "bcm2835.dtsi"

#include "bcm2835-rpi.dtsi"

#include "bcm283x-rpi-usb-host.dtsi"



/ {

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

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

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include "bcm2835.dtsi"

#include "bcm2835-rpi.dtsi"

#include "bcm283x-rpi-smsc9514.dtsi"

#include "bcm283x-rpi-usb-host.dtsi"



/ {

	compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";