diff mbox

[1/2] ARM: dts: Fix status property of mmc nodes for snow board

Message ID 1386571118-17793-1-git-send-email-yuvaraj.cd@samsung.com
State New, archived
Headers show

Commit Message

Yuvaraj CD Dec. 9, 2013, 6:38 a.m. UTC
Commit 0c3de788 ("ARM: dts: change status property of dwmmc nodes
for exynos5250") missed out handling the exynos5250 snow dts file.

Signed-off-by : Abhilash Kesavan <a.kesavan@samsung.com>

Signed-off-by: Yuvaraj Kumar C D <yuvaraj.cd@samsung.com>
---
 arch/arm/boot/dts/cros5250-common.dtsi |    4 ----
 arch/arm/boot/dts/exynos5250-snow.dts  |    9 +++++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

Comments

Doug Anderson Dec. 9, 2013, 4:16 p.m. UTC | #1
Yuvaraj,

On Sun, Dec 8, 2013 at 10:38 PM, Yuvaraj Kumar C D <yuvaraj.cd@gmail.com> wrote:
> Commit 0c3de788 ("ARM: dts: change status property of dwmmc nodes
> for exynos5250") missed out handling the exynos5250 snow dts file.
>
> Signed-off-by : Abhilash Kesavan <a.kesavan@samsung.com>
>
> Signed-off-by: Yuvaraj Kumar C D <yuvaraj.cd@samsung.com>
> ---
>  arch/arm/boot/dts/cros5250-common.dtsi |    4 ----
>  arch/arm/boot/dts/exynos5250-snow.dts  |    9 +++++++++
>  2 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi
> index 6470536..1ceb62e 100644
> --- a/arch/arm/boot/dts/cros5250-common.dtsi
> +++ b/arch/arm/boot/dts/cros5250-common.dtsi
> @@ -247,10 +247,6 @@
>                 };
>         };
>
> -       mmc@12210000 {
> -               status = "disabled";
> -       };
> -
>         mmc@12220000 {
>                 num-slots = <1>;
>                 supports-highspeed;
> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
> index a9395c4..67484d1 100644
> --- a/arch/arm/boot/dts/exynos5250-snow.dts
> +++ b/arch/arm/boot/dts/exynos5250-snow.dts
> @@ -171,11 +171,20 @@
>                 };
>         };
>
> +       mmc@12200000 {
> +               status = "okay";
> +       };
> +
> +       mmc@12220000 {
> +               status = "okay";
> +       };
> +

I probably would have put the 12200000 and 12220000 ones in
cros5250-common since that's where all of the other stuff relating to
those ports is.  Some of it may need to be moved around once we get
the HP Chromebook 11 (exynos5250-spring) in place, but until then it
seems best to keep it all together.

-Doug
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kim Kukjin Dec. 9, 2013, 8:56 p.m. UTC | #2
On 12/10/13 01:16, Doug Anderson wrote:
> Yuvaraj,
>
> On Sun, Dec 8, 2013 at 10:38 PM, Yuvaraj Kumar C D<yuvaraj.cd@gmail.com>  wrote:
>> Commit 0c3de788 ("ARM: dts: change status property of dwmmc nodes
>> for exynos5250") missed out handling the exynos5250 snow dts file.
>>
>> Signed-off-by : Abhilash Kesavan<a.kesavan@samsung.com>
>>
>> Signed-off-by: Yuvaraj Kumar C D<yuvaraj.cd@samsung.com>
>> ---
>>   arch/arm/boot/dts/cros5250-common.dtsi |    4 ----
>>   arch/arm/boot/dts/exynos5250-snow.dts  |    9 +++++++++
>>   2 files changed, 9 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi
>> index 6470536..1ceb62e 100644
>> --- a/arch/arm/boot/dts/cros5250-common.dtsi
>> +++ b/arch/arm/boot/dts/cros5250-common.dtsi
>> @@ -247,10 +247,6 @@
>>                  };
>>          };
>>
>> -       mmc@12210000 {
>> -               status = "disabled";
>> -       };
>> -
>>          mmc@12220000 {
>>                  num-slots =<1>;
>>                  supports-highspeed;
>> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
>> index a9395c4..67484d1 100644
>> --- a/arch/arm/boot/dts/exynos5250-snow.dts
>> +++ b/arch/arm/boot/dts/exynos5250-snow.dts
>> @@ -171,11 +171,20 @@
>>                  };
>>          };
>>
>> +       mmc@12200000 {
>> +               status = "okay";
>> +       };
>> +
>> +       mmc@12220000 {
>> +               status = "okay";
>> +       };
>> +
>
> I probably would have put the 12200000 and 12220000 ones in
> cros5250-common since that's where all of the other stuff relating to
> those ports is.  Some of it may need to be moved around once we get
> the HP Chromebook 11 (exynos5250-spring) in place, but until then it
> seems best to keep it all together.
>
> -Doug

