BCM270X: Disable VEC unless vc4-kms-v3d is present.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/arch/arm/boot/dts/bcm2708-rpi.dtsi b/arch/arm/boot/dts/bcm2708-rpi.dtsi
index ef14e9ac6cd2092efb1681682dd2d3c52b8abfd5..8bb9ca54a36f2ac29987ecc1c2738b6758849a16 100644 (file)
--- a/arch/arm/boot/dts/bcm2708-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi
@@ -111,3 +111,7 @@
 &clocks {
        firmware = <&firmware>;
 };
+
+&vec {
+       status = "disabled";
+};

diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
index 05faf1bfa1b7c73fd60b1efb813b969e10bbfefa..c57e795824e9261e0f60bcb40d6a57241019fd91 100644 (file)
--- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
+++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
@@ -151,6 +151,13 @@
        };
 
        fragment@18 {
+               target = <&vec>;
+               __overlay__  {
+                       status = "okay";
+               };
+       };
+
+       fragment@19 {
                target = <&clocks>;
                __overlay__  {
                        claim-clocks = <