[PATCH v4 0/3] Add SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.

[PATCH v4 0/3] Add SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.

[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 <stripathi@apm.com>
---

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

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

[Suman Tripathi]

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

Signed-off-by: Suman Tripathi <stripathi@apm.com>
---
 arch/arm64/boot/dts/apm-mustang.dts |  4 ++++
 arch/arm64/boot/dts/apm-storm.dtsi  | 44 +++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/arch/arm64/boot/dts/apm-mustang.dts b/arch/arm64/boot/dts/apm-mustang.dts
index 8eb6d94..d0e52a9 100644
--- a/arch/arm64/boot/dts/apm-mustang.dts
+++ b/arch/arm64/boot/dts/apm-mustang.dts
@@ -44,3 +44,7 @@
 &xgenet {
 	status = "ok";
 };
+
+&sdhc0 {
+	status = "ok";
+};
diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi
index 87d3205..a98ffc1 100644
--- a/arch/arm64/boot/dts/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm-storm.dtsi
@@ -144,6 +144,40 @@
 				clock-output-names = "socplldiv2";
 			};

+			ahbclk: ahbclk@1f2ac000 {
+				compatible = "apm,xgene-device-clock";
+				#clock-cells = <1>;
+				clocks = <&socplldiv2 0>;
+				reg = <0x0 0x1f2ac000 0x0 0x1000
+					0x0 0x17000000 0x0 0x2000>;
+				reg-names = "csr-reg", "div-reg";
+				csr-offset = <0x0>;
+				csr-mask = <0x1>;
+				enable-offset = <0x8>;
+				enable-mask = <0x1>;
+				divider-offset = <0x164>;
+				divider-width = <0x5>;
+				divider-shift = <0x0>;
+				clock-output-names = "ahbclk";
+			};
+
+			sdioclk: sdioclk@1f2ac000 {
+				compatible = "apm,xgene-device-clock";
+				#clock-cells = <1>;
+				clocks = <&socplldiv2 0>;
+				reg = <0x0 0x1f2ac000 0x0 0x1000
+					0x0 0x17000000 0x0 0x2000>;
+				reg-names = "csr-reg", "div-reg";
+				csr-offset = <0x0>;
+				csr-mask = <0x2>;
+				enable-offset = <0x8>;
+				enable-mask = <0x2>;
+				divider-offset = <0x178>;
+				divider-width = <0x8>;
+				divider-shift = <0x0>;
+				clock-output-names = "sdioclk";
+			};
+
 			qmlclk: qmlclk {
 				compatible = "apm,xgene-device-clock";
 				#clock-cells = <1>;
@@ -503,6 +537,16 @@
 			interrupts = <0x0 0x4f 0x4>;
 		};

+		sdhc0: sdhc@1c000000 {
+			device_type = "sdhc";
+			compatible = "arasan,sdhci-4.9a";
+			reg = <0x0 0x1c000000 0x0 0x100>;
+			interrupts = <0x0 0x49 0x4>;
+			dma-coherent;
+			clock-names = "clk_xin", "clk_ahb";
+			clocks = <&sdioclk 0>, <&ahbclk 0>;
+		};
+
 		phy1: phy@1f21a000 {
 			compatible = "apm,xgene-phy";
 			reg = <0x0 0x1f21a000 0x0 0x100>;
--
1.8.2.1

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

[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 <stripathi@apm.com>
---
 drivers/mmc/host/sdhci-of-arasan.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
index 981d66e..92a4222 100644
--- a/drivers/mmc/host/sdhci-of-arasan.c
+++ b/drivers/mmc/host/sdhci-of-arasan.c
@@ -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

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

[Suman Tripathi]

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

Signed-off-by: Suman Tripathi <stripathi@apm.com>
---
 Documentation/devicetree/bindings/mmc/arasan,sdhci.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/mmc/arasan,sdhci.txt b/Documentation/devicetree/bindings/mmc/arasan,sdhci.txt
index 98ee2ab..6dd3d60 100644
--- a/Documentation/devicetree/bindings/mmc/arasan,sdhci.txt
+++ b/Documentation/devicetree/bindings/mmc/arasan,sdhci.txt
@@ -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

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

[Michal Simek]

On 05/04/2015 03:39 PM, Suman Tripathi wrote:
> This patch updates Arasan SDHC documentation to support
> 4.9a version of Arasan SDHC controller.
> 
> Signed-off-by: Suman Tripathi <stripathi@apm.com>
> ---
>  Documentation/devicetree/bindings/mmc/arasan,sdhci.txt | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/mmc/arasan,sdhci.txt b/Documentation/devicetree/bindings/mmc/arasan,sdhci.txt
> index 98ee2ab..6dd3d60 100644
> --- a/Documentation/devicetree/bindings/mmc/arasan,sdhci.txt
> +++ b/Documentation/devicetree/bindings/mmc/arasan,sdhci.txt
> @@ -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
> 

Reviewed-by: Michal Simek <michal.simek@xilinx.com>

Thanks,
Michal

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

[Michal Simek]

On 05/04/2015 03:39 PM, Suman Tripathi wrote:
> 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 <stripathi@apm.com>
> ---
>  drivers/mmc/host/sdhci-of-arasan.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
> index 981d66e..92a4222 100644
> --- a/drivers/mmc/host/sdhci-of-arasan.c
> +++ b/drivers/mmc/host/sdhci-of-arasan.c
> @@ -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
> 

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

Reviewed-by: Michal Simek <michal.simek@xilinx.com>

Thanks,
Michal

Re: [PATCH v4 0/3] Add SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.

[Arnd Bergmann]

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.
> 
> 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 <arnd@arndb.de>

Re: [PATCH v4 0/3] Add SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.

[Ulf Hansson]

On 4 May 2015 at 15:39, Suman Tripathi <stripathi@apm.com> 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.
>
> 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 <stripathi@apm.com>
> ---
>
> 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(-)
>

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

Re: [PATCH v4 0/3] Add SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.

[Suman Tripathi]

On Tue, May 5, 2015 at 2:06 PM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> On 4 May 2015 at 15:39, Suman Tripathi <stripathi@apm.com> 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.
>>
>> 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 <stripathi@apm.com>
>> ---
>>
>> 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(-)
>>
>
> 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 ??

>
> Kind regards
> Uffe



-- 
Thanks,
with regards,
Suman Tripathi

Re: [PATCH v4 0/3] Add SDHCI support for APM X-Gene SoC using ARASAN SDHCI controller.

[Ulf Hansson]

On 5 May 2015 at 10:42, Suman Tripathi <stripathi@apm.com> wrote:
> On Tue, May 5, 2015 at 2:06 PM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
>> On 4 May 2015 at 15:39, Suman Tripathi <stripathi@apm.com> 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.
>>>
>>> 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 <stripathi@apm.com>
>>> ---
>>>
>>> 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(-)
>>>
>>
>> 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 ??

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

>
>>
>> Kind regards
>> Uffe
>
>
>
> --
> Thanks,
> with regards,
> Suman Tripathi