diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-13 12:26:29 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-13 12:26:29 +0200 |
| commit | e7895461593506e2e86404a255208876340d4bca (patch) | |
| tree | 2206c4290c99b221a7f2a4b96db6c11449f94657 | |
| parent | 93621d7037084676b1fe7c1a8d59a98754f846ec (diff) | |
| parent | fd26f8830979de48eb3f1c253eb9d2ee2e468eb6 (diff) | |
| download | talos-op-linux-e7895461593506e2e86404a255208876340d4bca.tar.gz talos-op-linux-e7895461593506e2e86404a255208876340d4bca.zip | |
Merge tag 'rpi-dt-for-armsoc-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi into next/dt
- New Firmware node and accompanying binding document
* tag 'rpi-dt-for-armsoc-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi:
dt/bindings: Add binding for the Raspberry Pi firmware driver
ARM: bcm2835: Add the firmware driver information to the RPi DT
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt | 14 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm2835-rpi.dtsi | 7 |
2 files changed, 21 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt new file mode 100644 index 000000000000..6824b3180ffb --- /dev/null +++ b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt @@ -0,0 +1,14 @@ +Raspberry Pi VideoCore firmware driver + +Required properties: + +- compatible: Should be "raspberrypi,bcm2835-firmware" +- mboxes: Phandle to the firmware device's Mailbox. + (See: ../mailbox/mailbox.txt for more information) + +Example: + +firmware { + compatible = "raspberrypi,bcm2835-firmware"; + mboxes = <&mailbox>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index 46780bb48bbf..ab5474e5d1c8 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -14,6 +14,13 @@ linux,default-trigger = "heartbeat"; }; }; + + soc { + firmware: firmware { + compatible = "raspberrypi,bcm2835-firmware"; + mboxes = <&mailbox>; + }; + }; }; &gpio { |
