Skip to contentSkip to conversation

ARM: mvebu: enable SDHCI interface on Armada 38x

PATCH New Thomas Petazzoni 4 participants 8 messages Apr 14, 2014 – May 5, 2014

Subsystems (3)
Device tree bindings Arm (32-bit) Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support
lore
Share & tools
lore

Thomas Petazzoni

author
#0 lore raw

v2 cover ARM: mvebu: enable SDHCI interface on Armada 38x

Jason, Gregory, Andrew, Sebastian,

Here is a small set of patches that enable the SDHCI interface on Armada 38x. The first one adds the DT details, the second and third ones adjusts the appropriate defconfigs to include the relevant driver.

The sdhci-pxav3 driver change has been taken by the MMC maintainer Chris Ball, and is already in 3.15-rc1.

Changes since v1:

* Rebased on top of v3.15-rc1.

* Split in two commits the defconfig changes, so that the multi_v7_defconfig change can be directly taken by the arm-soc maintainers.

Thanks!

Thomas

Thomas Petazzoni (3):
ARM: mvebu: enable the SDHCI interface on Armada 385
ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the mvebu_v7_defconfig
ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the multi_v7_defconfig

 arch/arm/boot/dts/armada-385-db.dts | 8 ++++++++
 arch/arm/boot/dts/armada-38x.dtsi   | 9 +++++++++
 arch/arm/configs/multi_v7_defconfig | 1 +
 arch/arm/configs/mvebu_v7_defconfig | 1 +
 4 files changed, 19 insertions(+)
Signature · 1 line
1.8.3.2
author
#1 lore raw

PATCH v2 1/3 ARM: mvebu: enable the SDHCI interface on Armada 385

In commit "mmc: sdhci-pxav3: add support for the Armada 38x SDHCI controller", the sdhci-pxav3 driver has been extended to also be usable on Armada 38x platforms.

Therefore, this commit adds the necessary Device Tree informations to declare this SDHCI interface in the Armada 38x SoC, and also in the Armada 385 Development Board.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/boot/dts/armada-385-db.dts | 8 ++++++++
 arch/arm/boot/dts/armada-38x.dtsi   | 9 +++++++++
 2 files changed, 17 insertions(+)
arch/arm/boot/dts/armada-385-db.dts +8 -0
index 6828d77..959aeed 100644
@@ -101,6 +101,14 @@
 					reg = <0x1000000 0x3f000000>;
 				};
 			};
+
+			sdhci at d8000 {
+				clock-frequency = <200000000>;
+				broken-cd;
+				wp-inverted;
+				bus-width = <8>;
+				status = "okay";
+			};
 		};
 
 		pcie-controller {
arch/arm/boot/dts/armada-38x.dtsi +9 -0
index a064f59..2c1ff30 100644
@@ -355,6 +355,15 @@
 				clocks = <&coredivclk 0>;
 				status = "disabled";
 			};
+
+			sdhci at d8000 {
+				compatible = "marvell,armada-380-sdhci";
+				reg = <0xd8000 0x1000>, <0xdc000 0x100>;
+				interrupts = <0 25 0x4>;
+				clocks = <&gateclk 17>;
+				mrvl,clk-delay-cycles = <0x1F>;
+				status = "disabled";
+			};
 		};
 	};
Signature · 1 line
1.8.3.2
author
#2 lore raw

PATCH v2 2/3 ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the mvebu_v7_defconfig

In reply to Thomas Petazzoni

The Marvell Armada 38x platform has a SDHCI interface managed by the sdhci-pxav3 MMC host driver. It therefore makes sense to enable this driver in mvebu_v7_defconfig.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/configs/mvebu_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/mvebu_v7_defconfig +1 -0
index a34713d..26be7ff 100644
@@ -79,6 +79,7 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_MMC=y
+CONFIG_MMC_SDHCI_PXAV3=y
 CONFIG_MMC_MVSDIO=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_GPIO=y
Signature · 1 line
1.8.3.2
author
#3 lore raw

PATCH v2 3/3 ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the multi_v7_defconfig

In reply to Thomas Petazzoni

