aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory CLEMENT2017-03-30 10:23:04 -0500
committerGregory CLEMENT2017-04-11 02:56:27 -0500
commit910b4c5cb3807aa5ee051d8b656a5dcb435c4964 (patch)
tree5cda1bce0d938fe9a13589ec4c8204bdc8c5990b
parent53e747780a24b271401fe2b1531696a553b00995 (diff)
downloadkernel-910b4c5cb3807aa5ee051d8b656a5dcb435c4964.tar.gz
kernel-910b4c5cb3807aa5ee051d8b656a5dcb435c4964.tar.xz
kernel-910b4c5cb3807aa5ee051d8b656a5dcb435c4964.zip
arm64: dts: marvell: add sdhci support for Armada 7K/8K
Also enable it on the Armada 7040 DB and Armada 8040 DB boards. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
-rw-r--r--arch/arm64/boot/dts/marvell/armada-7040-db.dts14
-rw-r--r--arch/arm64/boot/dts/marvell/armada-8040-db.dts12
-rw-r--r--arch/arm64/boot/dts/marvell/armada-ap806.dtsi11
-rw-r--r--arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi11
4 files changed, 48 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
index bb0e1e8e7138..577950492fec 100644
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -147,6 +147,20 @@
147 status = "okay"; 147 status = "okay";
148}; 148};
149 149
150&ap_sdhci0 {
151 status = "okay";
152 bus-width = <4>;
153 no-1-8-v;
154 non-removable;
155};
156
157&cpm_sdhci0 {
158 status = "okay";
159 bus-width = <4>;
160 no-1-8-v;
161 non-removable;
162};
163
150&cpm_mdio { 164&cpm_mdio {
151 phy0: ethernet-phy@0 { 165 phy0: ethernet-phy@0 {
152 reg = <0>; 166 reg = <0>;
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
index 80e685e4235d..81a0b1249c45 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
@@ -164,3 +164,15 @@
164&cps_usb3_1 { 164&cps_usb3_1 {
165 status = "okay"; 165 status = "okay";
166}; 166};
167
168&ap_sdhci0 {
169 status = "okay";
170 bus-width = <4>;
171 non-removable;
172};
173
174&cpm_sdhci0 {
175 status = "okay";
176 bus-width = <8>;
177 non-removable;
178};
diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index a749ba2edec4..9e9a4025e799 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -229,6 +229,17 @@
229 229
230 }; 230 };
231 231
232 ap_sdhci0: sdhci@6e0000 {
233 compatible = "marvell,armada-ap806-sdhci";
234 reg = <0x6e0000 0x300>;
235 interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
236 clock-names = "core";
237 clocks = <&ap_syscon 4>;
238 dma-coherent;
239 marvell,xenon-phy-slow-mode;
240 status = "disabled";
241 };
242
232 ap_syscon: system-controller@6f4000 { 243 ap_syscon: system-controller@6f4000 {
233 compatible = "marvell,ap806-system-controller", 244 compatible = "marvell,ap806-system-controller",
234 "syscon"; 245 "syscon";
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index a035f5955282..ad349ad3034c 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -217,6 +217,17 @@
217 clocks = <&cpm_syscon0 1 25>; 217 clocks = <&cpm_syscon0 1 25>;
218 status = "okay"; 218 status = "okay";
219 }; 219 };
220
221 cpm_sdhci0: sdhci@780000 {
222 compatible = "marvell,armada-cp110-sdhci";
223 reg = <0x780000 0x300>;
224 interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
225 clock-names = "core";
226 clocks = <&cpm_syscon0 1 4>;
227 dma-coherent;
228 status = "disabled";
229 };
230
220 }; 231 };
221 232
222 cpm_pcie0: pcie@f2600000 { 233 cpm_pcie0: pcie@f2600000 {