Add SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.

PATCH Superseded Suman Tripathi 5 participants 10 messages May 4, 2015 – May 5, 2015 1 message not in the archive

Subsystems (4)

Device tree bindings MMC, SD and SDIO Arm/Zynq architecture Secure digital host controller interface (SDHCI) driver

lore

Share & tools

lore

Suman Tripathi

author

2015-05-04 13:39 UTC #0 lore raw

v4 cover Add SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.

This patch adds the SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.

v1 change:
* Use the CONFIG_ARM64_DMA_HAS_IOMMU for dma-mapping.

v2 change:
* Drop the IOMMU support and switching to PIO mode for arasan. controller integrated inside APM X-Gene SoC.

v3 change:
* Change the sdhci-of-arasan.c to support arasan4.9a.
* Add quirks for arasan4.9a.

v4 change:
* Cleanup the Documentation and dts.

Signed-off-by Suman Tripathi <[email protected]>

---

Suman Tripathi (3):
arm64: dts: Add the arasan sdhc nodes in apm-storm.dtsi.
mmc: host: arasan: Add the support for sdhci-arasan4.9a in
sdhci-of-arasan.c
Documentation: mmc: Update Arasan SDHC documentation to support 4.9a
version of Arasan SDHC controller.

 .../devicetree/bindings/mmc/arasan,sdhci.txt       |  3 +-
 arch/arm64/boot/dts/apm-mustang.dts                |  4 ++
 arch/arm64/boot/dts/apm-storm.dtsi                 | 44 ++++++++++++++++++++++
 drivers/mmc/host/sdhci-of-arasan.c                 |  7 ++++
 4 files changed, 57 insertions(+), 1 deletion(-)

--
1.8.2.1

A message that is not in the archive (sent off-list or not yet received): 1430746792-32574-1-git-send-email-stripathi-qTEPVZfXA3Y@public.gmane.org

Suman Tripathi

2015-05-04 13:39 UTC #2 lore raw

PATCH v4 1/3 arm64: dts: Add the arasan sdhc nodes in apm-storm.dtsi.

This patch adds the arasan sdhc nodes to reuse the of-arasan driver for APM X-Gene SoC.

Signed-off-by Suman Tripathi <[email protected]>

---
 arch/arm64/boot/dts/apm-mustang.dts |  4 ++++
 arch/arm64/boot/dts/apm-storm.dtsi  | 44 +++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

arch/arm64/boot/dts/apm-mustang.dts +4 -0

index 8eb6d94..d0e52a9 100644
@@ -44,3 +44,7 @@
 &xgenet {
 	status = "ok";
 };
+
+&sdhc0 {
+	status = "ok";
+};

arch/arm64/boot/dts/apm-storm.dtsi +44 -0

56 lines not on this page · raw message

--
1.8.2.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Suman Tripathi

author

2015-05-04 13:39 UTC #3 lore raw

PATCH v4 2/3 mmc: host: arasan: Add the support for sdhci-arasan4.9a in sdhci-of-arasan.c

In reply to Suman Tripathi

This patch adds the quirks and compatible string in sdhci-of-arasan.c to support sdhci-arasan4.9a version of controller.

Signed-off-by Suman Tripathi <[email protected]>

---
 drivers/mmc/host/sdhci-of-arasan.c | 7 +++++++
 1 file changed, 7 insertions(+)

drivers/mmc/host/sdhci-of-arasan.c +7 -0

index 981d66e..92a4222 100644
@@ -20,6 +20,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/of_device.h>
 #include "sdhci-pltfm.h"
 
 #define SDHCI_ARASAN_CLK_CTRL_OFFSET	0x2c

@@ -169,6 +170,11 @@ static int sdhci_arasan_probe(struct platform_device *pdev)
 		goto clk_disable_all;
 	}
 
