|
|
958e60d |
From e63e1480c016e59f684d92b8091589ae501996a4 Mon Sep 17 00:00:00 2001
|
|
|
958e60d |
From: Peter Robinson <pbrobinson@gmail.com>
|
|
|
958e60d |
Date: Wed, 3 Jul 2019 12:33:55 +0100
|
|
|
958e60d |
Subject: [PATCH 1/2] Revert "ARM: bcm283x: Switch V3D over to using the PM
|
|
|
958e60d |
driver instead of firmware."
|
|
|
958e60d |
|
|
|
958e60d |
This reverts commit e1dc2b2e1bef7237fd8fc055fe1ec2a6ff001f91.
|
|
|
958e60d |
---
|
|
|
958e60d |
arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 ++++
|
|
|
958e60d |
arch/arm/boot/dts/bcm283x.dtsi | 4 +---
|
|
|
958e60d |
2 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
958e60d |
|
|
|
958e60d |
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
|
|
958e60d |
index 715d50c64529..9d11cb759b5b 100644
|
|
|
958e60d |
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
|
|
958e60d |
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
|
|
958e60d |
@@ -85,6 +85,10 @@
|
|
|
958e60d |
power-domains = <&power RPI_POWER_DOMAIN_USB>;
|
|
|
958e60d |
};
|
|
|
958e60d |
|
|
|
958e60d |
+&v3d {
|
|
|
958e60d |
+ power-domains = <&power RPI_POWER_DOMAIN_V3D>;
|
|
|
958e60d |
+};
|
|
|
958e60d |
+
|
|
|
958e60d |
&hdmi {
|
|
|
958e60d |
power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
|
|
|
958e60d |
status = "okay";
|
|
|
958e60d |
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
|
|
|
958e60d |
index 9777644c6c2b..20ed8b1da11b 100644
|
|
|
958e60d |
--- a/arch/arm/boot/dts/bcm283x.dtsi
|
|
|
958e60d |
+++ b/arch/arm/boot/dts/bcm283x.dtsi
|
|
|
958e60d |
@@ -3,7 +3,6 @@
|
|
|
958e60d |
#include <dt-bindings/clock/bcm2835-aux.h>
|
|
|
958e60d |
#include <dt-bindings/gpio/gpio.h>
|
|
|
958e60d |
#include <dt-bindings/interrupt-controller/irq.h>
|
|
|
958e60d |
-#include <dt-bindings/soc/bcm2835-pm.h>
|
|
|
958e60d |
|
|
|
958e60d |
/* firmware-provided startup stubs live here, where the secondary CPUs are
|
|
|
958e60d |
* spinning.
|
|
|
958e60d |
@@ -121,7 +120,7 @@
|
|
|
958e60d |
#interrupt-cells = <2>;
|
|
|
958e60d |
};
|
|
|
958e60d |
|
|
|
958e60d |
- pm: watchdog@7e100000 {
|
|
|
958e60d |
+ watchdog@7e100000 {
|
|
|
958e60d |
compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt";
|
|
|
958e60d |
#power-domain-cells = <1>;
|
|
|
958e60d |
#reset-cells = <1>;
|
|
|
958e60d |
@@ -639,7 +638,6 @@
|
|
|
958e60d |
compatible = "brcm,bcm2835-v3d";
|
|
|
958e60d |
reg = <0x7ec00000 0x1000>;
|
|
|
958e60d |
interrupts = <1 10>;
|
|
|
958e60d |
- power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>;
|
|
|
958e60d |
};
|
|
|
958e60d |
|
|
|
958e60d |
vc4: gpu {
|
|
|
958e60d |
--
|
|
|
958e60d |
2.21.0
|
|
|
958e60d |
|