summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorArnd Bergmann2016-07-07 15:42:55 +0200
committerArnd Bergmann2016-07-07 15:42:55 +0200
commit62a4d9b588f429f2f325c013df7f9fc680586e7b (patch)
tree7c346216af685fedf807babedf42afdc89ed2306 /Documentation
parentMerge tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/k... (diff)
parentMerge tag 'bcm2835-dt-64-next-2016-07-03' into devicetree-arm64/next (diff)
downloadkernel-qcow2-linux-62a4d9b588f429f2f325c013df7f9fc680586e7b.tar.gz
kernel-qcow2-linux-62a4d9b588f429f2f325c013df7f9fc680586e7b.tar.xz
kernel-qcow2-linux-62a4d9b588f429f2f325c013df7f9fc680586e7b.zip
Merge tag 'arm-soc/for-4.8/devicetree-arm64-part2' of http://github.com/Broadcom/stblinux into next/dt64
Merge "Broadcom ARM64 Device Tree changes for 4.8 (part 2)" from Florian Fainelli: This pull request contains the second part of the Broadcom ARM64-based SoCs changes for 4.8. Please note that this pull request contains changes from the ARM 32-bits port and ARM 64-bits port as well: - Lubomir updates all BCM2835 (Raspberry Pi family) Device Tree source files with their proper information about the on-board USB Ethernet adapter so there is appropriate binding between this USB device and a device_node (useful for MAC address fetching and stuff), this commit is also present for the ARM DT pull request - Eric adds support for the Raspberry Pi 3 aka BCM2837 and provides the binding information and the basic SoC DT include file required to boot to a prompt - Gerd updates the Raspberry Pi 3 DT with Ethernet information based on the earlier change from Lubomir * tag 'arm-soc/for-4.8/devicetree-arm64-part2' of http://github.com/Broadcom/stblinux: ARM: bcm2837: dt: Add the ethernet to the device trees ARM: bcm2835: Add devicetree for the Raspberry Pi 3. dt-bindings: Add root properties for Raspberry Pi 3 ARM: bcm2835: dt: Add the ethernet to the device trees
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
index 11d3056dc2bd..6ffe08778465 100644
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
@@ -30,6 +30,10 @@ Raspberry Pi 2 Model B
Required root node properties:
compatible = "raspberrypi,2-model-b", "brcm,bcm2836";
+Raspberry Pi 3 Model B
+Required root node properties:
+compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
+
Raspberry Pi Compute Module
Required root node properties:
compatible = "raspberrypi,compute-module", "brcm,bcm2835";