+	if (of_device_is_compatible(pdev->dev.of_node, "arasan,sdhci-4.9a")) {
+		host->quirks |= SDHCI_QUIRK_NO_HISPD_BIT;
+		host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23;
+	}
+
 	sdhci_get_of_property(pdev);
 	pltfm_host = sdhci_priv(host);
 	pltfm_host->priv = sdhci_arasan;

@@ -206,6 +212,7 @@ static int sdhci_arasan_remove(struct platform_device *pdev)
 
 static const struct of_device_id sdhci_arasan_of_match[] = {
 	{ .compatible = "arasan,sdhci-8.9a" },
+	{ .compatible = "arasan,sdhci-4.9a" },
 	{ }
 };
 MODULE_DEVICE_TABLE(of, sdhci_arasan_of_match);

--
1.8.2.1

Michal Simek

2015-05-04 14:15 UTC #4 lore raw

PATCH v4 2/3 mmc: host: arasan: Add the support for sdhci-arasan4.9a in sdhci-of-arasan.c

Quoted 41 lines · Suman Tripathi

This patch adds the quirks and compatible string in sdhci-of-arasan.c to support sdhci-arasan4.9a version of controller.

Signed-off-by Suman Tripathi <[email protected]>

---
 drivers/mmc/host/sdhci-of-arasan.c | 7 +++++++
 1 file changed, 7 insertions(+)

drivers/mmc/host/sdhci-of-arasan.c +7 -1

index 981d66e..92a4222 100644
@@ -20,6 +20,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/of_device.h>
 #include "sdhci-pltfm.h"
 
 #define SDHCI_ARASAN_CLK_CTRL_OFFSET	0x2c

@@ -169,6 +170,11 @@ static int sdhci_arasan_probe(struct platform_device *pdev)
 		goto clk_disable_all;
 	}
 
+	if (of_device_is_compatible(pdev->dev.of_node, "arasan,sdhci-4.9a")) {
+		host->quirks |= SDHCI_QUIRK_NO_HISPD_BIT;
+		host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23;
+	}
+
 	sdhci_get_of_property(pdev);
 	pltfm_host = sdhci_priv(host);
 	pltfm_host->priv = sdhci_arasan;

@@ -206,6 +212,7 @@ static int sdhci_arasan_remove(struct platform_device *pdev)
 
 static const struct of_device_id sdhci_arasan_of_match[] = {
 	{ .compatible = "arasan,sdhci-8.9a" },
+	{ .compatible = "arasan,sdhci-4.9a" },
 	{ }
 };
 MODULE_DEVICE_TABLE(of, sdhci_arasan_of_match);
--

Quoted 2 lines

1.8.2.1

You probably need just to add simple of.h but of_device.h should be also fine.

Reviewed-by Michal Simek <[email protected]>

Thanks,
Michal

Suman Tripathi

author

2015-05-04 13:39 UTC #5 lore raw

PATCH v4 3/3 Documentation: mmc: Update Arasan SDHC documentation to support 4.9a version of Arasan SDHC controller.

In reply to Suman Tripathi

This patch updates Arasan SDHC documentation to support 4.9a version of Arasan SDHC controller.

Signed-off-by Suman Tripathi <[email protected]>

---
 Documentation/devicetree/bindings/mmc/arasan,sdhci.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Documentation/devicetree/bindings/mmc/arasan,sdhci.txt +2 -1

index 98ee2ab..6dd3d60 100644
@@ -8,7 +8,8 @@ Device Tree Bindings for the Arasan SDHCI Controller
   [3] Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
 
 Required Properties:
-  - compatible: Compatibility string. Must be 'arasan,sdhci-8.9a'
+  - compatible: Compatibility string. Must be 'arasan,sdhci-8.9a' or
+                'arasan,sdhci-4.9a'
   - reg: From mmc bindings: Register location and length.
   - clocks: From clock bindings: Handles to clock inputs.
   - clock-names: From clock bindings: Tuple including "clk_xin" and "clk_ahb"

--
1.8.2.1

Michal Simek

2015-05-04 14:13 UTC #6 lore raw

