Git pull request: ux500-core for the v2.6.38 merge window

Git pull request: ux500-core for the v2.6.38 merge window

[Linus Walleij]

Russell, could you please pull:

       git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
for-rmk

This is based on your devel branch due to the dependencies on the GIC
cleanup patches, as well as dependencies on some SMP consolidation
patches hitting platsmp.c. (I tried just taking the GIC stuff but failed
due to that, if you want me to take some special approach just tell me.)

If basing this on devel is unacceptable then please
pull this instead:

       git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
ux500-core

The branch include a number of MFD patches and one input patch
that we have agreed with Samiel Ortiz and Dmitry Torokhov to try to take
through this route in order to avoid cross-subsystem dependencies and
associated trouble. They all have their Acked-by.

All patches have been sent to the list for review.
All patches except the 2 input patches and the last 5 based off
devel in for-rmk have been tested for some time in Rothwell's
linux-next.

(This will affect the platform data for DMA in the patch tracker:
I will update that patch.)

Shortlog:

Carl-Johan Irekvist (1):
      ux500: fix uncompressor UART address for U5500

Jonas Aaberg (1):
      ux500: platsmp: Fix section mismatch

Linus Walleij (3):
      ux500: use _cansleep GPIO functions
      ux500: minor revision to the eMMC/SD config
      ux500: rename modem IRQ and MBOX files

Martin Persson (2):
      ux500: Add prcmu support for operating points
      ux500: Add cpufreq support for u8500

Mattias Wallin (2):
      ARM: ux500: prcmu db8500 v2 support
      mach-ux500: AB8500 irqs is taken from header file

Per Forlin (3):
      ux500: Call prmcu_init only for u8500
      ux500: Add eMMC support in U5500.
      ux500: Add DMA support for U5500

Rabin Vincent (12):
      ux500: mop500: add TC35892 and MicroSD slot support
      ux500: rework device registration
      nomadik-gpio: allow sleep mode dir/pull to differ from normal mode
      nomadik-gpio: use dev name if no name is specified
      ux500: rework gpio registration
      ux500: remove ambiguous irq macros
      ux500: fix 5500 PER6 clock rate
      ux500: remove build-time changing macros
      ux500: rename MOP board Kconfig
      ux500: dynamic SOC detection
      ux500: modem_irq is only for 5500
      ux500: allow 5500 and 8500 to be built together

Samuel Ortiz (1):
      mfd: Use dummy_irq_chip for tc3589x

Sundar Iyer (14):
      mach-ux500: explicit enable MTU TCR in the kernel
      mach-ux500: clean up checkpatch spits
      mach-ux500: deprecate spi support for ab8500
      mfd/tc35892: rename tc35892 header to tc3589x
      mfd/tc35892: rename tc35892 core driver to tc3589x
      mfd/tc3589x: rename tc35892 structs/registers to tc359x
      mfd/tc3589x: add block identifier for multiple child devices
      mfd/tc3589x: fix random interrupt misses
      mfd/tc3589x: undo gpio module reset during chip init
      mfd/tc3589x: add suspend/resume support
      mach-ux500: move keymaps to new file
      mach-ux500: add STMPE1601 platform data
      input/tc3589x: add tc3589x keypad support
      ux500: add TC35893 keypad platform data

Vincent Guittot (1):
      ux500: add debugfs support for powerdebug

Yours,
Linus Walleij

Git pull request: ux500-core for the v2.6.38 merge window

[Russell King - ARM Linux]

On Thu, Dec 23, 2010 at 08:48:26AM +0100, Linus Walleij wrote:
> Russell, could you please pull:
> 
>        git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
> for-rmk
> 
> This is based on your devel branch due to the dependencies on the GIC
> cleanup patches

Basing stuff on the devel branch really doesn't work, especially as I'm
still getting a trickle of acks and tested-by's for the clksrc stuff.
Of course, I could chose not to publish such stuff in my devel branch,
thereby preventing it appearing in linux-next until the last moment
before the merge window.  Or I could just not ask for acks etc...

> as well as dependencies on some SMP consolidation patches hitting
> platsmp.c.

Is it possible to split this stuff up into two topic branches - one set
which doesn't depend on my GIC and SMP changes, and then we'll see what
can be done about the remainder?

