aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/bcm2835-rpi.dtsi4
-rw-r--r--arch/arm/boot/dts/bcm283x.dtsi4
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
index 29f970f864dc..c6e2b2320abc 100644
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
@@ -87,10 +87,6 @@
87 power-domains = <&power RPI_POWER_DOMAIN_USB>; 87 power-domains = <&power RPI_POWER_DOMAIN_USB>;
88}; 88};
89 89
90&v3d {
91 power-domains = <&power RPI_POWER_DOMAIN_V3D>;
92};
93
94&hdmi { 90&hdmi {
95 power-domains = <&power RPI_POWER_DOMAIN_HDMI>; 91 power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
96 status = "okay"; 92 status = "okay";
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
index 20ed8b1da11b..9777644c6c2b 100644
--- a/arch/arm/boot/dts/bcm283x.dtsi
+++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -3,6 +3,7 @@
3#include <dt-bindings/clock/bcm2835-aux.h> 3#include <dt-bindings/clock/bcm2835-aux.h>
4#include <dt-bindings/gpio/gpio.h> 4#include <dt-bindings/gpio/gpio.h>
5#include <dt-bindings/interrupt-controller/irq.h> 5#include <dt-bindings/interrupt-controller/irq.h>
6#include <dt-bindings/soc/bcm2835-pm.h>
6 7
7/* firmware-provided startup stubs live here, where the secondary CPUs are 8/* firmware-provided startup stubs live here, where the secondary CPUs are
8 * spinning. 9 * spinning.
@@ -120,7 +121,7 @@
120 #interrupt-cells = <2>; 121 #interrupt-cells = <2>;
121 }; 122 };
122 123
123 watchdog@7e100000 { 124 pm: watchdog@7e100000 {
124 compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; 125 compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt";
125 #power-domain-cells = <1>; 126 #power-domain-cells = <1>;
126 #reset-cells = <1>; 127 #reset-cells = <1>;
@@ -638,6 +639,7 @@
638 compatible = "brcm,bcm2835-v3d"; 639 compatible = "brcm,bcm2835-v3d";
639 reg = <0x7ec00000 0x1000>; 640 reg = <0x7ec00000 0x1000>;
640 interrupts = <1 10>; 641 interrupts = <1 10>;
642 power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>;
641 }; 643 };
642 644
643 vc4: gpu { 645 vc4: gpu {