PATCH v4 3/3 Documentation: mmc: Update Arasan SDHC documentation to support 4.9a version of Arasan SDHC controller.

Quoted 23 lines · Suman Tripathi

This patch updates Arasan SDHC documentation to support 4.9a version of Arasan SDHC controller.

Signed-off-by Suman Tripathi <[email protected]>

---
 Documentation/devicetree/bindings/mmc/arasan,sdhci.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Documentation/devicetree/bindings/mmc/arasan,sdhci.txt +2 -2

index 98ee2ab..6dd3d60 100644
@@ -8,7 +8,8 @@ Device Tree Bindings for the Arasan SDHCI Controller
   [3] Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
 
 Required Properties:
-  - compatible: Compatibility string. Must be 'arasan,sdhci-8.9a'
+  - compatible: Compatibility string. Must be 'arasan,sdhci-8.9a' or
+                'arasan,sdhci-4.9a'
   - reg: From mmc bindings: Register location and length.
   - clocks: From clock bindings: Handles to clock inputs.
   - clock-names: From clock bindings: Tuple including "clk_xin" and "clk_ahb"
--

Quoted 2 lines

1.8.2.1

Reviewed-by Michal Simek <[email protected]>

Thanks,
Michal

Arnd Bergmann

2015-05-04 15:27 UTC #7 lore raw

v4 cover Add SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.

In reply to Suman Tripathi

Quoted 9 lines · On Monday 04 May 2015 19:09:49 Suman Tripathi wrote:

This patch adds the SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.
v1 change:
* Use the CONFIG_ARM64_DMA_HAS_IOMMU for dma-mapping.
v2 change:
* Drop the IOMMU support and switching to PIO mode for arasan. controller integrated inside APM X-Gene SoC.

Quoted 7 lines

v3 change:
* Change the sdhci-of-arasan.c to support arasan4.9a.
* Add quirks for arasan4.9a.
v4 change:
* Cleanup the Documentation and dts.

All three patches

Acked-by Arnd Bergmann <[email protected]>

Ulf Hansson

Applied

2015-05-05 08:36 UTC #8 lore raw

v4 cover Add SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.

In reply to Suman Tripathi

Quoted 26 lines · Suman Tripathi

This patch adds the SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.
v1 change:
* Use the CONFIG_ARM64_DMA_HAS_IOMMU for dma-mapping.
v2 change:
* Drop the IOMMU support and switching to PIO mode for arasan. controller integrated inside APM X-Gene SoC.
v3 change:
* Change the sdhci-of-arasan.c to support arasan4.9a.
* Add quirks for arasan4.9a.
v4 change:
* Cleanup the Documentation and dts.
Signed-off-by Suman Tripathi <[email protected]>
---
Suman Tripathi (3):
arm64: dts: Add the arasan sdhc nodes in apm-storm.dtsi.
mmc: host: arasan: Add the support for sdhci-arasan4.9a in
sdhci-of-arasan.c
Documentation: mmc: Update Arasan SDHC documentation to support 4.9a
version of Arasan SDHC controller.

Quoted 6 lines

 .../devicetree/bindings/mmc/arasan,sdhci.txt       |  3 +-
 arch/arm64/boot/dts/apm-mustang.dts                |  4 ++
 arch/arm64/boot/dts/apm-storm.dtsi                 | 44 ++++++++++++++++++++++
 drivers/mmc/host/sdhci-of-arasan.c                 |  7 ++++
 4 files changed, 57 insertions(+), 1 deletion(-)

Thanks!

I have applied patch2 and patch3. Though, I decided to squash them into one patch and changed the commit message header a bit.

I couldn't apply patch 1, so I guess that will be taken through arm soc?

Kind regards
Uffe

Suman Tripathi

author

2015-05-05 08:42 UTC #9 lore raw

v4 cover Add SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.

Quoted 34 lines · Ulf Hansson

