mbox

[GIT,PULL] Integrator SoC bus patches

Message ID CACRpkdYKWLMMOa7+CV8yMNe5-EV1p5fYeVJ+bn55KLLFBZdD=A@mail.gmail.com
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git

Message

Linus Walleij Nov. 16, 2012, 10:51 p.m. UTC
Hi ARM SoC guys,

could you please pull this Integrator patch set as previously circulated
on the list, targetting the v3.8 merge window? The details are in the
tag.

Please pull it in!

Yours,
Linus Walleij


The following changes since commit 6f0c0580b70c89094b3422ba81118c7b959c7556:

  Linux 3.7-rc2 (2012-10-20 12:11:32 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git
tags/integrator-socbus

for you to fetch changes up to 328ba305e3871d4256398a80f45517ec9c814999:

  ARM: integrator: delete static UART1 mapping (2012-11-16 22:26:26 +0100)

----------------------------------------------------------------
This series will do the following:
- Switch the Integrator/AP and /CP to use the SoC bus
  when booting from device tree.
- Group all devices on the SoC below this bus so as to
  set a good example of how to do this. The bus was
  invented by Lee Jones, let's show how it's to be used
  on a DT:ed SoC.
- Fetch the special system controller offsets from two
  special device tree nodes for each case and replace
  the static mappings with these at boot.
- Move some static remaps to the ATAG-only code path
  and delete some static maps that aren't used.

----------------------------------------------------------------
Linus Walleij (6):
      ARM: integrator: hook the AP into the SoC bus
      ARM: integrator: hook the CP into the SoC bus
      ARM: integrator: remove static AP syscon mapping
      ARM: integrator: remove static CP syscon mapping
      ARM: integrator: delete SC mapping on the CP
      ARM: integrator: delete static UART1 mapping

 Documentation/devicetree/bindings/arm/arm-boards |   4 +
 arch/arm/boot/dts/integratorap.dts               |   5 +
 arch/arm/boot/dts/integratorcp.dts               |   5 +
 arch/arm/mach-integrator/Kconfig                 |   2 +
 arch/arm/mach-integrator/common.h                |   1 +
 arch/arm/mach-integrator/core.c                  |  91 ++++++++++++++++++
 arch/arm/mach-integrator/integrator_ap.c         | 114 ++++++++++++++++++-----
 arch/arm/mach-integrator/integrator_cp.c         | 111 ++++++++++++++++------
 8 files changed, 283 insertions(+), 50 deletions(-)

Comments

Linus Walleij Nov. 17, 2012, 6:43 p.m. UTC | #1
On Fri, Nov 16, 2012 at 11:51 PM, Linus Walleij
<linus.walleij@linaro.org> wrote:

> Hi ARM SoC guys,
>
> could you please pull this Integrator patch set as previously circulated
> on the list, targetting the v3.8 merge window? The details are in the
> tag.

Bah since another Integrator patch just appeared and I made another
patch myself tonight, let me iterate this request including both these
patches as well...

Yours,
Linus Walleij
Arnd Bergmann Nov. 26, 2012, 6:42 p.m. UTC | #2
On Friday 16 November 2012, Linus Walleij wrote:
> could you please pull this Integrator patch set as previously circulated
> on the list, targetting the v3.8 merge window? The details are in the
> tag.
> 
> Please pull it in!
> 
> Yours,
> Linus Walleij
> 
> 
> The following changes since commit 6f0c0580b70c89094b3422ba81118c7b959c7556:
> 
>   Linux 3.7-rc2 (2012-10-20 12:11:32 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git
> tags/integrator-socbus

I'm going through my list of old pull requests to see if anything got
missed. I don't see this one in arm-soc, and the tag doesn't seem to 
be there in your kernel.org tree at this point. If this is something
that should be merged in 3.8, please send another pull request with
a working tag.

I remember having looked at the patches and I'm pretty sure they were
all good to go in, so I have no idea what went wrong here.

	Arnd
Linus Walleij Nov. 26, 2012, 7:10 p.m. UTC | #3
On Mon, Nov 26, 2012 at 7:42 PM, Arnd Bergmann <arnd@arndb.de> wrote:

>>   git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git
>> tags/integrator-socbus
>
> I'm going through my list of old pull requests to see if anything got
> missed. I don't see this one in arm-soc, and the tag doesn't seem to
> be there in your kernel.org tree at this point. If this is something
> that should be merged in 3.8, please send another pull request with
> a working tag.

It was reiterated as tags/integrator-for-arm-soc

I'll send a fresh pull request mail.

> I remember having looked at the patches and I'm pretty sure they were
> all good to go in, so I have no idea what went wrong here.

Slipped between chairs, no big deal.

Yours,
Linus Walleij