diff mbox

[U-Boot] ARM: dts: OLinuXino Lime2 eMMC dts sync

Message ID 20170504090031.8126-1-oliver@schinagl.nl
State Superseded
Delegated to: Jagannadha Sutradharudu Teki
Headers show

Commit Message

Olliver Schinagl May 4, 2017, 9 a.m. UTC
Sync the sun7i-a20-olinuxino-lime2-emmc.dts with the upstream kernel,
which fixes the power-sequencing pin being wrongfully set up.

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
---
 arch/arm/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

Maxime Ripard May 4, 2017, 9:43 a.m. UTC | #1
Hi,

On Thu, May 04, 2017 at 11:00:31AM +0200, Olliver Schinagl wrote:
> Sync the sun7i-a20-olinuxino-lime2-emmc.dts with the upstream kernel,
> which fixes the power-sequencing pin being wrongfully set up.

You have a dependency between two patches. The usual way to deal with
that is to create a serie of patches so that they all work. Or at
least mentionning it.

And you should also explain what was wrongfully set up. There's
nothing obvious from the patch below.

Maxime
Olliver Schinagl May 4, 2017, 9:51 a.m. UTC | #2
Hey Maxime,

On 04-05-17 11:43, Maxime Ripard wrote:
> Hi,
>
> On Thu, May 04, 2017 at 11:00:31AM +0200, Olliver Schinagl wrote:
>> Sync the sun7i-a20-olinuxino-lime2-emmc.dts with the upstream kernel,
>> which fixes the power-sequencing pin being wrongfully set up.
>
> You have a dependency between two patches. The usual way to deal with
> that is to create a serie of patches so that they all work. Or at
> least mentionning it.
Well, I do not have a dependancy per-say. The dts was al ready there. 
The problem is some people have reported problems with the power 
sequencing sometimes not working properly for them.
>
> And you should also explain what was wrongfully set up. There's
> nothing obvious from the patch below.
You are right, it was just a sync from the upstream dt.

Which is why I asked, how do we normally handle it, just copy/paste and 
make a patch was the answer there.

I think we need a better system as to keeping the device tree's in sync, 
if we want both to use the same device-tree, right?

I'll re-submit the patch as a 'cherry-pick' from linux to make it clear-er.

olliver

>
> Maxime
>
Maxime Ripard May 4, 2017, 12:06 p.m. UTC | #3
On Thu, May 04, 2017 at 11:51:19AM +0200, Olliver Schinagl wrote:
> Hey Maxime,
> 
> On 04-05-17 11:43, Maxime Ripard wrote:
> > Hi,
> > 
> > On Thu, May 04, 2017 at 11:00:31AM +0200, Olliver Schinagl wrote:
> > > Sync the sun7i-a20-olinuxino-lime2-emmc.dts with the upstream kernel,
> > > which fixes the power-sequencing pin being wrongfully set up.
> > 
> > You have a dependency between two patches. The usual way to deal with
> > that is to create a serie of patches so that they all work. Or at
> > least mentionning it.
>
> Well, I do not have a dependancy per-say. The dts was al ready there. The
> problem is some people have reported problems with the power sequencing
> sometimes not working properly for them.

You said in your note that it wasn't working properly without that
patch. That definitely looks like a dependency to me.

> > And you should also explain what was wrongfully set up. There's
> > nothing obvious from the patch below.
>
> You are right, it was just a sync from the upstream dt.

It wasn't "just a sync" if it was fixing an issue.

> Which is why I asked, how do we normally handle it, just copy/paste and make
> a patch was the answer there.
> 
> I think we need a better system as to keeping the device tree's in sync, if
> we want both to use the same device-tree, right?

This one works just fine. You just have to describe properly what
you're doing in your commit log.

Maxime
diff mbox

Patch

diff --git a/arch/arm/dts/sun7i-a20-olinuxino-lime2-emmc.dts b/arch/arm/dts/sun7i-a20-olinuxino-lime2-emmc.dts
index 5ea4915f6d..81f376f2a4 100644
--- a/arch/arm/dts/sun7i-a20-olinuxino-lime2-emmc.dts
+++ b/arch/arm/dts/sun7i-a20-olinuxino-lime2-emmc.dts
@@ -56,11 +56,9 @@ 
 };
 
 &pio {
-	mmc2_pins_nrst: mmc2@0 {
-		allwinner,pins = "PC16";
-		allwinner,function = "gpio_out";
-		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+	mmc2_pins_nrst: mmc2-rst-pin {
+		pins = "PC16";
+		function = "gpio_out";
 	};
 };