Subject: [GIT PULL] ARM: OMAP2+: hwmod data: cleanup in preparation for link array removal

From: [email-masked] (Tony Lindgren)
Date: Thu, 8 Mar 2012 18:16:33 -0800

* Paul Walmsley <[email-masked]> [120308 18:07]:
> Hi
> 
> on second thought...
> 
> On Thu, 8 Mar 2012, Paul Walmsley wrote:
> 
> > On Thu, 8 Mar 2012, Tony Lindgren wrote:
> > 
> > > Got these now merged into l-o master, but ran into a merge
> > > conflict with already queued sr branch. Resolved it by using
> > > your version except left out vdd_name.
> > 
> > Definitely we want the vdd_name fields.  Other than that it looks okay.  
> 
> I guess that other SR series that you merged removed the vdd_name fields?

So it seems, commit cea6b942124683305280962969599fed36f0ea7e. Then
the interrupts we added there for smartreflex it seems.
 
> If so then yeah, we'd better leave those out.
> 
> This means that I'm going to have to rebase those big hwmod data changes 
> :-(
> 
> Can you send me a stable commit for that?

Bummer :( What we already have queued is the sr branch at commit
bb887688bccb48d94fa873f0f6cc7e7e3e4dc05e.

Regards,

Tony