aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Porotchkin <kostap@marvell.com>2017-05-23 09:11:40 -0400
committerGregory CLEMENT <gregory.clement@free-electrons.com>2017-06-17 02:19:25 -0400
commit1208d2f0c84120d4e3eb2caf663a9a8b784b38ba (patch)
tree478473181b841bb7e48e47e130275ed6054a6a03
parente9bfac543eaa01cdca7b810b9cd4eaf9e6a7f1b0 (diff)
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>
-rw-r--r--arch/arm64/boot/dts/marvell/armada-3720-db.dts9
-rw-r--r--arch/arm64/boot/dts/marvell/armada-37xx.dtsi11
2 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
index 3ee920ac0015..eab3bc7e6382 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
@@ -158,6 +158,15 @@
158 status = "okay"; 158 status = "okay";
159}; 159};
160 160
161/* SD slot module on CON14(V2.0)/CON15(V1.4) */
162&sdhci1 {
163 wp-inverted;
164 cd-gpios = <&gpiosb 2 GPIO_ACTIVE_LOW>;
165 bus-width = <4>;
166 marvell,pad-type = "sd";
167 status = "okay";
168};
169
161&spi0 { 170&spi0 {
162 status = "okay"; 171 status = "okay";
163 pinctrl-names = "default"; 172 pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index 65562319770b..b4d27857c61b 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -292,6 +292,17 @@
292 }; 292 };
293 }; 293 };
294 294
295 sdhci1: sdhci@d0000 {
296 compatible = "marvell,armada-3700-sdhci",
297 "marvell,sdhci-xenon";
298 reg = <0xd0000 0x300>,
299 <0x1e808 0x4>;
300 interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
301 clocks = <&nb_periph_clk 0>;
302 clock-names = "core";
303 status = "disabled";
304 };
305
295 sdhci0: sdhci@d8000 { 306 sdhci0: sdhci@d8000 {
296 compatible = "marvell,armada-3700-sdhci", 307 compatible = "marvell,armada-3700-sdhci",
297 "marvell,sdhci-xenon"; 308 "marvell,sdhci-xenon";