OK, sounds better, I don't know well about the HP Chromebook though ;-)

- Kukjin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Olof Johansson Dec. 18, 2013, 6:38 p.m. UTC | #3
On Mon, Dec 9, 2013 at 12:56 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> On 12/10/13 01:16, Doug Anderson wrote:
>>
>> Yuvaraj,
>>
>> On Sun, Dec 8, 2013 at 10:38 PM, Yuvaraj Kumar C D<yuvaraj.cd@gmail.com>
>> wrote:
>>>
>>> Commit 0c3de788 ("ARM: dts: change status property of dwmmc nodes
>>> for exynos5250") missed out handling the exynos5250 snow dts file.
>>>
>>> Signed-off-by : Abhilash Kesavan<a.kesavan@samsung.com>
>>>
>>> Signed-off-by: Yuvaraj Kumar C D<yuvaraj.cd@samsung.com>
>>> ---
>>>   arch/arm/boot/dts/cros5250-common.dtsi |    4 ----
>>>   arch/arm/boot/dts/exynos5250-snow.dts  |    9 +++++++++
>>>   2 files changed, 9 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/cros5250-common.dtsi
>>> b/arch/arm/boot/dts/cros5250-common.dtsi
>>> index 6470536..1ceb62e 100644
>>> --- a/arch/arm/boot/dts/cros5250-common.dtsi
>>> +++ b/arch/arm/boot/dts/cros5250-common.dtsi
>>> @@ -247,10 +247,6 @@
>>>                  };
>>>          };
>>>
>>> -       mmc@12210000 {
>>> -               status = "disabled";
>>> -       };
>>> -
>>>          mmc@12220000 {
>>>                  num-slots =<1>;
>>>                  supports-highspeed;
>>> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts
>>> b/arch/arm/boot/dts/exynos5250-snow.dts
>>> index a9395c4..67484d1 100644
>>> --- a/arch/arm/boot/dts/exynos5250-snow.dts
>>> +++ b/arch/arm/boot/dts/exynos5250-snow.dts
>>> @@ -171,11 +171,20 @@
>>>                  };
>>>          };
>>>
>>> +       mmc@12200000 {
>>> +               status = "okay";
>>> +       };
>>> +
>>> +       mmc@12220000 {
>>> +               status = "okay";
>>> +       };
>>> +
>>
>>
>> I probably would have put the 12200000 and 12220000 ones in
>> cros5250-common since that's where all of the other stuff relating to
>> those ports is.  Some of it may need to be moved around once we get
>> the HP Chromebook 11 (exynos5250-spring) in place, but until then it
>> seems best to keep it all together.
>>
>> -Doug
>
>
> OK, sounds better, I don't know well about the HP Chromebook though ;-)

This broke linux-next on snow ever since the original patch went in.
Please squash the above into the original patch or at the very least
apply it as soon as possible.