The Marvell Armada 38x platform has a SDHCI interface managed by the sdhci-pxav3 MMC host driver. It therefore makes sense to enable this driver in multi_v7_defconfig, which supports the Armada 38x platform.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/configs/multi_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/multi_v7_defconfig +1 -0
index d4e8a47..d392f2d 100644
@@ -273,6 +273,7 @@ CONFIG_MMC_BLOCK_MINORS=16
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
+CONFIG_MMC_SDHCI_PXAV3=y
 CONFIG_MMC_SDHCI_TEGRA=y
 CONFIG_MMC_SDHCI_DOVE=y
 CONFIG_MMC_SDHCI_SPEAR=y
Signature · 1 line
1.8.3.2
#4 lore raw

PATCH v2 3/3 ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the multi_v7_defconfig

Arnd, Olof, Kevin,

Please take this directly since it changes multi_v7_defconfig. Also please note that Andrew Lunn Acked the whole series as well.

Quoted 5 lines · Thomas Petazzoni

The Marvell Armada 38x platform has a SDHCI interface managed by the sdhci-pxav3 MMC host driver. It therefore makes sense to enable this driver in multi_v7_defconfig, which supports the Armada 38x platform.

Signed-off-by Thomas Petazzoni <[email protected]>
Acked-by Jason Cooper <[email protected]>

thx,

Jason.

Quoted 24 lines
---
 arch/arm/configs/multi_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/multi_v7_defconfig +1 -0
index d4e8a47..d392f2d 100644
@@ -273,6 +273,7 @@ CONFIG_MMC_BLOCK_MINORS=16
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
+CONFIG_MMC_SDHCI_PXAV3=y
 CONFIG_MMC_SDHCI_TEGRA=y
 CONFIG_MMC_SDHCI_DOVE=y
 CONFIG_MMC_SDHCI_SPEAR=y
Signature · 7 lines
1.8.3.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#5 lore raw

PATCH v2 3/3 ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the multi_v7_defconfig

In reply to Thomas Petazzoni
Quoted 8 lines · Thomas Petazzoni

The Marvell Armada 38x platform has a SDHCI interface managed by the sdhci-pxav3 MMC host driver. It therefore makes sense to enable this driver in multi_v7_defconfig, which supports the Armada 38x platform.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/configs/multi_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)

Applied (this one I had alreayd hunted down before I sent the email about the other acked multi_v7_defconfig patch. :)

-Olof

maintainer
#6 lore raw

v2 cover ARM: mvebu: enable SDHCI interface on Armada 38x

In reply to Thomas Petazzoni
Quoted 10 lines · Thomas Petazzoni

Jason, Gregory, Andrew, Sebastian,

Here is a small set of patches that enable the SDHCI interface on Armada 38x. The first one adds the DT details, the second and third ones adjusts the appropriate defconfigs to include the relevant driver.

The sdhci-pxav3 driver change has been taken by the MMC maintainer Chris Ball, and is already in 3.15-rc1.

Quoted 7 lines

Changes since v1:

* Rebased on top of v3.15-rc1.

* Split in two commits the defconfig changes, so that the multi_v7_defconfig change can be directly taken by the arm-soc maintainers.

Acked-by Andrew Lunn <[email protected]>

Andrew

Applied
#7 lore raw

v2 cover ARM: mvebu: enable SDHCI interface on Armada 38x

In reply to Thomas Petazzoni
Quoted 18 lines · Thomas Petazzoni

Jason, Gregory, Andrew, Sebastian,

Here is a small set of patches that enable the SDHCI interface on Armada 38x. The first one adds the DT details, the second and third ones adjusts the appropriate defconfigs to include the relevant driver.

The sdhci-pxav3 driver change has been taken by the MMC maintainer Chris Ball, and is already in 3.15-rc1.

Changes since v1:

* Rebased on top of v3.15-rc1.

* Split in two commits the defconfig changes, so that the multi_v7_defconfig change can be directly taken by the arm-soc maintainers.

Quoted 8 lines

Thanks!

Thomas

Thomas Petazzoni (3):
ARM: mvebu: enable the SDHCI interface on Armada 385
ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the mvebu_v7_defconfig
ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the multi_v7_defconfig

Applied patch 1 to mvebu/dt, 2 to mvebu/defconfig, and I'll Ack #3.

Also included Andrew's Ack

thx,

Jason.