Merge tag 'zonefs-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / marvell / ac5-98dx25xx.dtsi

diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
index b5e042b8e9290ebbcc2dbdc3c66bd7d10d3bca13..5591939e057b8bd1d628223f20e986fe2f3df237 100644 (file)
--- a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
@@ -77,7 +77,6 @@
                #address-cells = <2>;
                #size-cells = <2>;
                ranges;
-               dma-ranges;
 
                internal-regs@7f000000 {
                        #address-cells = <1>;
@@ -204,6 +203,30 @@
                        };
                };
 
+               mmc_dma: bus@80500000 {
+                               compatible = "simple-bus";
+                               ranges;
+                               #address-cells = <0x2>;
+                               #size-cells = <0x2>;
+                               reg = <0x0 0x80500000 0x0 0x100000>;
+                               dma-ranges = <0x0 0x0 0x2 0x0 0x0 0x80000000>;
+                               dma-coherent;
+
+                               sdhci: mmc@805c0000 {
+                                       compatible = "marvell,ac5-sdhci",
+                                                    "marvell,armada-ap806-sdhci";
+                                       reg = <0x0 0x805c0000 0x0 0x1000>;
+                                       interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
+                                       clocks = <&emmc_clock>, <&cnm_clock>;
+                                       clock-names = "core", "axi";
+                                       bus-width = <8>;
+                                       non-removable;
+                                       mmc-ddr-1_8v;
+                                       mmc-hs200-1_8v;
+                                       mmc-hs400-1_8v;
+                               };
+               };
+
                /*
                 * Dedicated section for devices behind 32bit controllers so we
                 * can configure specific DMA mapping for them
@@ -335,5 +358,11 @@
                        #clock-cells = <0>;
                        clock-frequency = <400000000>;
                };
+
+               emmc_clock: emmc-clock {
+                       compatible = "fixed-clock";
+                       #clock-cells = <0>;
+                       clock-frequency = <400000000>;
+               };
        };
 };