-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kim Kukjin Dec. 18, 2013, 7:35 p.m. UTC | #4
On 12/19/13 03:38, Olof Johansson wrote:
> On Mon, Dec 9, 2013 at 12:56 PM, Kukjin Kim<kgene.kim@samsung.com>  wrote:
>> On 12/10/13 01:16, Doug Anderson wrote:
>>>
>>> Yuvaraj,
>>>
>>> On Sun, Dec 8, 2013 at 10:38 PM, Yuvaraj Kumar C D<yuvaraj.cd@gmail.com>
>>> wrote:
>>>>
>>>> Commit 0c3de788 ("ARM: dts: change status property of dwmmc nodes
>>>> for exynos5250") missed out handling the exynos5250 snow dts file.
>>>>
>>>> Signed-off-by : Abhilash Kesavan<a.kesavan@samsung.com>
>>>>
>>>> Signed-off-by: Yuvaraj Kumar C D<yuvaraj.cd@samsung.com>
>>>> ---
>>>>    arch/arm/boot/dts/cros5250-common.dtsi |    4 ----
>>>>    arch/arm/boot/dts/exynos5250-snow.dts  |    9 +++++++++
>>>>    2 files changed, 9 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/arch/arm/boot/dts/cros5250-common.dtsi
>>>> b/arch/arm/boot/dts/cros5250-common.dtsi
>>>> index 6470536..1ceb62e 100644
>>>> --- a/arch/arm/boot/dts/cros5250-common.dtsi
>>>> +++ b/arch/arm/boot/dts/cros5250-common.dtsi
>>>> @@ -247,10 +247,6 @@
>>>>                   };
>>>>           };
>>>>
>>>> -       mmc@12210000 {
>>>> -               status = "disabled";
>>>> -       };
>>>> -
>>>>           mmc@12220000 {
>>>>                   num-slots =<1>;
>>>>                   supports-highspeed;
>>>> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts
>>>> b/arch/arm/boot/dts/exynos5250-snow.dts
>>>> index a9395c4..67484d1 100644
>>>> --- a/arch/arm/boot/dts/exynos5250-snow.dts
>>>> +++ b/arch/arm/boot/dts/exynos5250-snow.dts
>>>> @@ -171,11 +171,20 @@
>>>>                   };
>>>>           };
>>>>
>>>> +       mmc@12200000 {
>>>> +               status = "okay";
>>>> +       };
>>>> +
>>>> +       mmc@12220000 {
>>>> +               status = "okay";
>>>> +       };
>>>> +
>>>
>>>
>>> I probably would have put the 12200000 and 12220000 ones in
>>> cros5250-common since that's where all of the other stuff relating to
>>> those ports is.  Some of it may need to be moved around once we get
>>> the HP Chromebook 11 (exynos5250-spring) in place, but until then it
>>> seems best to keep it all together.
>>>
>>> -Doug
>>
>>
>> OK, sounds better, I don't know well about the HP Chromebook though ;-)
>
> This broke linux-next on snow ever since the original patch went in.
> Please squash the above into the original patch or at the very least
> apply it as soon as possible.
>
Oops, OK. I've applied this separately just now.

Thanks,
Kukjin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Olof Johansson Dec. 23, 2013, 9:43 p.m. UTC | #5
On Wed, Dec 18, 2013 at 11:35 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> On 12/19/13 03:38, Olof Johansson wrote:
>>
>> On Mon, Dec 9, 2013 at 12:56 PM, Kukjin Kim<kgene.kim@samsung.com>  wrote:
>>>
>>> On 12/10/13 01:16, Doug Anderson wrote:
>>>>
>>>>
>>>> Yuvaraj,
>>>>
>>>> On Sun, Dec 8, 2013 at 10:38 PM, Yuvaraj Kumar C D<yuvaraj.cd@gmail.com>
>>>> wrote:
>>>>>
>>>>>
>>>>> Commit 0c3de788 ("ARM: dts: change status property of dwmmc nodes
>>>>> for exynos5250") missed out handling the exynos5250 snow dts file.
>>>>>
>>>>> Signed-off-by : Abhilash Kesavan<a.kesavan@samsung.com>
>>>>>
>>>>> Signed-off-by: Yuvaraj Kumar C D<yuvaraj.cd@samsung.com>
>>>>> ---
>>>>>    arch/arm/boot/dts/cros5250-common.dtsi |    4 ----
>>>>>    arch/arm/boot/dts/exynos5250-snow.dts  |    9 +++++++++
>>>>>    2 files changed, 9 insertions(+), 4 deletions(-)
>>>>>
>>>>> diff --git a/arch/arm/boot/dts/cros5250-common.dtsi
>>>>> b/arch/arm/boot/dts/cros5250-common.dtsi
>>>>> index 6470536..1ceb62e 100644
>>>>> --- a/arch/arm/boot/dts/cros5250-common.dtsi
>>>>> +++ b/arch/arm/boot/dts/cros5250-common.dtsi
>>>>> @@ -247,10 +247,6 @@
>>>>>                   };
>>>>>           };
>>>>>
>>>>> -       mmc@12210000 {
>>>>> -               status = "disabled";
>>>>> -       };
>>>>> -
>>>>>           mmc@12220000 {
>>>>>                   num-slots =<1>;
>>>>>                   supports-highspeed;
>>>>> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts
>>>>> b/arch/arm/boot/dts/exynos5250-snow.dts
>>>>> index a9395c4..67484d1 100644
>>>>> --- a/arch/arm/boot/dts/exynos5250-snow.dts
>>>>> +++ b/arch/arm/boot/dts/exynos5250-snow.dts
>>>>> @@ -171,11 +171,20 @@
>>>>>                   };
>>>>>           };
>>>>>
>>>>> +       mmc@12200000 {
>>>>> +               status = "okay";
>>>>> +       };
>>>>> +
>>>>> +       mmc@12220000 {
>>>>> +               status = "okay";
>>>>> +       };
>>>>> +
>>>>
>>>>
>>>>
>>>> I probably would have put the 12200000 and 12220000 ones in
>>>> cros5250-common since that's where all of the other stuff relating to
>>>> those ports is.  Some of it may need to be moved around once we get
>>>> the HP Chromebook 11 (exynos5250-spring) in place, but until then it
>>>> seems best to keep it all together.
>>>>
>>>> -Doug
>>>
>>>
>>>
>>> OK, sounds better, I don't know well about the HP Chromebook though ;-)
>>
>>
>> This broke linux-next on snow ever since the original patch went in.
>> Please squash the above into the original patch or at the very least
>> apply it as soon as possible.
>>
> Oops, OK. I've applied this separately just now.