What I'm thinking is maybe if I merge the GIC and SMP changes together,
and provide you with that as a basis for your dependents?

First, I need to make absolutely sure that the GIC and SMP changes are
100% ready and up to date with acks etc.  I think there may be patches
at the top of the SMP branch which haven't been posted to the list yet
(or they have but have no acks.)

Git pull request: ux500-core for the v2.6.38 merge window

[David Brown]

Russell King - ARM Linux <linux@arm.linux.org.uk> writes:

> On Thu, Dec 23, 2010 at 08:48:26AM +0100, Linus Walleij wrote:

> First, I need to make absolutely sure that the GIC and SMP changes are
> 100% ready and up to date with acks etc.  I think there may be patches
> at the top of the SMP branch which haven't been posted to the list yet
> (or they have but have no acks.)

Jeff Ohlstein also posted some MSM SMP patches which also depend on the
SMP changes.  I haven't put them in linux-next yet because they depend
on your devel tree.

I was intending to wait until the merge window opens, and then base the
patches off of what does end up going into the merge window.

-- 
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

Git pull request: ux500-core for the v2.6.38 merge window

[Linus Walleij]

2010/12/23 Russell King - ARM Linux <linux@arm.linux.org.uk>:

> On Thu, Dec 23, 2010 at 08:48:26AM +0100, Linus Walleij wrote:
>> Russell, could you please pull:
>>
>> ? ? ? ?git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
>> for-rmk
>>
>> This is based on your devel branch due to the dependencies on the GIC
>> cleanup patches
>
> Basing stuff on the devel branch really doesn't work, especially as I'm
> still getting a trickle of acks and tested-by's for the clksrc stuff.

Yeah I was sort of thinking that...

> Of course, I could chose not to publish such stuff in my devel branch,
> thereby preventing it appearing in linux-next until the last moment
> before the merge window. ?Or I could just not ask for acks etc...

I think Rabin was writing these patches based on the -next tree,
not the devel branch directly.

> Is it possible to split this stuff up into two topic branches - one set
> which doesn't depend on my GIC and SMP changes, and then we'll see what
> can be done about the remainder?

Yes, as mentioned in the original post:
If basing this on devel is unacceptable then please
pull this instead:

      git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
ux500-core

This brings in everything except the 5 patches from Rabin
that require the GIC+SMP changes. I've frozen that tree
until you pull it.

> What I'm thinking is maybe if I merge the GIC and SMP changes together,
> and provide you with that as a basis for your dependents?

Perfect!

I will try to fix it ASAP if you prepare this, and if I fail I bet
Rabin will help me sort it out.

Yours,
Linus Walleij

Git pull request: ux500-core for the v2.6.38 merge window

[Russell King - ARM Linux]

On Wed, Dec 29, 2010 at 01:59:09AM +0100, Linus Walleij wrote:
> Yes, as mentioned in the original post:
> If basing this on devel is unacceptable then please
> pull this instead:
> 
>       git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
> ux500-core
> 
> This brings in everything except the 5 patches from Rabin
> that require the GIC+SMP changes. I've frozen that tree
> until you pull it.

And this is what I get.  As you didn't provide me with a diffstat, I
won't push this out until you've confirmed that the following diffstat
from the merge is correct in case there's a problem.

remote: Counting objects: 374, done.
remote: Compressing objects: 100% (152/152), done.
remote: Total 320 (delta 260), reused 212 (delta 155)
Receiving objects: 100% (320/320), 61.64 KiB, done.
Resolving deltas: 100% (260/260), completed with 48 local objects.

Git pull request: ux500-core for the v2.6.38 merge window

[Linus Walleij]

2011/1/3 Russell King - ARM Linux <linux@arm.linux.org.uk>:
> On Wed, Dec 29, 2010 at 01:59:09AM +0100, Linus Walleij wrote:
>>
>> This brings in everything except the 5 patches from Rabin
>> that require the GIC+SMP changes. I've frozen that tree
>> until you pull it.
>
> And this is what I get. ?As you didn't provide me with a diffstat, I
> won't push this out until you've confirmed that the following diffstat
> from the merge is correct in case there's a problem.

This looks correct and corresponds to what's been pending in
the -next tree, thanks Russell.

Yours,
Linus Walleij