Quoted 26 lines · Suman Tripathi
This patch adds the SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.
v1 change:
* Use the CONFIG_ARM64_DMA_HAS_IOMMU for dma-mapping.
v2 change:
* Drop the IOMMU support and switching to PIO mode for arasan. controller integrated inside APM X-Gene SoC.
v3 change:
* Change the sdhci-of-arasan.c to support arasan4.9a.
* Add quirks for arasan4.9a.
v4 change:
* Cleanup the Documentation and dts.
Signed-off-by Suman Tripathi <[email protected]>
---
Suman Tripathi (3):
arm64: dts: Add the arasan sdhc nodes in apm-storm.dtsi.
mmc: host: arasan: Add the support for sdhci-arasan4.9a in
sdhci-of-arasan.c
Documentation: mmc: Update Arasan SDHC documentation to support 4.9a
version of Arasan SDHC controller.
Quoted 6 lines
 .../devicetree/bindings/mmc/arasan,sdhci.txt       |  3 +-
 arch/arm64/boot/dts/apm-mustang.dts                |  4 ++
 arch/arm64/boot/dts/apm-storm.dtsi                 | 44 ++++++++++++++++++++++
 drivers/mmc/host/sdhci-of-arasan.c                 |  7 ++++
 4 files changed, 57 insertions(+), 1 deletion(-)

Quoted 6 lines

Thanks!
I have applied patch2 and patch3. Though, I decided to squash them into one patch and changed the commit message header a bit.
I couldn't apply patch 1, so I guess that will be taken through arm soc?

why it couldn't be applied?? I made it in top of

git git://git.linaro.org/people/ulf.hansson/mmc.git

Is this not correct ??

Quoted 3 lines

Kind regards
Uffe

Signature · 3 lines

Thanks,
with regards,
Suman Tripathi

Ulf Hansson

2015-05-05 08:53 UTC #10 lore raw

v4 cover Add SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.

Quoted 40 lines · Suman Tripathi

Quoted 39 lines · Ulf Hansson
Quoted 26 lines · Suman Tripathi
This patch adds the SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.
v1 change:
* Use the CONFIG_ARM64_DMA_HAS_IOMMU for dma-mapping.
v2 change:
* Drop the IOMMU support and switching to PIO mode for arasan. controller integrated inside APM X-Gene SoC.
v3 change:
* Change the sdhci-of-arasan.c to support arasan4.9a.
* Add quirks for arasan4.9a.
v4 change:
* Cleanup the Documentation and dts.
Signed-off-by Suman Tripathi <[email protected]>
---
Suman Tripathi (3):
arm64: dts: Add the arasan sdhc nodes in apm-storm.dtsi.
mmc: host: arasan: Add the support for sdhci-arasan4.9a in
sdhci-of-arasan.c
Documentation: mmc: Update Arasan SDHC documentation to support 4.9a
version of Arasan SDHC controller.
Quoted 6 lines
 .../devicetree/bindings/mmc/arasan,sdhci.txt       |  3 +-
 arch/arm64/boot/dts/apm-mustang.dts                |  4 ++
 arch/arm64/boot/dts/apm-storm.dtsi                 | 44 ++++++++++++++++++++++
 drivers/mmc/host/sdhci-of-arasan.c                 |  7 ++++
 4 files changed, 57 insertions(+), 1 deletion(-)
Thanks!
I have applied patch2 and patch3. Though, I decided to squash them into one patch and changed the commit message header a bit.

Quoted 7 lines

Quoted 1 line
I couldn't apply patch 1, so I guess that will be taken through arm soc?
why it couldn't be applied?? I made it in top of
git git://git.linaro.org/people/ulf.hansson/mmc.git
Is this not correct ??

That's correct, but it apparently needs a rebase.
The below files has moved:
arch/arm64/boot/dts/apm-mustang.dts
arch/arm64/boot/dts/apm-storm.dtsi

Send a new version and I am happy to take it through my tree, since it got Arnd's ack.

Kind regards
Uffe

Quoted 11 lines

Quoted 4 lines
Kind regards
Uffe
--
Thanks,
with regards,
Suman Tripathi