arm64: dts: marvell: Enable second SDHCI controller in Armada 37xx

The Armada 37xx SoCs has 2 SDHCI interfaces. This patch adds the second
one.

Moreover, the Armada 37xx DB v2 board populates the 2 SDHCI interfaces.

The second interface is using pluggable module that can either
have an SD connector or eMMC on it.
This patch adds support for SD module in the device DT.

[ gregory.clement@free-electrons.com:
 - Add more detail in commit log
 - Sort the dt node in address order
 - Document the SD slot in the dts ]

Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Gbp-Pq: Topic features/arm64
Gbp-Pq: Name arm64-dts-marvell-Enable-second-SDHCI-controller-in-.patch

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
index a89855f57091fac35d3ba4b9821fd2a902f5ed77..6a0abd7a5349177bd5cd7436f105af44d8f12ace 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
@@ -113,6 +113,15 @@
        status = "okay";
 };
 
+/* SD slot module on CON14(V2.0)/CON15(V1.4) */
+&sdhci1 {
+       wp-inverted;
+       cd-gpios = <&gpiosb 2 GPIO_ACTIVE_LOW>;
+       bus-width = <4>;
+       marvell,pad-type = "sd";
+       status = "okay";
+};
+
 &spi0 {
        status = "okay";
        pinctrl-names = "default";

diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index b69e4a4ecdd8ef7d3f7082da6a75de926afe58bb..76cdd6848d7d22da279d4d85ad6f3a5f32a6d6bd 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -288,6 +288,17 @@
                                };
                        };
 
+                       sdhci1: sdhci@d0000 {
+                               compatible = "marvell,armada-3700-sdhci",
+                                            "marvell,sdhci-xenon";
+                               reg = <0xd0000 0x300>,
+                                     <0x1e808 0x4>;
+                               interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&nb_periph_clk 0>;
+                               clock-names = "core";
+                               status = "disabled";
+                       };
+
                        sdhci0: sdhci@d8000 {
                                compatible = "marvell,armada-3700-sdhci",
                                "marvell,sdhci-xenon";