Since you hadn't applied this to the branch you sent me, I now have an
arm-soc for-next branch that doesn't boot on Chromebooks.

I've picked up the above patch directly into arm-soc. Please drop it
from your branch.


-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kim Kukjin Dec. 24, 2013, 1:26 a.m. UTC | #6
Olof Johansson wrote:
> 
> On Wed, Dec 18, 2013 at 11:35 AM, Kukjin Kim <kgene.kim@samsung.com>
wrote:
> > On 12/19/13 03:38, Olof Johansson wrote:
> >>
> >> On Mon, Dec 9, 2013 at 12:56 PM, Kukjin Kim<kgene.kim@samsung.com>
> wrote:
> >>>
> >>> On 12/10/13 01:16, Doug Anderson wrote:
> >>>>
> >>>>
> >>>> Yuvaraj,
> >>>>
> >>>> On Sun, Dec 8, 2013 at 10:38 PM, Yuvaraj Kumar C
> D<yuvaraj.cd@gmail.com>
> >>>> wrote:
> >>>>>
> >>>>>
> >>>>> Commit 0c3de788 ("ARM: dts: change status property of dwmmc nodes
> >>>>> for exynos5250") missed out handling the exynos5250 snow dts file.
> >>>>>
> >>>>> Signed-off-by : Abhilash Kesavan<a.kesavan@samsung.com>
> >>>>>
> >>>>> Signed-off-by: Yuvaraj Kumar C D<yuvaraj.cd@samsung.com>
> >>>>> ---
> >>>>>    arch/arm/boot/dts/cros5250-common.dtsi |    4 ----
> >>>>>    arch/arm/boot/dts/exynos5250-snow.dts  |    9 +++++++++
> >>>>>    2 files changed, 9 insertions(+), 4 deletions(-)
> >>>>>
> >>>>> diff --git a/arch/arm/boot/dts/cros5250-common.dtsi
> >>>>> b/arch/arm/boot/dts/cros5250-common.dtsi
> >>>>> index 6470536..1ceb62e 100644
> >>>>> --- a/arch/arm/boot/dts/cros5250-common.dtsi
> >>>>> +++ b/arch/arm/boot/dts/cros5250-common.dtsi
> >>>>> @@ -247,10 +247,6 @@
> >>>>>                   };
> >>>>>           };
> >>>>>
> >>>>> -       mmc@12210000 {
> >>>>> -               status = "disabled";
> >>>>> -       };
> >>>>> -
> >>>>>           mmc@12220000 {
> >>>>>                   num-slots =<1>;
> >>>>>                   supports-highspeed;
> >>>>> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts
> >>>>> b/arch/arm/boot/dts/exynos5250-snow.dts
> >>>>> index a9395c4..67484d1 100644
> >>>>> --- a/arch/arm/boot/dts/exynos5250-snow.dts
> >>>>> +++ b/arch/arm/boot/dts/exynos5250-snow.dts
> >>>>> @@ -171,11 +171,20 @@
> >>>>>                   };
> >>>>>           };
> >>>>>
> >>>>> +       mmc@12200000 {
> >>>>> +               status = "okay";
> >>>>> +       };
> >>>>> +
> >>>>> +       mmc@12220000 {
> >>>>> +               status = "okay";
> >>>>> +       };
> >>>>> +
> >>>>
> >>>>
> >>>>
> >>>> I probably would have put the 12200000 and 12220000 ones in
> >>>> cros5250-common since that's where all of the other stuff relating to
> >>>> those ports is.  Some of it may need to be moved around once we get
> >>>> the HP Chromebook 11 (exynos5250-spring) in place, but until then it
> >>>> seems best to keep it all together.
> >>>>
> >>>> -Doug
> >>>
> >>>
> >>>
> >>> OK, sounds better, I don't know well about the HP Chromebook though
;-)
> >>
> >>
> >> This broke linux-next on snow ever since the original patch went in.
> >> Please squash the above into the original patch or at the very least
> >> apply it as soon as possible.
> >>
> > Oops, OK. I've applied this separately just now.
> 
> Since you hadn't applied this to the branch you sent me, I now have an
> arm-soc for-next branch that doesn't boot on Chromebooks.
> 
Because 1st pull request already has been sent out to arm-soc when I picked
this into samsung tree after your inform. So I couldn't.

