summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2015-12-17 01:26:49 +0100
committerEric Anholt <eric@anholt.net>2016-02-03 05:02:45 +0100
commit5ec6f2cd8ec4bcd38ba199ea8711a5ec906d85e7 (patch)
tree5dda3d107523789a40a049e87c80dded34e20f8f /arch/arm/boot
parentARM: bcm2835: dt: Add Raspberry Pi Model A (diff)
downloadlinux-5ec6f2cd8ec4bcd38ba199ea8711a5ec906d85e7.tar.xz
linux-5ec6f2cd8ec4bcd38ba199ea8711a5ec906d85e7.zip
ARM: bcm2835: Add the Raspberry Pi power domain driver to the DT.
This connects the USB driver to the USB power domain, so that USB can actually be turned on at boot if the bootloader didn't do it for us. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/bcm2835-rpi.dtsi12
-rw-r--r--arch/arm/boot/dts/bcm283x.dtsi2
2 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
index a584a93f631d..76bdbcafab18 100644
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
@@ -1,3 +1,5 @@
+#include <dt-bindings/power/raspberrypi-power.h>
+
/ {
memory {
reg = <0 0x10000000>;
@@ -18,6 +20,12 @@
compatible = "raspberrypi,bcm2835-firmware";
mboxes = <&mailbox>;
};
+
+ power: power {
+ compatible = "raspberrypi,bcm2835-power";
+ firmware = <&firmware>;
+ #power-domain-cells = <1>;
+ };
};
};
@@ -62,3 +70,7 @@
&pwm {
status = "okay";
};
+
+&usb {
+ power-domains = <&power RPI_POWER_DOMAIN_USB>;
+};
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index c003f2d77de5..05ff5ce91c95 100644
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -218,7 +218,7 @@
status = "disabled";
};
- usb@7e980000 {
+ usb: usb@7e980000 {
compatible = "brcm,bcm2835-usb";
reg = <0x7e980000 0x10000>;
interrupts = <1 9>;