Skip to content

Commit

Permalink
arm64: dts: marvell: add sdhci support for Armada 7K/8K
Browse files Browse the repository at this point in the history
Also enable it on the Armada 7040 DB and Armada 8040 DB boards.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
  • Loading branch information
Gregory CLEMENT committed Apr 11, 2017
1 parent 53e7477 commit 910b4c5
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 0 deletions.
14 changes: 14 additions & 0 deletions arch/arm64/boot/dts/marvell/armada-7040-db.dts
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,20 @@
status = "okay";
};

&ap_sdhci0 {
status = "okay";
bus-width = <4>;
no-1-8-v;
non-removable;
};

&cpm_sdhci0 {
status = "okay";
bus-width = <4>;
no-1-8-v;
non-removable;
};

&cpm_mdio {
phy0: ethernet-phy@0 {
reg = <0>;
Expand Down
12 changes: 12 additions & 0 deletions arch/arm64/boot/dts/marvell/armada-8040-db.dts
Original file line number Diff line number Diff line change
Expand Up @@ -164,3 +164,15 @@
&cps_usb3_1 {
status = "okay";
};

&ap_sdhci0 {
status = "okay";
bus-width = <4>;
non-removable;
};

&cpm_sdhci0 {
status = "okay";
bus-width = <8>;
non-removable;
};
11 changes: 11 additions & 0 deletions arch/arm64/boot/dts/marvell/armada-ap806.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,17 @@

};

ap_sdhci0: sdhci@6e0000 {
compatible = "marvell,armada-ap806-sdhci";
reg = <0x6e0000 0x300>;
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "core";
clocks = <&ap_syscon 4>;
dma-coherent;
marvell,xenon-phy-slow-mode;
status = "disabled";
};

ap_syscon: system-controller@6f4000 {
compatible = "marvell,ap806-system-controller",
"syscon";
Expand Down
11 changes: 11 additions & 0 deletions arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,17 @@
clocks = <&cpm_syscon0 1 25>;
status = "okay";
};

cpm_sdhci0: sdhci@780000 {
compatible = "marvell,armada-cp110-sdhci";
reg = <0x780000 0x300>;
interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "core";
clocks = <&cpm_syscon0 1 4>;
dma-coherent;
status = "disabled";
};

};

cpm_pcie0: pcie@f2600000 {
Expand Down

0 comments on commit 910b4c5

Please sign in to comment.