> I've picked up the above patch directly into arm-soc. Please drop it
> from your branch.
> 
You mean, I need to re-sort out my 2nd pull-request already sent out? IMHO,
would be better to us if you could pull my 2nd pull-request and drop your
picking up...

Thanks,
Kukjin

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Olof Johansson Dec. 24, 2013, 2:55 a.m. UTC | #7
On Mon, Dec 23, 2013 at 5:26 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Olof Johansson wrote:
>>
>> On Wed, Dec 18, 2013 at 11:35 AM, Kukjin Kim <kgene.kim@samsung.com>
> wrote:
>> > On 12/19/13 03:38, Olof Johansson wrote:
>> >>
>> >> On Mon, Dec 9, 2013 at 12:56 PM, Kukjin Kim<kgene.kim@samsung.com>
>> wrote:
>> >>>
>> >>> On 12/10/13 01:16, Doug Anderson wrote:
>> >>>>
>> >>>>
>> >>>> Yuvaraj,
>> >>>>
>> >>>> On Sun, Dec 8, 2013 at 10:38 PM, Yuvaraj Kumar C
>> D<yuvaraj.cd@gmail.com>
>> >>>> wrote:
>> >>>>>
>> >>>>>
>> >>>>> Commit 0c3de788 ("ARM: dts: change status property of dwmmc nodes
>> >>>>> for exynos5250") missed out handling the exynos5250 snow dts file.
>> >>>>>
>> >>>>> Signed-off-by : Abhilash Kesavan<a.kesavan@samsung.com>
>> >>>>>
>> >>>>> Signed-off-by: Yuvaraj Kumar C D<yuvaraj.cd@samsung.com>
>> >>>>> ---
>> >>>>>    arch/arm/boot/dts/cros5250-common.dtsi |    4 ----
>> >>>>>    arch/arm/boot/dts/exynos5250-snow.dts  |    9 +++++++++
>> >>>>>    2 files changed, 9 insertions(+), 4 deletions(-)
>> >>>>>
>> >>>>> diff --git a/arch/arm/boot/dts/cros5250-common.dtsi
>> >>>>> b/arch/arm/boot/dts/cros5250-common.dtsi
>> >>>>> index 6470536..1ceb62e 100644
>> >>>>> --- a/arch/arm/boot/dts/cros5250-common.dtsi
>> >>>>> +++ b/arch/arm/boot/dts/cros5250-common.dtsi
>> >>>>> @@ -247,10 +247,6 @@
>> >>>>>                   };
>> >>>>>           };
>> >>>>>
>> >>>>> -       mmc@12210000 {
>> >>>>> -               status = "disabled";
>> >>>>> -       };
>> >>>>> -
>> >>>>>           mmc@12220000 {
>> >>>>>                   num-slots =<1>;
>> >>>>>                   supports-highspeed;
>> >>>>> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts
>> >>>>> b/arch/arm/boot/dts/exynos5250-snow.dts
>> >>>>> index a9395c4..67484d1 100644
>> >>>>> --- a/arch/arm/boot/dts/exynos5250-snow.dts
>> >>>>> +++ b/arch/arm/boot/dts/exynos5250-snow.dts
>> >>>>> @@ -171,11 +171,20 @@
>> >>>>>                   };
>> >>>>>           };
>> >>>>>
>> >>>>> +       mmc@12200000 {
>> >>>>> +               status = "okay";
>> >>>>> +       };
>> >>>>> +
>> >>>>> +       mmc@12220000 {
>> >>>>> +               status = "okay";
>> >>>>> +       };
>> >>>>> +
>> >>>>
>> >>>>
>> >>>>
>> >>>> I probably would have put the 12200000 and 12220000 ones in
>> >>>> cros5250-common since that's where all of the other stuff relating to
>> >>>> those ports is.  Some of it may need to be moved around once we get
>> >>>> the HP Chromebook 11 (exynos5250-spring) in place, but until then it
>> >>>> seems best to keep it all together.
>> >>>>
>> >>>> -Doug
>> >>>
>> >>>
>> >>>
>> >>> OK, sounds better, I don't know well about the HP Chromebook though
> ;-)
>> >>
>> >>
>> >> This broke linux-next on snow ever since the original patch went in.
>> >> Please squash the above into the original patch or at the very least
>> >> apply it as soon as possible.
>> >>
>> > Oops, OK. I've applied this separately just now.
>>
>> Since you hadn't applied this to the branch you sent me, I now have an
>> arm-soc for-next branch that doesn't boot on Chromebooks.
>>
> Because 1st pull request already has been sent out to arm-soc when I picked
> this into samsung tree after your inform. So I couldn't.

