diff options
| author | Jeremy Cline <jcline@redhat.com> | 2019-12-04 13:38:43 -0500 |
|---|---|---|
| committer | Jeremy Cline <jcline@redhat.com> | 2019-12-04 13:38:43 -0500 |
| commit | 079e0f545a491903a6acb0dc783d162ae84a2e6c (patch) | |
| tree | 7a030bec812ab5e3e50079ebf0015ce8504a5b3e /0001-Revert-ARM-bcm283x-Switch-V3D-over-to-using-the-PM-d.patch | |
| parent | c1e2dca7bf02f21854445669ab48f82dead65dfc (diff) | |
| download | kernel-079e0f545a491903a6acb0dc783d162ae84a2e6c.tar.gz kernel-079e0f545a491903a6acb0dc783d162ae84a2e6c.tar.xz kernel-079e0f545a491903a6acb0dc783d162ae84a2e6c.zip | |
Sync up stabilization with f31
Diffstat (limited to '0001-Revert-ARM-bcm283x-Switch-V3D-over-to-using-the-PM-d.patch')
| -rw-r--r-- | 0001-Revert-ARM-bcm283x-Switch-V3D-over-to-using-the-PM-d.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/0001-Revert-ARM-bcm283x-Switch-V3D-over-to-using-the-PM-d.patch b/0001-Revert-ARM-bcm283x-Switch-V3D-over-to-using-the-PM-d.patch deleted file mode 100644 index f73136a36..000000000 --- a/0001-Revert-ARM-bcm283x-Switch-V3D-over-to-using-the-PM-d.patch +++ /dev/null @@ -1,59 +0,0 @@ -From e63e1480c016e59f684d92b8091589ae501996a4 Mon Sep 17 00:00:00 2001 -From: Peter Robinson <pbrobinson@gmail.com> -Date: Wed, 3 Jul 2019 12:33:55 +0100 -Subject: [PATCH 1/2] Revert "ARM: bcm283x: Switch V3D over to using the PM - driver instead of firmware." - -This reverts commit e1dc2b2e1bef7237fd8fc055fe1ec2a6ff001f91. ---- - arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 ++++ - arch/arm/boot/dts/bcm283x.dtsi | 4 +--- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi -index 715d50c64529..9d11cb759b5b 100644 ---- a/arch/arm/boot/dts/bcm2835-rpi.dtsi -+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi -@@ -85,6 +85,10 @@ - power-domains = <&power RPI_POWER_DOMAIN_USB>; - }; - -+&v3d { -+ power-domains = <&power RPI_POWER_DOMAIN_V3D>; -+}; -+ - &hdmi { - power-domains = <&power RPI_POWER_DOMAIN_HDMI>; - status = "okay"; -diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index 9777644c6c2b..20ed8b1da11b 100644 ---- a/arch/arm/boot/dts/bcm283x.dtsi -+++ b/arch/arm/boot/dts/bcm283x.dtsi -@@ -3,7 +3,6 @@ - #include <dt-bindings/clock/bcm2835-aux.h> - #include <dt-bindings/gpio/gpio.h> - #include <dt-bindings/interrupt-controller/irq.h> --#include <dt-bindings/soc/bcm2835-pm.h> - - /* firmware-provided startup stubs live here, where the secondary CPUs are - * spinning. -@@ -121,7 +120,7 @@ - #interrupt-cells = <2>; - }; - -- pm: watchdog@7e100000 { -+ watchdog@7e100000 { - compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; - #power-domain-cells = <1>; - #reset-cells = <1>; -@@ -639,7 +638,6 @@ - compatible = "brcm,bcm2835-v3d"; - reg = <0x7ec00000 0x1000>; - interrupts = <1 10>; -- power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>; - }; - - vc4: gpu { --- -2.21.0 - |