71 lines
2.2 KiB
Diff
71 lines
2.2 KiB
Diff
|
From 7b75b8def715fa617f17ec992da418ebfec7e031 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Samuel Holland <samuel@sholland.org>
|
||
|
|
Date: Sat, 3 Apr 2021 19:26:26 -0500
|
||
|
|
Subject: [PATCH 420/478] ARM: dts: sunxi: h3/h5: Update MBUS node
|
||
|
|
|
||
|
|
The MBUS binding now requires enumerating more resources. Provide them
|
||
|
|
in the device tree.
|
||
|
|
|
||
|
|
Signed-off-by: Samuel Holland <samuel@sholland.org>
|
||
|
|
---
|
||
|
|
arch/arm/boot/dts/sun8i-h3.dtsi | 4 ++++
|
||
|
|
arch/arm/boot/dts/sunxi-h3-h5.dtsi | 11 ++++++++---
|
||
|
|
arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 4 ++++
|
||
|
|
3 files changed, 16 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi
|
||
|
|
index 4e89701df91f..43acb98cf390 100644
|
||
|
|
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
|
||
|
|
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
|
||
|
|
@@ -282,6 +282,10 @@ &display_clocks {
|
||
|
|
compatible = "allwinner,sun8i-h3-de2-clk";
|
||
|
|
};
|
||
|
|
|
||
|
|
+&mbus {
|
||
|
|
+ compatible = "allwinner,sun8i-h3-mbus";
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
&mmc0 {
|
||
|
|
compatible = "allwinner,sun7i-a20-mmc";
|
||
|
|
clocks = <&ccu CLK_BUS_MMC0>,
|
||
|
|
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
|
||
|
|
index c7428df9469e..1f7447d1bd8d 100644
|
||
|
|
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
|
||
|
|
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
|
||
|
|
@@ -568,9 +568,14 @@ external_mdio: mdio@2 {
|
||
|
|
};
|
||
|
|
|
||
|
|
mbus: dram-controller@1c62000 {
|
||
|
|
- compatible = "allwinner,sun8i-h3-mbus";
|
||
|
|
- reg = <0x01c62000 0x1000>;
|
||
|
|
- clocks = <&ccu CLK_MBUS>;
|
||
|
|
+ /* compatible is in per SoC .dtsi file */
|
||
|
|
+ reg = <0x01c62000 0x1000>,
|
||
|
|
+ <0x01c63000 0x1000>;
|
||
|
|
+ reg-names = "mbus", "dram";
|
||
|
|
+ clocks = <&ccu CLK_BUS_DRAM>,
|
||
|
|
+ <&ccu CLK_DRAM>,
|
||
|
|
+ <&ccu CLK_MBUS>;
|
||
|
|
+ clock-names = "apb", "dram", "mbus";
|
||
|
|
#address-cells = <1>;
|
||
|
|
#size-cells = <1>;
|
||
|
|
dma-ranges = <0x00000000 0x40000000 0xc0000000>;
|
||
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
|
||
|
|
index 578a63dedf46..35d5d238e313 100644
|
||
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
|
||
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
|
||
|
|
@@ -233,6 +233,10 @@ &display_clocks {
|
||
|
|
compatible = "allwinner,sun50i-h5-de2-clk";
|
||
|
|
};
|
||
|
|
|
||
|
|
+&mbus {
|
||
|
|
+ compatible = "allwinner,sun50i-h5-mbus";
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
&mmc0 {
|
||
|
|
compatible = "allwinner,sun50i-h5-mmc",
|
||
|
|
"allwinner,sun50i-a64-mmc";
|
||
|
|
--
|
||
|
|
2.35.3
|
||
|
|
|