Ah. A comment on the old pull request to give us a heads up would have
been useful.

>> I've picked up the above patch directly into arm-soc. Please drop it
>> from your branch.
>>
> You mean, I need to re-sort out my 2nd pull-request already sent out? IMHO,
> would be better to us if you could pull my 2nd pull-request and drop your
> picking up...

Ok, I'll look at doing that. It's unfortunate that it's broken across
a wider set of changes though, if we ever need to bisect across it for
some reason.


-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kim Kukjin Dec. 24, 2013, 3:12 a.m. UTC | #8
Olof Johansson wrote:
> 
> On Mon, Dec 23, 2013 at 5:26 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> > Olof Johansson wrote:
> >>
> >> On Wed, Dec 18, 2013 at 11:35 AM, Kukjin Kim <kgene.kim@samsung.com>
> > wrote:
> >> > On 12/19/13 03:38, Olof Johansson wrote:
> >> >>
> >> >> On Mon, Dec 9, 2013 at 12:56 PM, Kukjin Kim<kgene.kim@samsung.com>
> >> wrote:
> >> >>>
> >> >>> On 12/10/13 01:16, Doug Anderson wrote:
> >> >>>>
> >> >>>>
> >> >>>> Yuvaraj,
> >> >>>>
> >> >>>> On Sun, Dec 8, 2013 at 10:38 PM, Yuvaraj Kumar C
> >> D<yuvaraj.cd@gmail.com>
> >> >>>> wrote:
> >> >>>>>
> >> >>>>>
> >> >>>>> Commit 0c3de788 ("ARM: dts: change status property of dwmmc nodes
> >> >>>>> for exynos5250") missed out handling the exynos5250 snow dts
file.
> >> >>>>>
> >> >>>>> Signed-off-by : Abhilash Kesavan<a.kesavan@samsung.com>
> >> >>>>>
> >> >>>>> Signed-off-by: Yuvaraj Kumar C D<yuvaraj.cd@samsung.com>
> >> >>>>> ---
> >> >>>>>    arch/arm/boot/dts/cros5250-common.dtsi |    4 ----
> >> >>>>>    arch/arm/boot/dts/exynos5250-snow.dts  |    9 +++++++++
> >> >>>>>    2 files changed, 9 insertions(+), 4 deletions(-)
> >> >>>>>
> >> >>>>> diff --git a/arch/arm/boot/dts/cros5250-common.dtsi
> >> >>>>> b/arch/arm/boot/dts/cros5250-common.dtsi
> >> >>>>> index 6470536..1ceb62e 100644
> >> >>>>> --- a/arch/arm/boot/dts/cros5250-common.dtsi
> >> >>>>> +++ b/arch/arm/boot/dts/cros5250-common.dtsi
> >> >>>>> @@ -247,10 +247,6 @@
> >> >>>>>                   };
> >> >>>>>           };
> >> >>>>>
> >> >>>>> -       mmc@12210000 {
> >> >>>>> -               status = "disabled";
> >> >>>>> -       };
> >> >>>>> -
> >> >>>>>           mmc@12220000 {
> >> >>>>>                   num-slots =<1>;
> >> >>>>>                   supports-highspeed;
> >> >>>>> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts
> >> >>>>> b/arch/arm/boot/dts/exynos5250-snow.dts
> >> >>>>> index a9395c4..67484d1 100644
> >> >>>>> --- a/arch/arm/boot/dts/exynos5250-snow.dts
> >> >>>>> +++ b/arch/arm/boot/dts/exynos5250-snow.dts
> >> >>>>> @@ -171,11 +171,20 @@
> >> >>>>>                   };
> >> >>>>>           };
> >> >>>>>
> >> >>>>> +       mmc@12200000 {
> >> >>>>> +               status = "okay";
> >> >>>>> +       };
> >> >>>>> +
> >> >>>>> +       mmc@12220000 {
> >> >>>>> +               status = "okay";
> >> >>>>> +       };
> >> >>>>> +
> >> >>>>
> >> >>>>
> >> >>>>
> >> >>>> I probably would have put the 12200000 and 12220000 ones in
> >> >>>> cros5250-common since that's where all of the other stuff relating
> to
> >> >>>> those ports is.  Some of it may need to be moved around once we
> get
> >> >>>> the HP Chromebook 11 (exynos5250-spring) in place, but until then
> it
> >> >>>> seems best to keep it all together.
> >> >>>>
> >> >>>> -Doug
> >> >>>
> >> >>>
> >> >>>
> >> >>> OK, sounds better, I don't know well about the HP Chromebook though
> > ;-)
> >> >>
> >> >>
> >> >> This broke linux-next on snow ever since the original patch went in.
> >> >> Please squash the above into the original patch or at the very least
> >> >> apply it as soon as possible.
> >> >>
> >> > Oops, OK. I've applied this separately just now.
> >>
> >> Since you hadn't applied this to the branch you sent me, I now have an
> >> arm-soc for-next branch that doesn't boot on Chromebooks.
> >>
> > Because 1st pull request already has been sent out to arm-soc when I
> picked
> > this into samsung tree after your inform. So I couldn't.
> 
> Ah. A comment on the old pull request to give us a heads up would have
> been useful.
> 
You're right. OK, I will.

