aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson2017-04-19 08:33:26 -0500
committerOlof Johansson2017-04-19 08:33:26 -0500
commitd0815dfd91e7d877f9a23a4ef46aeec9851115db (patch)
tree94ddfe6b2ee1fa9f35f1f9ab6dd326aac30b80e5
parent08fd8c9567ca6d2bd9c22ad468b53ebaa87f91a9 (diff)
parent7ba2ef7c7200e476ee2cede7bcffcf7749e02f5c (diff)
downloadkernel-d0815dfd91e7d877f9a23a4ef46aeec9851115db.tar.gz
kernel-d0815dfd91e7d877f9a23a4ef46aeec9851115db.tar.xz
kernel-d0815dfd91e7d877f9a23a4ef46aeec9851115db.zip
Merge tag 'mvebu-dt64-4.12-2' of git://git.infradead.org/linux-mvebu into next/dt64
mvebu dt64 for 4.12 (part 2) - crypto engine description for the Armada 7k/8k SoCs and the boards using it - SDHCI description for the Armada 37xx and 7k/8k SoCs and the boards using it * tag 'mvebu-dt64-4.12-2' of git://git.infradead.org/linux-mvebu: arm64: marvell: dts: enable the crypto engine on the Armada 8040 DB arm64: marvell: dts: enable the crypto engine on the Armada 7040 DB arm64: marvell: dts: add crypto engine description for 7k/8k arm64: dts: marvell: add sdhci support for Armada 7K/8K arm64: dts: marvell: add eMMC support for Armada 37xx Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm64/boot/dts/marvell/armada-3720-db.dts9
-rw-r--r--arch/arm64/boot/dts/marvell/armada-37xx.dtsi11
-rw-r--r--arch/arm64/boot/dts/marvell/armada-7040-db.dts18
-rw-r--r--arch/arm64/boot/dts/marvell/armada-8040-db.dts16
-rw-r--r--arch/arm64/boot/dts/marvell/armada-ap806.dtsi11
-rw-r--r--arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi26
-rw-r--r--arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi16
7 files changed, 107 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 2a6eef2d4d66..950cbd23a5bd 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
@@ -146,6 +146,15 @@
146 status = "okay"; 146 status = "okay";
147}; 147};
148 148
149&sdhci0 {
150 non-removable;
151 bus-width = <8>;
152 mmc-ddr-1_8v;
153 mmc-hs400-1_8v;
154 marvell,pad-type = "fixed-1-8v";
155 status = "okay";
156};
157
149/* CON31 */ 158/* CON31 */
150&usb3 { 159&usb3 {
151 status = "okay"; 160 status = "okay";
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index 2a4e8dbe33aa..311b97c80c7b 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -218,6 +218,17 @@
218 }; 218 };
219 }; 219 };
220 220
221 sdhci0: sdhci@d8000 {
222 compatible = "marvell,armada-3700-sdhci",
223 "marvell,sdhci-xenon";
224 reg = <0xd8000 0x300
225 0x17808 0x4>;
226 interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
227 clocks = <&nb_periph_clk 0>;
228 clock-names = "core";
229 status = "disabled";
230 };
231
221 sata: sata@e0000 { 232 sata: sata@e0000 {
222 compatible = "marvell,armada-3700-ahci"; 233 compatible = "marvell,armada-3700-ahci";
223 reg = <0xe0000 0x2000>; 234 reg = <0xe0000 0x2000>;
diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
index bb0e1e8e7138..12442329b80f 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>;
@@ -171,3 +185,7 @@
171 phy = <&phy1>; 185 phy = <&phy1>;
172 phy-mode = "rgmii-id"; 186 phy-mode = "rgmii-id";
173}; 187};
188
189&cpm_crypto {
190 status = "okay";
191};
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
index 80e685e4235d..dc0d084005b2 100644
--- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
@@ -140,6 +140,10 @@
140 phy-mode = "rgmii-id"; 140 phy-mode = "rgmii-id";
141}; 141};
142 142
143&cpm_crypto {
144 status = "okay";
145};
146
143/* CON5 on CP1 expansion */ 147/* CON5 on CP1 expansion */
144&cps_pcie2 { 148&cps_pcie2 {
145 status = "okay"; 149 status = "okay";
@@ -164,3 +168,15 @@
164&cps_usb3_1 { 168&cps_usb3_1 {
165 status = "okay"; 169 status = "okay";
166}; 170};
171
172&ap_sdhci0 {
173 status = "okay";
174 bus-width = <4>;
175 non-removable;
176};
177
178&cpm_sdhci0 {
179 status = "okay";
180 bus-width = <8>;
181 non-removable;
182};
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..ac8df5201cd6 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -217,6 +217,32 @@
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
231 cpm_crypto: crypto@800000 {
232 compatible = "inside-secure,safexcel-eip197";
233 reg = <0x800000 0x200000>;
234 interrupts = <GIC_SPI 34 (IRQ_TYPE_EDGE_RISING
235 | IRQ_TYPE_LEVEL_HIGH)>,
236 <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
237 <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,
238 <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
239 <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>,
240 <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
241 interrupt-names = "mem", "ring0", "ring1",
242 "ring2", "ring3", "eip";
243 clocks = <&cpm_syscon0 1 26>;
244 status = "disabled";
245 };
220 }; 246 };
221 247
222 cpm_pcie0: pcie@f2600000 { 248 cpm_pcie0: pcie@f2600000 {
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index fb9141ab9b37..7740a75a8230 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -217,6 +217,22 @@
217 clocks = <&cps_syscon0 1 25>; 217 clocks = <&cps_syscon0 1 25>;
218 status = "okay"; 218 status = "okay";
219 }; 219 };
220
221 cps_crypto: crypto@800000 {
222 compatible = "inside-secure,safexcel-eip197";
223 reg = <0x800000 0x200000>;
224 interrupts = <GIC_SPI 34 (IRQ_TYPE_EDGE_RISING
225 | IRQ_TYPE_LEVEL_HIGH)>,
226 <GIC_SPI 278 IRQ_TYPE_LEVEL_HIGH>,
227 <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>,
228 <GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>,
229 <GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>,
230 <GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>;
231 interrupt-names = "mem", "ring0", "ring1",
232 "ring2", "ring3", "eip";
233 clocks = <&cps_syscon0 1 26>;
234 status = "disabled";
235 };
220 }; 236 };
221 237
222 cps_pcie0: pcie@f4600000 { 238 cps_pcie0: pcie@f4600000 {