diff options
author | Florian Fainelli | 2016-07-06 05:47:49 +0200 |
---|---|---|
committer | Florian Fainelli | 2016-07-06 05:47:49 +0200 |
commit | b2aa1bb2be9c9cf4727ddb81ae1d0ad5a0c683a8 (patch) | |
tree | 5f20de89ddc647c29ac1d7bc3266135cdd61cbd2 /arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | |
parent | arm64: dts: NS2: Add CCI-400 PMU support (diff) | |
parent | ARM: bcm2837: dt: Add the ethernet to the device trees (diff) | |
download | kernel-qcow2-linux-b2aa1bb2be9c9cf4727ddb81ae1d0ad5a0c683a8.tar.gz kernel-qcow2-linux-b2aa1bb2be9c9cf4727ddb81ae1d0ad5a0c683a8.tar.xz kernel-qcow2-linux-b2aa1bb2be9c9cf4727ddb81ae1d0ad5a0c683a8.zip |
Merge tag 'bcm2835-dt-64-next-2016-07-03' into devicetree-arm64/next
This pull request brings in the Raspberry Pi 3 DT for its arm64
support. Note that it also merges in the ethernet DT changes so that
the Pi3's ethernet can also get the MAC address.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'arch/arm/boot/dts/bcm2835-rpi-b-plus.dts')
-rw-r--r-- | arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts index 57d313b6afaf..d5fdb8e761a3 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -1,6 +1,7 @@ /dts-v1/; #include "bcm2835.dtsi" #include "bcm2835-rpi.dtsi" +#include "bcm283x-rpi-smsc9514.dtsi" / { compatible = "raspberrypi,model-b-plus", "brcm,bcm2835"; |