From a497a69951518aa93bd622755379a6f607e3ce5d Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@gmail.com>
Date: Sat, 25 Sep 2021 16:21:41 +0200
Subject: [PATCH] HACK: Disable MBUS due to fw_devlink=on

---
 arch/arm/boot/dts/allwinner/sun8i-r40.dtsi              | 1 +
 arch/arm/boot/dts/allwinner/sun8i-h3.dtsi               | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/allwinner/sun8i-r40.dtsi b/arch/arm/boot/dts/allwinner/sun8i-r40.dtsi
index 291f4784e86c..173edaff4c9b 100644
--- a/arch/arm/boot/dts/allwinner/sun8i-r40.dtsi
+++ b/arch/arm/boot/dts/allwinner/sun8i-r40.dtsi
@@ -949,6 +949,7 @@ mbus: dram-controller@1c62000 {
 			#size-cells = <1>;
 			dma-ranges = <0x00000000 0x40000000 0x80000000>;
 			#interconnect-cells = <1>;
+			status = "disabled";
 		};
 
 		tcon_top: tcon-top@1c70000 {
diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi b/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi
index eac2349a2380..3c08f5ee2780 100644
--- a/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi
@@ -297,6 +297,7 @@ &display_clocks {
 
 &mbus {
 	compatible = "allwinner,sun8i-h3-mbus";
+	status = "disabled";
 };
 
 &mmc0 {
