[PATCH 0/2] ARM: mvebu: enable SDHCI interface on Armada 38x

[PATCH 0/2] ARM: mvebu: enable SDHCI interface on Armada 38x

[Thomas Petazzoni]

Jason, Gregory, Andrew, Sebastian,

Here is a small set of two patches that enable the SDHCI interface on
Armada 38x. The first one adds the DT details, the second one 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 linux-next, so I presume it will be part
of 3.15. Regarding those proposed patches, they are obviously aimed at
3.16.

These patches are based on linux-next, but I can resend them if needed
once 3.15-rc1 is released.

Thanks!

Thomas

Thomas Petazzoni (2):
  ARM: mvebu: enable the SDHCI interface on Armada 385
  ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the relevant defconfigs

 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(+)

-- 
1.8.3.2

[PATCH 1/2] ARM: mvebu: enable the SDHCI interface on Armada 385

[Thomas Petazzoni]

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 <thomas.petazzoni@free-electrons.com>
---
 arch/arm/boot/dts/armada-385-db.dts | 8 ++++++++
 arch/arm/boot/dts/armada-38x.dtsi   | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/arch/arm/boot/dts/armada-385-db.dts b/arch/arm/boot/dts/armada-385-db.dts
index 6828d77..959aeed 100644
--- a/arch/arm/boot/dts/armada-385-db.dts
+++ b/arch/arm/boot/dts/armada-385-db.dts
@@ -101,6 +101,14 @@
 					reg = <0x1000000 0x3f000000>;
 				};
 			};
+
+			sdhci at d8000 {
+				clock-frequency = <200000000>;
+				broken-cd;
+				wp-inverted;
+				bus-width = <8>;
+				status = "okay";
+			};
 		};
 
 		pcie-controller {
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index a064f59..2c1ff30 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -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";
+			};
 		};
 	};
 
-- 
1.8.3.2

[PATCH 2/2] ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the relevant defconfigs

[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 both mvebu_v7_defconfig and multi_v7_defconfig, which are
both capable of building Marvell Armada 38x support.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/configs/multi_v7_defconfig | 1 +
 arch/arm/configs/mvebu_v7_defconfig | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index de52231..db44b74 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -270,6 +270,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_SPEAR=y
 CONFIG_MMC_SDHCI_BCM_KONA=y
diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig
index a34713d..26be7ff 100644
--- a/arch/arm/configs/mvebu_v7_defconfig
+++ b/arch/arm/configs/mvebu_v7_defconfig
@@ -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
-- 
1.8.3.2

[PATCH 2/2] ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the relevant defconfigs

[Jason Cooper]

Thomas,

My, you've been busy. :)

On Fri, Apr 04, 2014 at 05:42:05PM +0200, Thomas Petazzoni wrote:
> 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 both mvebu_v7_defconfig and multi_v7_defconfig, which are
> both capable of building Marvell Armada 38x support.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
>  arch/arm/configs/multi_v7_defconfig | 1 +

Please make this a separate patch when you rebase against v3.15-rc1.
arm-soc will take it directly since multi_v7_defconfig is so
conflict-prone.

>  arch/arm/configs/mvebu_v7_defconfig | 1 +
>  2 files changed, 2 insertions(+)

thx,

Jason.

[PATCH 1/2] ARM: mvebu: enable the SDHCI interface on Armada 385

[Andrew Lunn]

On Fri, Apr 04, 2014 at 05:42:04PM +0200, Thomas Petazzoni wrote:
> 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 <thomas.petazzoni@free-electrons.com>
> ---
>  arch/arm/boot/dts/armada-385-db.dts | 8 ++++++++
>  arch/arm/boot/dts/armada-38x.dtsi   | 9 +++++++++
>  2 files changed, 17 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/armada-385-db.dts b/arch/arm/boot/dts/armada-385-db.dts
> index 6828d77..959aeed 100644
> --- a/arch/arm/boot/dts/armada-385-db.dts
> +++ b/arch/arm/boot/dts/armada-385-db.dts
> @@ -101,6 +101,14 @@
>  					reg = <0x1000000 0x3f000000>;
>  				};
>  			};
> +
> +			sdhci at d8000 {
> +				clock-frequency = <200000000>;
> +				broken-cd;
> +				wp-inverted;
> +				bus-width = <8>;
> +				status = "okay";
> +			};
>  		};
>  
>  		pcie-controller {
> diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
> index a064f59..2c1ff30 100644
> --- a/arch/arm/boot/dts/armada-38x.dtsi
> +++ b/arch/arm/boot/dts/armada-38x.dtsi
> @@ -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>;

Hi Thomas

Maybe this has been discussed as part of the previous patchset. Why
the mrvl prefix, not marvell? marvell is in vendor-prefixes.txt, but
mrvl does not appear to be listed.

     Andrew

[PATCH 1/2] ARM: mvebu: enable the SDHCI interface on Armada 385

[Thomas Petazzoni]

Dear Andrew Lunn,

On Fri, 4 Apr 2014 18:00:13 +0200, Andrew Lunn wrote:

> > diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
> > index a064f59..2c1ff30 100644
> > --- a/arch/arm/boot/dts/armada-38x.dtsi
> > +++ b/arch/arm/boot/dts/armada-38x.dtsi
> > @@ -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>;
> 
> Hi Thomas
> 
> Maybe this has been discussed as part of the previous patchset. Why
> the mrvl prefix, not marvell? marvell is in vendor-prefixes.txt, but
> mrvl does not appear to be listed.

Because I'm not the one who introduced this part of the driver DT
binding. It has been added two years ago by:

commit b650352dd3df36164e3427bff3f33bc06ac47642
Author: Chris Ball <cjb@laptop.org>
Date:   Tue Apr 10 22:34:33 2012 -0400

    mmc: sdhci-pxa: Add device tree support
    
    Tested on an OLPC XO-1.75.  (MMP2, sdhci-pxav3, CONFIG_MACH_MMP2_DT=y)
    
    Signed-off-by: Chris Ball <cjb@laptop.org>
    Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>

So I'm just merely using the existing DT binding for the driver. Of
course, since I'm introducing a new compatible string, I could also
change the driver to support the same property prefixed by "marvell,",
but it would also have to support the old DT property forever, so is it
really useful?

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[PATCH 2/2] ARM: configs: add CONFIG_MMC_SDHCI_PXAV3 to the relevant defconfigs

[Thomas Petazzoni]

Dear Jason Cooper,

On Fri, 4 Apr 2014 11:49:42 -0400, Jason Cooper wrote:

> My, you've been busy. :)

Yeah, patch day :)


