Allwinner: linux: Re-enable mbus for SoCs with driver

This commit is contained in:
Jernej Skrabec 2022-08-07 21:04:29 +02:00
parent f090615460
commit 4bc6d8e381

View File

@ -5,9 +5,8 @@ Subject: [PATCH] HACK: Disable MBUS due to fw_devlink=on
---
arch/arm/boot/dts/sun8i-r40.dtsi | 1 +
arch/arm/boot/dts/sunxi-h3-h5.dtsi | 1 +
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 +
3 files changed, 3 insertions(+)
arch/arm/boot/dts/sun8i-h3.dtsi | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi
index 291f4784e86c..173edaff4c9b 100644
@ -21,30 +20,15 @@ index 291f4784e86c..173edaff4c9b 100644
};
tcon_top: tcon-top@1c70000 {
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
index c7428df9469e..1cbb871b6628 100644
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
@@ -575,6 +575,7 @@ mbus: dram-controller@1c62000 {
#size-cells = <1>;
dma-ranges = <0x00000000 0x40000000 0xc0000000>;
#interconnect-cells = <1>;
+ status = "disabled";
};
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi
index eac2349a2380..3c08f5ee2780 100644
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
@@ -297,6 +297,7 @@ &display_clocks {
spi0: spi@1c68000 {
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index 6ddb717f2f98..f0ec62b4170b 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -1135,6 +1135,7 @@ mbus: dram-controller@1c62000 {
#size-cells = <1>;
dma-ranges = <0x00000000 0x40000000 0xc0000000>;
#interconnect-cells = <1>;
+ status = "disabled";
};
&mbus {
compatible = "allwinner,sun8i-h3-mbus";
+ status = "disabled";
};
csi: csi@1cb0000 {
--
2.33.0
&mmc0 {