diff mbox

[v5,01/10] ARM: dts: Fix MMC pinctrl for exynos5250-snow

Message ID 1406868897-26874-2-git-send-email-afaerber@suse.de
State New
Headers show

Commit Message

Andreas Färber Aug. 1, 2014, 4:54 a.m. UTC 
The pinctrl properties should be on the device directly and not on the
slot sub-node.

Reported-by: Doug Anderson <dianders@chromium.org>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 v3 -> v4 -> v5: Unchanged
 
 v3: New (Doug Anderson)
 Redundant with Jaehoon Chung's general slot@0 deprecation,
 in case that hits the tree earlier.

 arch/arm/boot/dts/exynos5250-snow.dts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Doug Anderson Aug. 1, 2014, 4:26 p.m. UTC | #1 
Hi,

On Thu, Jul 31, 2014 at 9:54 PM, Andreas Färber <afaerber@suse.de> wrote:
> The pinctrl properties should be on the device directly and not on the
> slot sub-node.
>
> Reported-by: Doug Anderson <dianders@chromium.org>
> Cc: Jaehoon Chung <jh80.chung@samsung.com>
> Reviewed-by: Tomasz Figa <t.figa@samsung.com>
> Signed-off-by: Andreas Färber <afaerber@suse.de>

Let's land this one before Jaehoon's, since it was a hidden
functionality change in his patch.  It will be an easy conflict to
resolve when his patch is applied.

Reviewed-by: Doug Anderson <dianders@chromium.org>
Kukjin Kim Aug. 18, 2014, 6:37 p.m. UTC | #2 
On 08/01/14 11:26, Doug Anderson wrote:
> Hi,
>
Hi,

> On Thu, Jul 31, 2014 at 9:54 PM, Andreas Färber<afaerber@suse.de>  wrote:
>> The pinctrl properties should be on the device directly and not on the
>> slot sub-node.
>>
>> Reported-by: Doug Anderson<dianders@chromium.org>
>> Cc: Jaehoon Chung<jh80.chung@samsung.com>
>> Reviewed-by: Tomasz Figa<t.figa@samsung.com>
>> Signed-off-by: Andreas Färber<afaerber@suse.de>
>
> Let's land this one before Jaehoon's, since it was a hidden
> functionality change in his patch.  It will be an easy conflict to
> resolve when his patch is applied.
>
Sounds good to me, I've applied this before Jaehoon's change.

> Reviewed-by: Doug Anderson<dianders@chromium.org>

Thanks,
Kukjin
Tomasz Figa Aug. 18, 2014, 6:48 p.m. UTC | #3 
Hi Kukjin,

On 18.08.2014 20:37, Kukjin Kim wrote:
> On 08/01/14 11:26, Doug Anderson wrote:
>> Hi,
>>
> Hi,
> 
>> On Thu, Jul 31, 2014 at 9:54 PM, Andreas Färber<afaerber@suse.de>  wrote:
>>> The pinctrl properties should be on the device directly and not on the
>>> slot sub-node.
>>>
>>> Reported-by: Doug Anderson<dianders@chromium.org>
>>> Cc: Jaehoon Chung<jh80.chung@samsung.com>
>>> Reviewed-by: Tomasz Figa<t.figa@samsung.com>
>>> Signed-off-by: Andreas Färber<afaerber@suse.de>
>>
>> Let's land this one before Jaehoon's, since it was a hidden
>> functionality change in his patch.  It will be an easy conflict to
>> resolve when his patch is applied.
>>
> Sounds good to me, I've applied this before Jaehoon's change.
> 
>> Reviewed-by: Doug Anderson<dianders@chromium.org>

Version 6 of this series has been already posted. However this
particular patch has not changed, so it's fine.

Best regards,
Tomasz
Kukjin Kim Aug. 18, 2014, 8:03 p.m. UTC | #4 
On 08/18/14 13:48, Tomasz Figa wrote:
> Hi Kukjin,
>
Hi,

> On 18.08.2014 20:37, Kukjin Kim wrote:
>> On 08/01/14 11:26, Doug Anderson wrote:
>>> Hi,
>>>
>> Hi,
>>
>>> On Thu, Jul 31, 2014 at 9:54 PM, Andreas Färber<afaerber@suse.de>   wrote:
>>>> The pinctrl properties should be on the device directly and not on the
>>>> slot sub-node.
>>>>
>>>> Reported-by: Doug Anderson<dianders@chromium.org>
>>>> Cc: Jaehoon Chung<jh80.chung@samsung.com>
>>>> Reviewed-by: Tomasz Figa<t.figa@samsung.com>
>>>> Signed-off-by: Andreas Färber<afaerber@suse.de>
>>>
>>> Let's land this one before Jaehoon's, since it was a hidden
>>> functionality change in his patch.  It will be an easy conflict to
>>> resolve when his patch is applied.
>>>
>> Sounds good to me, I've applied this before Jaehoon's change.
>>
>>> Reviewed-by: Doug Anderson<dianders@chromium.org>
>
> Version 6 of this series has been already posted. However this
> particular patch has not changed, so it's fine.
>
Oh, got it. Hope this and 2nd should be same with version 6 ;)

Thanks.

- Kukjin
Andreas Färber Aug. 18, 2014, 8:13 p.m. UTC | #5 
Hi,

Am 18.08.2014 22:03, schrieb Kukjin Kim:
> On 08/18/14 13:48, Tomasz Figa wrote:
>> On 18.08.2014 20:37, Kukjin Kim wrote:
>>> On 08/01/14 11:26, Doug Anderson wrote:
>>>> On Thu, Jul 31, 2014 at 9:54 PM, Andreas Färber<afaerber@suse.de>  
>>>> wrote:
>>>>> The pinctrl properties should be on the device directly and not on the
>>>>> slot sub-node.
>>>>>
>>>>> Reported-by: Doug Anderson<dianders@chromium.org>
>>>>> Cc: Jaehoon Chung<jh80.chung@samsung.com>
>>>>> Reviewed-by: Tomasz Figa<t.figa@samsung.com>
>>>>> Signed-off-by: Andreas Färber<afaerber@suse.de>
>>>>
>>>> Let's land this one before Jaehoon's, since it was a hidden
>>>> functionality change in his patch.  It will be an easy conflict to
>>>> resolve when his patch is applied.
>>>>
>>> Sounds good to me, I've applied this before Jaehoon's change.
>>>
>>>> Reviewed-by: Doug Anderson<dianders@chromium.org>
>>
>> Version 6 of this series has been already posted. However this
>> particular patch has not changed, so it's fine.
>>
> Oh, got it. Hope this and 2nd should be same with version 6 ;)

It is documented as such. :) Others did have changes, of course.

I've started looking into rebasing myself: beware that the smdk5250
cleanup has an additional conflict in the spi node (cs-gpios movement).

http://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/commit/arch/arm/boot/dts/exynos5250-smdk5250.dts?h=v3.18-next/dt-samsung&id=e138d4333aa02a3daa12c04192bc5c842bffee74

Thanks,
Andreas
diff mbox

Patch

diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index f2b8c4116541..eb437f6afec1 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -240,10 +240,8 @@ 
 	 */
 	mmc@12230000 {
 		status = "okay";
-		slot@0 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
-		};
+		pinctrl-names = "default";
+		pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;
 	};
 
 	i2c@12CD0000 {