> >  arch/arm/configs/multi_v7_defconfig | 1 +
> 
> Please make this a separate patch when you rebase against v3.15-rc1.
> arm-soc will take it directly since multi_v7_defconfig is so
> conflict-prone.

Sure, will do. Thanks for reporting this. Typically the kind of comment
I'm interested in when sending these patches early on, so that the next
iteration on top of 3.15-rc1 will hopefully be the right one :-)

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[PATCH 1/2] ARM: mvebu: enable the SDHCI interface on Armada 385

[Andrew Lunn]

On Fri, Apr 04, 2014 at 06:15:08PM +0200, Thomas Petazzoni wrote:
> Dear Andrew Lunn,
> 
> On Fri, 4 Apr 2014 18:00:13 +0200, Andrew Lunn wrote:
> 
> > > diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
> > > index a064f59..2c1ff30 100644
> > > --- a/arch/arm/boot/dts/armada-38x.dtsi
> > > +++ b/arch/arm/boot/dts/armada-38x.dtsi
> > > @@ -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>;
> > 
> > Hi Thomas
> > 
> > Maybe this has been discussed as part of the previous patchset. Why
> > the mrvl prefix, not marvell? marvell is in vendor-prefixes.txt, but
> > mrvl does not appear to be listed.
> 
> Because I'm not the one who introduced this part of the driver DT
> binding. It has been added two years ago by:
> 
> commit b650352dd3df36164e3427bff3f33bc06ac47642
> Author: Chris Ball <cjb@laptop.org>
> Date:   Tue Apr 10 22:34:33 2012 -0400
> 
>     mmc: sdhci-pxa: Add device tree support
>     
>     Tested on an OLPC XO-1.75.  (MMP2, sdhci-pxav3, CONFIG_MACH_MMP2_DT=y)
>     
>     Signed-off-by: Chris Ball <cjb@laptop.org>
>     Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
> 
> So I'm just merely using the existing DT binding for the driver. Of
> course, since I'm introducing a new compatible string, I could also
> change the driver to support the same property prefixed by "marvell,",
> but it would also have to support the old DT property forever, so is it
> really useful?

Hi Thomas

Thanks for the explanation.

Changing it makes no sense. We should just document this other vendor
prefix in vendor-prefixes.txt

	Andrew