Skip to content

Commit 3a591d5

Browse files
committed
Merge tag 'mvebu-dt64-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt
mvebu dt64 for 6.9 (part 1) Add mmc support for AC5 Reorder crypto interrupts on Armada 3720 Use the correct thermal coefficients for the Armada AP807 dies * tag 'mvebu-dt64-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu: arm64: dts: armada-ap807: update thermal compatible arm64: dts: marvell: reorder crypto interrupts on Armada SoCs arm64: dts: ac5: add mmc node and clock Link: https://lore.kernel.org/r/87a5nihr8g.fsf@BL-laptop Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents ada1239 + ecd815b commit 3a591d5

5 files changed

Lines changed: 47 additions & 11 deletions

File tree

arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
#address-cells = <2>;
7878
#size-cells = <2>;
7979
ranges;
80-
dma-ranges;
8180

8281
internal-regs@7f000000 {
8382
#address-cells = <1>;
@@ -204,6 +203,30 @@
204203
};
205204
};
206205

206+
mmc_dma: bus@80500000 {
207+
compatible = "simple-bus";
208+
ranges;
209+
#address-cells = <0x2>;
210+
#size-cells = <0x2>;
211+
reg = <0x0 0x80500000 0x0 0x100000>;
212+
dma-ranges = <0x0 0x0 0x2 0x0 0x0 0x80000000>;
213+
dma-coherent;
214+
215+
sdhci: mmc@805c0000 {
216+
compatible = "marvell,ac5-sdhci",
217+
"marvell,armada-ap806-sdhci";
218+
reg = <0x0 0x805c0000 0x0 0x1000>;
219+
interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
220+
clocks = <&emmc_clock>, <&cnm_clock>;
221+
clock-names = "core", "axi";
222+
bus-width = <8>;
223+
non-removable;
224+
mmc-ddr-1_8v;
225+
mmc-hs200-1_8v;
226+
mmc-hs400-1_8v;
227+
};
228+
};
229+
207230
/*
208231
* Dedicated section for devices behind 32bit controllers so we
209232
* can configure specific DMA mapping for them
@@ -335,5 +358,11 @@
335358
#clock-cells = <0>;
336359
clock-frequency = <400000000>;
337360
};
361+
362+
emmc_clock: emmc-clock {
363+
compatible = "fixed-clock";
364+
#clock-cells = <0>;
365+
clock-frequency = <400000000>;
366+
};
338367
};
339368
};

arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,7 @@
9999
};
100100
};
101101
};
102+
103+
&sdhci {
104+
status = "okay";
105+
};

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -431,14 +431,14 @@
431431
crypto: crypto@90000 {
432432
compatible = "inside-secure,safexcel-eip97ies";
433433
reg = <0x90000 0x20000>;
434-
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
435-
<GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
434+
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
436435
<GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
437436
<GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
438437
<GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>,
439-
<GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
440-
interrupt-names = "mem", "ring0", "ring1",
441-
"ring2", "ring3", "eip";
438+
<GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>,
439+
<GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
440+
interrupt-names = "ring0", "ring1", "ring2",
441+
"ring3", "eip", "mem";
442442
clocks = <&nb_periph_clk 15>;
443443
};
444444

arch/arm64/boot/dts/marvell/armada-ap807.dtsi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,6 @@
3333
"marvell,armada-ap806-sdhci"; /* Backward compatibility */
3434
};
3535

36+
&ap_thermal {
37+
compatible = "marvell,armada-ap807-thermal";
38+
};

arch/arm64/boot/dts/marvell/armada-cp11x.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -511,14 +511,14 @@
511511
CP11X_LABEL(crypto): crypto@800000 {
512512
compatible = "inside-secure,safexcel-eip197b";
513513
reg = <0x800000 0x200000>;
514-
interrupts = <87 IRQ_TYPE_LEVEL_HIGH>,
515-
<88 IRQ_TYPE_LEVEL_HIGH>,
514+
interrupts = <88 IRQ_TYPE_LEVEL_HIGH>,
516515
<89 IRQ_TYPE_LEVEL_HIGH>,
517516
<90 IRQ_TYPE_LEVEL_HIGH>,
518517
<91 IRQ_TYPE_LEVEL_HIGH>,
519-
<92 IRQ_TYPE_LEVEL_HIGH>;
520-
interrupt-names = "mem", "ring0", "ring1",
521-
"ring2", "ring3", "eip";
518+
<92 IRQ_TYPE_LEVEL_HIGH>,
519+
<87 IRQ_TYPE_LEVEL_HIGH>;
520+
interrupt-names = "ring0", "ring1", "ring2", "ring3",
521+
"eip", "mem";
522522
clock-names = "core", "reg";
523523
clocks = <&CP11X_LABEL(clk) 1 26>,
524524
<&CP11X_LABEL(clk) 1 17>;

0 commit comments

Comments
 (0)