[v2,08/10] ARM: STi: DT: Enable second sdhci controller for stih416 b2020 boards.

Message ID 1401898054-686-9-git-send-email-peter.griffin@linaro.org
State New
Headers show

Commit Message

Peter Griffin June 4, 2014, 4:07 p.m.
The second controller is only present on the stih416 SoC. Also
mark this as non-removeable as its eMMC.

Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Maxime Coquelin <maxime.coquelin@st.com>
---
 arch/arm/boot/dts/stih416-b2020-revE.dts | 6 ++++++
 arch/arm/boot/dts/stih416-b2020.dts      | 8 ++++++++
 2 files changed, 14 insertions(+)

Comments

Ulf Hansson July 9, 2014, 10:09 a.m. | #1
On 4 June 2014 18:07, Peter Griffin <peter.griffin@linaro.org> wrote:
> The second controller is only present on the stih416 SoC. Also
> mark this as non-removeable as its eMMC.
>
> Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> Acked-by: Lee Jones <lee.jones@linaro.org>
> Acked-by: Maxime Coquelin <maxime.coquelin@st.com>
> ---
>  arch/arm/boot/dts/stih416-b2020-revE.dts | 6 ++++++
>  arch/arm/boot/dts/stih416-b2020.dts      | 8 ++++++++
>  2 files changed, 14 insertions(+)
>
> diff --git a/arch/arm/boot/dts/stih416-b2020-revE.dts b/arch/arm/boot/dts/stih416-b2020-revE.dts
> index ba0fa2c..68dfdaf 100644
> --- a/arch/arm/boot/dts/stih416-b2020-revE.dts
> +++ b/arch/arm/boot/dts/stih416-b2020-revE.dts
> @@ -31,5 +31,11 @@
>                 ethernet1: dwmac@fef08000 {
>                         snps,reset-gpio = <&PIO0 7>;
>                 };
> +
> +               mmc1: sdhci@fe81f000 {
> +                       status       = "okay";
> +                       bus-width    = <8>;
> +                       non-removable;
> +               };
>         };

Hi Peter,

I was trying to apply this patchset on my next branch, but the above
file /arch/arm/boot/dts/stih416-b2020-revE.dts does not exist. And I
don't see it in linux-next either.

What tree/patch are this based upon?

Kind regards
Uffe
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Peter Griffin July 9, 2014, 10:30 a.m. | #2
Hi Ulf,

Many thanks for looking at this.

> > +
> > +               mmc1: sdhci@fe81f000 {
> > +                       status       = "okay";
> > +                       bus-width    = <8>;
> > +                       non-removable;
> > +               };
> >         };
> 
> Hi Peter,
> 
> I was trying to apply this patchset on my next branch, but the above
> file /arch/arm/boot/dts/stih416-b2020-revE.dts does not exist. And I
> don't see it in linux-next either.
> 
> What tree/patch are this based upon?

The patchset was on top of v3.15-rc1, however since then that file got renamed
to stih416-b2020e.dts, which went into 3.16 fixes.

See here for more details https://lkml.org/lkml/2014/6/18/241

Would you like me to re-send or can you up fixup?

regards,

Peter.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Maxime COQUELIN July 9, 2014, 11 a.m. | #3
Hi Ulf, Peter,

	I will queue the DT patches to my pull request for v3.17.

	Peter, I will need it to be rebased anyway.

Thanks,
Maxime

On 07/09/2014 12:30 PM, Peter Griffin wrote:
> Hi Ulf,
>
> Many thanks for looking at this.
>
>>> +
>>> +               mmc1: sdhci@fe81f000 {
>>> +                       status       = "okay";
>>> +                       bus-width    = <8>;
>>> +                       non-removable;
>>> +               };
>>>          };
>>
>> Hi Peter,
>>
>> I was trying to apply this patchset on my next branch, but the above
>> file /arch/arm/boot/dts/stih416-b2020-revE.dts does not exist. And I
>> don't see it in linux-next either.
>>
>> What tree/patch are this based upon?
>
> The patchset was on top of v3.15-rc1, however since then that file got renamed
> to stih416-b2020e.dts, which went into 3.16 fixes.
>
> See here for more details https://lkml.org/lkml/2014/6/18/241
>
> Would you like me to re-send or can you up fixup?
>
> regards,
>
> Peter.
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ulf Hansson July 9, 2014, 12:17 p.m. | #4
On 9 July 2014 13:00, Maxime Coquelin <maxime.coquelin@st.com> wrote:
> Hi Ulf, Peter,
>
>         I will queue the DT patches to my pull request for v3.17.
>
>         Peter, I will need it to be rebased anyway.

Okay.

I will apply patch1 and patch 2 for next.

You can add my ack for patch 9 and 10, which I suggest to go though
ARM SoC as well.

Kind regards
Uffe
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/arm/boot/dts/stih416-b2020-revE.dts b/arch/arm/boot/dts/stih416-b2020-revE.dts
index ba0fa2c..68dfdaf 100644
--- a/arch/arm/boot/dts/stih416-b2020-revE.dts
+++ b/arch/arm/boot/dts/stih416-b2020-revE.dts
@@ -31,5 +31,11 @@ 
 		ethernet1: dwmac@fef08000 {
 			snps,reset-gpio = <&PIO0 7>;
 		};
+
+		mmc1: sdhci@fe81f000 {
+			status       = "okay";
+			bus-width    = <8>;
+			non-removable;
+		};
 	};
 };
diff --git a/arch/arm/boot/dts/stih416-b2020.dts b/arch/arm/boot/dts/stih416-b2020.dts
index 4e2df66..d42ff1d 100644
--- a/arch/arm/boot/dts/stih416-b2020.dts
+++ b/arch/arm/boot/dts/stih416-b2020.dts
@@ -12,4 +12,12 @@ 
 / {
 	model = "STiH416 B2020";
 	compatible = "st,stih416-b2020", "st,stih416";
+
+	soc {
+		mmc1: sdhci@fe81f000 {
+			status       = "okay";
+			bus-width    = <8>;
+			non-removable;
+		};
+	};
 };