> >> I've picked up the above patch directly into arm-soc. Please drop it
> >> from your branch.
> >>
> > You mean, I need to re-sort out my 2nd pull-request already sent out?
> IMHO,
> > would be better to us if you could pull my 2nd pull-request and drop
> your
> > picking up...
> 
> Ok, I'll look at doing that. It's unfortunate that it's broken across
> a wider set of changes though, if we ever need to bisect across it for
> some reason.
> 
Agreed, I will look at my branch with more attention.

Thanks a lot.

- Kukjin

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi
index 6470536..1ceb62e 100644
--- a/arch/arm/boot/dts/cros5250-common.dtsi
+++ b/arch/arm/boot/dts/cros5250-common.dtsi
@@ -247,10 +247,6 @@ 
 		};
 	};
 
-	mmc@12210000 {
-		status = "disabled";
-	};
-
 	mmc@12220000 {
 		num-slots = <1>;
 		supports-highspeed;
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index a9395c4..67484d1 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -171,11 +171,20 @@ 
 		};
 	};
 
+	mmc@12200000 {
+		status = "okay";
+	};
+
+	mmc@12220000 {
+		status = "okay";
+	};
+
 	/*
 	 * On Snow we've got SIP WiFi and so can keep drive strengths low to
 	 * reduce EMI.
 	 */
 	mmc@12230000 {
+		status = "okay";
 		slot@0 {
 			pinctrl-names = "default";
 			pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;