Merge plans for 2.6.33 merge window

Merge plans for 2.6.33 merge window

[Tony Lindgren]

Hi all,

As 2.6.32 is out, I'm planning to send Linus a pull request
for the code we have currently in for-next. That's already
a huge pile of code with the 7xx merge, header move, and
ioremap changes, pm etc:

Then I'll pile up another set of changes for next week
for a second round.

We should try to get in the clock framework changes,
especially clock framework for omap4. And the new mux
framework. Then there are some new board files, like
touchbook and various fixes.

Just FYI in case you're wondering why I'm not merging
recently posted code right now.

Regards,

Tony

RE: Merge plans for 2.6.33 merge window

[Pandita, Vikram]

Tony

>-----Original Message-----
>From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Tony
>Lindgren
>Sent: Thursday, December 03, 2009 11:36 AM
>To: linux-omap@vger.kernel.org
>Subject: Merge plans for 2.6.33 merge window
>
>Hi all,
<snip>
>Then there are some new board files, like
>touchbook and various fixes.

3630 board support (zoom3/sdp3630) is already integrated in for-next.
However the only pending patches missing for 3630 boards to boot are these serial patches:
	http://patchwork.kernel.org/patch/61671/
	http://patchwork.kernel.org/patch/61672/

Now there has been much discussion on the approach (errata vs feature).
As a moderator, how would you like us to proceed on this?

Regards,
Vikram

Re: Merge plans for 2.6.33 merge window

[Tony Lindgren]

* Pandita, Vikram <vikram.pandita@ti.com> [091203 10:27]:
> Tony
> 
> >-----Original Message-----
> >From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Tony
> >Lindgren
> >Sent: Thursday, December 03, 2009 11:36 AM
> >To: linux-omap@vger.kernel.org
> >Subject: Merge plans for 2.6.33 merge window
> >
> >Hi all,
> <snip>
> >Then there are some new board files, like
> >touchbook and various fixes.
> 
> 3630 board support (zoom3/sdp3630) is already integrated in for-next.
> However the only pending patches missing for 3630 boards to boot are these serial patches:
> 	http://patchwork.kernel.org/patch/61671/
> 	http://patchwork.kernel.org/patch/61672/
> 
> Now there has been much discussion on the approach (errata vs feature).
> As a moderator, how would you like us to proceed on this?

The best solution way would be to check the revision register for the
serial module if available and then initialize the serial port
accordinly.

If this feature cannot be checked in the serial module, and is only
needed during the serial init, you might as well implement the test
in arch/arm/mach-omap2/serial.c. So probably no need to add that to
id.c.

Regards,

Tony

RE: Merge plans for 2.6.33 merge window

[Pandita, Vikram]

>-----Original Message-----
>From: Tony Lindgren [mailto:tony@atomide.com]
>Sent: Thursday, December 03, 2009 12:45 PM
>To: Pandita, Vikram
>Cc: linux-omap@vger.kernel.org
>Subject: Re: Merge plans for 2.6.33 merge window
>
>* Pandita, Vikram <vikram.pandita@ti.com> [091203 10:27]:
>> Tony
>>
>> >-----Original Message-----
>> >From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Tony
>> >Lindgren
>> >Sent: Thursday, December 03, 2009 11:36 AM
>> >To: linux-omap@vger.kernel.org
>> >Subject: Merge plans for 2.6.33 merge window
>> >
>> >Hi all,
>> <snip>
>> >Then there are some new board files, like
>> >touchbook and various fixes.
>>
>> 3630 board support (zoom3/sdp3630) is already integrated in for-next.
>> However the only pending patches missing for 3630 boards to boot are these serial patches:
>> 	http://patchwork.kernel.org/patch/61671/
>> 	http://patchwork.kernel.org/patch/61672/
>>
>> Now there has been much discussion on the approach (errata vs feature).
>> As a moderator, how would you like us to proceed on this?
>
>The best solution way would be to check the revision register for the
>serial module if available and then initialize the serial port
>accordinly.
>
>If this feature cannot be checked in the serial module, and is only
>needed during the serial init, you might as well implement the test
>in arch/arm/mach-omap2/serial.c. So probably no need to add that to
>id.c.

Looking into this aspect to override the serial_in() function based on IP version check in mach-omap2/serial.c file.


>
>Regards,
>
>Tony

Re: Merge plans for 2.6.33 merge window

[Cory Maccarrone]

On Thu, Dec 3, 2009 at 9:36 AM, Tony Lindgren <tony@atomide.com> wrote:
> Hi all,
>
> As 2.6.32 is out, I'm planning to send Linus a pull request
> for the code we have currently in for-next. That's already
> a huge pile of code with the 7xx merge, header move, and
> ioremap changes, pm etc:
>
> Then I'll pile up another set of changes for next week
> for a second round.
>
> We should try to get in the clock framework changes,
> especially clock framework for omap4. And the new mux
> framework. Then there are some new board files, like
> touchbook and various fixes.
>
> Just FYI in case you're wondering why I'm not merging
> recently posted code right now.
>

Any chance of getting the HTC Herald USB patches I submitted a little
bit ago in?

Thanks
- Cory

Re: Merge plans for 2.6.33 merge window

[Tony Lindgren]

* Cory Maccarrone <darkstar6262@gmail.com> [091203 14:08]:
> On Thu, Dec 3, 2009 at 9:36 AM, Tony Lindgren <tony@atomide.com> wrote:
> > Hi all,
> >
> > As 2.6.32 is out, I'm planning to send Linus a pull request
> > for the code we have currently in for-next. That's already
> > a huge pile of code with the 7xx merge, header move, and
> > ioremap changes, pm etc:
> >
> > Then I'll pile up another set of changes for next week
> > for a second round.
> >
> > We should try to get in the clock framework changes,
> > especially clock framework for omap4. And the new mux
> > framework. Then there are some new board files, like
> > touchbook and various fixes.
> >
> > Just FYI in case you're wondering why I'm not merging
> > recently posted code right now.
> >
> 
> Any chance of getting the HTC Herald USB patches I submitted a little
> bit ago in?

Yeah as far as I remember those look OK to me.

Regards,

Tony