mbox

[GIT,PULL] ARM: mvebu: DT fixes for v3.14

Message ID 20140218161102.GT7862@titan.lakedaemon.net
State New
Headers show

Pull-request

git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-fixes-3.14

Message

Jason Cooper Feb. 18, 2014, 4:11 p.m. UTC
All,

I've been sitting on the missing alias for a while waiting for more DT
fixes to show up.  Well, finally one did. :(

Please pull for v3.14.

I intend to re-add the dove PMU node once I know for certain the
corresponding driver is going in to v3.15 (pull request already sent).

thx,

Jason.

The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:

  Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)

are available in the git repository at:

  git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-fixes-3.14

for you to fetch changes up to ae10f8329f9b22d650aa12307b260eba2bc0c571:

  ARM: dove: dt: revert PMU interrupt controller node (2014-02-18 16:01:27 +0000)

----------------------------------------------------------------
mvebu dt fixes for v3.14

 - mvebu: add missing 'eth3' alias for mv78260

 - dove: revert PMU interrupt controller node, wait for driver to land.

----------------------------------------------------------------
Jason Cooper (1):
      ARM: dove: dt: revert PMU interrupt controller node

Willy Tarreau (1):
      ARM: mvebu: dt: add missing alias 'eth3' on Armada XP mv78260

 arch/arm/boot/dts/armada-xp-mv78260.dtsi |  3 ++-
 arch/arm/boot/dts/dove.dtsi              | 11 -----------
 2 files changed, 2 insertions(+), 12 deletions(-)

Comments

Olof Johansson Feb. 19, 2014, 12:24 a.m. UTC | #1
On Tue, Feb 18, 2014 at 11:11:02AM -0500, Jason Cooper wrote:
> All,
> 
> I've been sitting on the missing alias for a while waiting for more DT
> fixes to show up.  Well, finally one did. :(
> 
> Please pull for v3.14.
> 
> I intend to re-add the dove PMU node once I know for certain the
> corresponding driver is going in to v3.15 (pull request already sent).

I've pulled this, but:

> Jason Cooper (1):
>       ARM: dove: dt: revert PMU interrupt controller node

Hmm. Seems like my dove machine (cubox) still booted. This does fix the
boot time warning though.


-Olof
Jason Cooper Feb. 19, 2014, 3:43 p.m. UTC | #2
On Tue, Feb 18, 2014 at 04:24:46PM -0800, Olof Johansson wrote:
> On Tue, Feb 18, 2014 at 11:11:02AM -0500, Jason Cooper wrote:
> > All,
> > 
> > I've been sitting on the missing alias for a while waiting for more DT
> > fixes to show up.  Well, finally one did. :(
> > 
> > Please pull for v3.14.
> > 
> > I intend to re-add the dove PMU node once I know for certain the
> > corresponding driver is going in to v3.15 (pull request already sent).
> 
> I've pulled this, but:
> 
> > Jason Cooper (1):
> >       ARM: dove: dt: revert PMU interrupt controller node
> 
> Hmm. Seems like my dove machine (cubox) still booted. This does fix the
> boot time warning though.

ok, this was a compound error on my part.  The reported WARN_ON kernel
logs stopped after the WARN_ON output.  I assumed the board hung at that
point.  Second, I've been too focused on the d*mn phy failures in the
bootfarm I haven't even looked at the cubox booting successfully.

At any rate, it does remove the warning for v3.14, and the driver is
slated for v3.15, So I'll re-add the node for v3.15.

Unfortunately, this creates a dependency on mvebu/dt-fixes by mvebu/dt.
Or, I could just add the node to fixes-non-critical for v3.15 to avoid
the dependency.  Which do you prefer?

thx,

Jason.
Olof Johansson Feb. 19, 2014, 4:25 p.m. UTC | #3
On Wed, Feb 19, 2014 at 7:43 AM, Jason Cooper <jason@lakedaemon.net> wrote:
> On Tue, Feb 18, 2014 at 04:24:46PM -0800, Olof Johansson wrote:
>> On Tue, Feb 18, 2014 at 11:11:02AM -0500, Jason Cooper wrote:
>> > All,
>> >
>> > I've been sitting on the missing alias for a while waiting for more DT
>> > fixes to show up.  Well, finally one did. :(
>> >
>> > Please pull for v3.14.
>> >
>> > I intend to re-add the dove PMU node once I know for certain the
>> > corresponding driver is going in to v3.15 (pull request already sent).
>>
>> I've pulled this, but:
>>
>> > Jason Cooper (1):
>> >       ARM: dove: dt: revert PMU interrupt controller node
>>
>> Hmm. Seems like my dove machine (cubox) still booted. This does fix the
>> boot time warning though.
>
> ok, this was a compound error on my part.  The reported WARN_ON kernel
> logs stopped after the WARN_ON output.  I assumed the board hung at that
> point.  Second, I've been too focused on the d*mn phy failures in the
> bootfarm I haven't even looked at the cubox booting successfully.

No worries.

> At any rate, it does remove the warning for v3.14, and the driver is
> slated for v3.15, So I'll re-add the node for v3.15.
>
> Unfortunately, this creates a dependency on mvebu/dt-fixes by mvebu/dt.
> Or, I could just add the node to fixes-non-critical for v3.15 to avoid
> the dependency.  Which do you prefer?

Just base mvebu/dt on top of dt-fixes, alternatively merge dt-fixes
into dt before you have to apply the conflicting patches -- that
should take care of it. Or am I missing something here?


-Olof
Jason Cooper Feb. 19, 2014, 6:01 p.m. UTC | #4
On Wed, Feb 19, 2014 at 08:25:15AM -0800, Olof Johansson wrote:
> On Wed, Feb 19, 2014 at 7:43 AM, Jason Cooper <jason@lakedaemon.net> wrote:
...
> > At any rate, it does remove the warning for v3.14, and the driver is
> > slated for v3.15, So I'll re-add the node for v3.15.
> >
> > Unfortunately, this creates a dependency on mvebu/dt-fixes by mvebu/dt.
> > Or, I could just add the node to fixes-non-critical for v3.15 to avoid
> > the dependency.  Which do you prefer?
> 
> Just base mvebu/dt on top of dt-fixes, alternatively merge dt-fixes
> into dt before you have to apply the conflicting patches -- that
> should take care of it. Or am I missing something here?

Nope, I've just gotten really good at avoiding dependencies if I can. :)

thx,

Jason.