Git pull request: ARM LPC32XX architecture

Git pull request: ARM LPC32XX architecture

[Kevin Wells]

Hi Russell, please pull the reviewed LPC32xx arch files from the
Pengutronix GIT server at:

	git://git.pengutronix.de/git/ukl/linux-2.6.git wells/lpc32xx

This adds support for the ARM: LPC32xx architecture.

Kevin Wells (11):
     ARM: LPC32XX: Initial arch header files
     ARM: LPC32XX: Debug and IRQ macros
     ARM: LPC32XX: Clock driver
     ARM: LPC32XX: GPIO, timer, and IRQ drivers
     ARM: LPC32XX: System suspend support
     ARM: LPC32XX: Serial support code
     ARM: LPC32XX: Misc support functions
     ARM: LPC32XX: Phytec 3250 platform support
     ARM: LPC32XX: Arch config menu supoport and makefiles
     ARM: LPC32XX: Default PHY3250 kernel config (ramdisk)
     ARM: Add support for the LPC32XX arch

arch/arm/Kconfig                                 |   15 +
arch/arm/Makefile                                |    1 +
arch/arm/configs/phy3250_defconfig               | 1099 +++++++++++++++++++++
arch/arm/mach-lpc32xx/Kconfig                    |   33 +
arch/arm/mach-lpc32xx/Makefile                   |    8 +
arch/arm/mach-lpc32xx/Makefile.boot              |    4 +
arch/arm/mach-lpc32xx/clock.c                    | 1137 ++++++++++++++++++++++
arch/arm/mach-lpc32xx/clock.h                    |   38 +
arch/arm/mach-lpc32xx/common.c                   |  271 +++++
arch/arm/mach-lpc32xx/common.h                   |   73 ++
arch/arm/mach-lpc32xx/gpiolib.c                  |  446 +++++++++
arch/arm/mach-lpc32xx/include/mach/clkdev.h      |   25 +
arch/arm/mach-lpc32xx/include/mach/debug-macro.S |   31 +
arch/arm/mach-lpc32xx/include/mach/entry-macro.S |   47 +
arch/arm/mach-lpc32xx/include/mach/gpio.h        |   74 ++
arch/arm/mach-lpc32xx/include/mach/hardware.h    |   34 +
arch/arm/mach-lpc32xx/include/mach/i2c.h         |   63 ++
arch/arm/mach-lpc32xx/include/mach/io.h          |   27 +
arch/arm/mach-lpc32xx/include/mach/irqs.h        |  117 +++
arch/arm/mach-lpc32xx/include/mach/memory.h      |   27 +
arch/arm/mach-lpc32xx/include/mach/platform.h    |  694 ++++++++++++
arch/arm/mach-lpc32xx/include/mach/system.h      | 2 +
arch/arm/mach-lpc32xx/include/mach/timex.h       |   28 +
arch/arm/mach-lpc32xx/include/mach/uncompress.h  |   60 ++
arch/arm/mach-lpc32xx/include/mach/vmalloc.h     |   24 +
arch/arm/mach-lpc32xx/irq.c                      |  432 ++++++++
arch/arm/mach-lpc32xx/phy3250.c                  |  397 ++++++++
arch/arm/mach-lpc32xx/pm.c                       |  145 +++
arch/arm/mach-lpc32xx/serial.c                   |  190 ++++
arch/arm/mach-lpc32xx/suspend.S                  |  151 +++
arch/arm/mach-lpc32xx/timer.c                    |  182 ++++
31 files changed, 5925 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/configs/phy3250_defconfig
create mode 100644 arch/arm/mach-lpc32xx/Kconfig
create mode 100644 arch/arm/mach-lpc32xx/Makefile
create mode 100644 arch/arm/mach-lpc32xx/Makefile.boot
create mode 100644 arch/arm/mach-lpc32xx/clock.c
create mode 100644 arch/arm/mach-lpc32xx/clock.h
create mode 100644 arch/arm/mach-lpc32xx/common.c
create mode 100644 arch/arm/mach-lpc32xx/common.h
create mode 100644 arch/arm/mach-lpc32xx/gpiolib.c
create mode 100644 arch/arm/mach-lpc32xx/include/mach/clkdev.h
create mode 100644 arch/arm/mach-lpc32xx/include/mach/debug-macro.S
create mode 100644 arch/arm/mach-lpc32xx/include/mach/entry-macro.S
create mode 100644 arch/arm/mach-lpc32xx/include/mach/gpio.h
create mode 100644 arch/arm/mach-lpc32xx/include/mach/hardware.h
create mode 100644 arch/arm/mach-lpc32xx/include/mach/i2c.h
create mode 100644 arch/arm/mach-lpc32xx/include/mach/io.h
create mode 100644 arch/arm/mach-lpc32xx/include/mach/irqs.h
create mode 100644 arch/arm/mach-lpc32xx/include/mach/memory.h
create mode 100644 arch/arm/mach-lpc32xx/include/mach/platform.h
create mode 100644 arch/arm/mach-lpc32xx/include/mach/system.h
create mode 100644 arch/arm/mach-lpc32xx/include/mach/timex.h
create mode 100644 arch/arm/mach-lpc32xx/include/mach/uncompress.h
create mode 100644 arch/arm/mach-lpc32xx/include/mach/vmalloc.h
create mode 100644 arch/arm/mach-lpc32xx/irq.c
create mode 100644 arch/arm/mach-lpc32xx/phy3250.c
create mode 100644 arch/arm/mach-lpc32xx/pm.c
create mode 100644 arch/arm/mach-lpc32xx/serial.c
create mode 100644 arch/arm/mach-lpc32xx/suspend.S
create mode 100644 arch/arm/mach-lpc32xx/timer.c

thanks,
Kevin Wells
NXP Semiconductors

Git pull request: ARM LPC32XX architecture

[Russell King - ARM Linux]

On Fri, Mar 12, 2010 at 12:44:54PM -0800, Kevin Wells wrote:
> Hi Russell, please pull the reviewed LPC32xx arch files from the
> Pengutronix GIT server at:
> 
> 	git://git.pengutronix.de/git/ukl/linux-2.6.git wells/lpc32xx

FYI, I'm not pulling anything new until I've seen Linus take the stuff
that's already queued up.

Linus has finally said that he will take the bits of the ARM merge
which missed the truncated merge window, so that might be tomorrow.

However, what I do want to avoid this time around is having an
excessive number of merge conflicts, which may require a pause to
sort out (and I might ask people to bring their trees up to date
first.)

Git pull request: ARM LPC32XX architecture

[Robert Schwebel]

Hi Russell,

On Fri, Mar 12, 2010 at 09:03:53PM +0000, Russell King - ARM Linux wrote:
> However, what I do want to avoid this time around is having an
> excessive number of merge conflicts, which may require a pause to
> sort out (and I might ask people to bring their trees up to date
> first.)

Hmm, maybe we should make sure that more of the arm-sub-trees are in
linux-next; would that make the situation easier? If all of the trees
you pull are in next, at least in theory it should be a matter of
pulling them in the right order and send a pull request to linus.

At least in theory :)

Since Sascha has the i.MX tree in next and we're automatically testing
next (compiletime+runtime on several boards) on a nightly base, we've
found that merge conflicts are noticed in a timely manner.

Thanks,
rsc
-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Git pull request: ARM LPC32XX architecture

[Russell King - ARM Linux]

On Sat, Mar 13, 2010 at 04:50:53PM +0100, Robert Schwebel wrote:
> Hi Russell,
> 
> On Fri, Mar 12, 2010 at 09:03:53PM +0000, Russell King - ARM Linux wrote:
> > However, what I do want to avoid this time around is having an
> > excessive number of merge conflicts, which may require a pause to
> > sort out (and I might ask people to bring their trees up to date
> > first.)
> 
> Hmm, maybe we should make sure that more of the arm-sub-trees are in
> linux-next; would that make the situation easier? If all of the trees
> you pull are in next, at least in theory it should be a matter of
> pulling them in the right order and send a pull request to linus.

It's less of a problem if people follow the ordering of the machine
dependent bits for arch/arm/Makefile and arch/arm/Kconfig - things
tend to go horribly wrong when they don't, and git even gets confused.

The solution to that is to ensure that these *stay* sorted and refuse
to merge anything which breaks the sorting.  Yes, there'll still be
occasional merge conflicts, but keeping these things sorted should
result in the resolutions being trivial.

It all goes wrong when we end up with everyone adding to the end of
the lists, and then I re-order it - that's the point where git silently
guesses the resolutions wrong and we end up with, eg, two includes of
mach-lh7a40x/Kconfig.

What I don't want to do is re-sort these files, and then have to deal
with re-doing the sorting each time I subsequently merge a tree because
they're based on a commit prior to that re-sort.

Git pull request: ARM LPC32XX architecture

[Kevin Wells]

> Subject: Re: Git pull request: ARM LPC32XX architecture
> 
> On Sat, Mar 13, 2010 at 04:50:53PM +0100, Robert Schwebel wrote:
> > Hi Russell,
> >
> > On Fri, Mar 12, 2010 at 09:03:53PM +0000, Russell King - ARM Linux wrote:
> > > However, what I do want to avoid this time around is having an
> > > excessive number of merge conflicts, which may require a pause to
> > > sort out (and I might ask people to bring their trees up to date
> > > first.)
> >
> > Hmm, maybe we should make sure that more of the arm-sub-trees are in
> > linux-next; would that make the situation easier? If all of the trees
> > you pull are in next, at least in theory it should be a matter of
> > pulling them in the right order and send a pull request to linus.
> 
> It's less of a problem if people follow the ordering of the machine
> dependent bits for arch/arm/Makefile and arch/arm/Kconfig - things
> tend to go horribly wrong when they don't, and git even gets confused.
> 
> The solution to that is to ensure that these *stay* sorted and refuse
> to merge anything which breaks the sorting.  Yes, there'll still be
> occasional merge conflicts, but keeping these things sorted should
> result in the resolutions being trivial.
> 
> It all goes wrong when we end up with everyone adding to the end of
> the lists, and then I re-order it - that's the point where git silently
> guesses the resolutions wrong and we end up with, eg, two includes of
> mach-lh7a40x/Kconfig.
> 
> What I don't want to do is re-sort these files, and then have to deal
> with re-doing the sorting each time I subsequently merge a tree because
> they're based on a commit prior to that re-sort.

Hi Russell,

Is there anything I can do to help move these along? It's not a rush job
to get these into the tree, but I would like to start getting other
changes and drivers submitted based on this work.

If I can help, please let me know!

thanks,
Kevin

Git pull request: ARM LPC32XX architecture

[Kevin Wells]

> Sent: Friday, March 12, 2010 1:04 PM
> To: Kevin Wells
> Cc: linux-arm-kernel at lists.infradead.org
> Subject: Re: Git pull request: ARM LPC32XX architecture
> 
> On Fri, Mar 12, 2010 at 12:44:54PM -0800, Kevin Wells wrote:
> > Hi Russell, please pull the reviewed LPC32xx arch files from the
> > Pengutronix GIT server at:
> >
> > 	git://git.pengutronix.de/git/ukl/linux-2.6.git wells/lpc32xx
> 
> FYI, I'm not pulling anything new until I've seen Linus take the stuff
> that's already queued up.
> 
> Linus has finally said that he will take the bits of the ARM merge
> which missed the truncated merge window, so that might be tomorrow.
> 
> However, what I do want to avoid this time around is having an
> excessive number of merge conflicts, which may require a pause to
> sort out (and I might ask people to bring their trees up to date
> first.)
> 

Hi Russell,

It's been a few months since I've posted this patch set and I'd still
like to get it pulled.

As of yesterday, the patchset still applies and works with the latest
release, although a 'slab.h' patch is needed for 1 file.

Can you pull the original series plus the slab.h patch? (breaks bisect)?
Or do you want the slab.h fix included in the correct order in the
Series to be bisect friendly?

Thanks,
Kevin Wells
NXP Semiconductors

Git pull request: ARM LPC32XX architecture

[Russell King - ARM Linux]

On Tue, May 25, 2010 at 05:27:12PM +0200, Kevin Wells wrote:
> It's been a few months since I've posted this patch set and I'd still
> like to get it pulled.

Sorry, it got buried beneath _lots_ of email.

However, I've sent my second and final pull request to Linus yesterday
evening.  So far Linus hasn't pulled my tree, so I can't touch it at
the moment.

I think this stuff has missed this window as well. ;(

> As of yesterday, the patchset still applies and works with the latest
> release, although a 'slab.h' patch is needed for 1 file.
> 
> Can you pull the original series plus the slab.h patch? (breaks bisect)?
> Or do you want the slab.h fix included in the correct order in the
> Series to be bisect friendly?

Well, there's two ways to get around that - both of which you need to
ensure that no one's pulled your tree yet.

1. Re-do the patches such that the missing include(s) are added.

2. rebase the series on something more recent and fix the slab.h thing
   along the way.

Either way means that the series remains bisect-able after merging.

This is not something that should be done lightly however - these kinds
of changes mean that anyone who has pulled your tree is in for some
grief.

Git pull request: ARM LPC32XX architecture

[Kevin Wells]

> From: Russell King - ARM Linux [mailto:linux at arm.linux.org.uk]
> Sent: Tuesday, May 25, 2010 10:21 AM
> To: Kevin Wells
> Cc: linux-arm-kernel at lists.infradead.org
> Subject: Re: Git pull request: ARM LPC32XX architecture
> 
> On Tue, May 25, 2010 at 05:27:12PM +0200, Kevin Wells wrote:
> > It's been a few months since I've posted this patch set and I'd still
> > like to get it pulled.
> 
> Sorry, it got buried beneath _lots_ of email.
> 
> However, I've sent my second and final pull request to Linus yesterday
> evening.  So far Linus hasn't pulled my tree, so I can't touch it at
> the moment.
> 
> I think this stuff has missed this window as well. ;(
> 

Thanks, I figured you probably had your hands full.

> > Can you pull the original series plus the slab.h patch? (breaks
> bisect)?
> > Or do you want the slab.h fix included in the correct order in the
> > Series to be bisect friendly?
> 
> Well, there's two ways to get around that - both of which you need to
> ensure that no one's pulled your tree yet.
> 
> 1. Re-do the patches such that the missing include(s) are added.
> 
> 2. rebase the series on something more recent and fix the slab.h thing
>    along the way.
> 
> Either way means that the series remains bisect-able after merging.
> 
> This is not something that should be done lightly however - these kinds
> of changes mean that anyone who has pulled your tree is in for some
> grief.

The updated full series is available from:
git://git.lpclinux.com/linux-2.6-lpc wells/lpc32xx-arch

This has been rebased on 2.6.34.
A pull of this series should play nice with the previous series if someone has already pulled it..

Git pull request: ARM LPC32XX architecture

[Kevin Wells]

Hi Russell,

I just wanted to drop a friendly reminder on this pull request. As
of yesterday, everything still built fine with the latest tree, but
it's in need of some updates. Can you still pull this and I'll apply
the updates in another patch series in the next week?

git://git.lpclinux.com/linux-2.6-lpc wells/lpc32xx-arch

Or if you think you'll pull it in the next few weeks, I'll start
posting those updates now...

thanks,
Kevin

> Cc: linux-arm-kernel at lists.infradead.org
> Subject: RE: Git pull request: ARM LPC32XX architecture
> 
> > From: Russell King - ARM Linux [mailto:linux at arm.linux.org.uk]
> > Sent: Tuesday, May 25, 2010 10:21 AM
> > To: Kevin Wells
> > Cc: linux-arm-kernel at lists.infradead.org
> > Subject: Re: Git pull request: ARM LPC32XX architecture
> >
> > On Tue, May 25, 2010 at 05:27:12PM +0200, Kevin Wells wrote:
> > > It's been a few months since I've posted this patch set and I'd
> still
> > > like to get it pulled.
> >
> > Sorry, it got buried beneath _lots_ of email.
> >
> > However, I've sent my second and final pull request to Linus
> yesterday
> > evening.  So far Linus hasn't pulled my tree, so I can't touch it at
> > the moment.
> >
> > I think this stuff has missed this window as well. ;(
> >
> 
> Thanks, I figured you probably had your hands full.
> 
> > > Can you pull the original series plus the slab.h patch? (breaks
> > bisect)?
> > > Or do you want the slab.h fix included in the correct order in the
> > > Series to be bisect friendly?
> >
> > Well, there's two ways to get around that - both of which you need to
> > ensure that no one's pulled your tree yet.
> >
> > 1. Re-do the patches such that the missing include(s) are added.
> >
> > 2. rebase the series on something more recent and fix the slab.h
> thing
> >    along the way.
> >
> > Either way means that the series remains bisect-able after merging.
> >
> > This is not something that should be done lightly however - these
> kinds
> > of changes mean that anyone who has pulled your tree is in for some
> > grief.
> 
> The updated full series is available from:
> git://git.lpclinux.com/linux-2.6-lpc wells/lpc32xx-arch
> 
> This has been rebased on 2.6.34.
> A pull of this series should play nice with the previous series if
> someone has already pulled it..
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Git pull request: ARM LPC32XX architecture

[Russell King - ARM Linux]

On Tue, Jul 27, 2010 at 06:19:36PM +0200, Kevin Wells wrote:
> I just wanted to drop a friendly reminder on this pull request. As
> of yesterday, everything still built fine with the latest tree, but
> it's in need of some updates. Can you still pull this and I'll apply
> the updates in another patch series in the next week?

Yes, with one change - the defconfig needs attention.  Uwe has a tool
which can be used to compress it.

Even so, I don't think we want, at this stage, to antagonise Linus
by adding a new defconfig - we already have more than too many.

Git pull request: ARM LPC32XX architecture

[Russell King - ARM Linux]

On Tue, Jul 27, 2010 at 05:45:40PM +0100, Russell King - ARM Linux wrote:
> On Tue, Jul 27, 2010 at 06:19:36PM +0200, Kevin Wells wrote:
> > I just wanted to drop a friendly reminder on this pull request. As
> > of yesterday, everything still built fine with the latest tree, but
> > it's in need of some updates. Can you still pull this and I'll apply
> > the updates in another patch series in the next week?
> 
> Yes, with one change - the defconfig needs attention.  Uwe has a tool
> which can be used to compress it.
> 
> Even so, I don't think we want, at this stage, to antagonise Linus
> by adding a new defconfig - we already have more than too many.

You'll also need at some point to add an apb_pclk clock (can be a dummy)
as the amba infrastructure will want it.

Git pull request: ARM LPC32XX architecture

[Kevin Wells]

> Subject: Re: Git pull request: ARM LPC32XX architecture
> 
> On Tue, Jul 27, 2010 at 05:45:40PM +0100, Russell King - ARM Linux
> wrote:
> > On Tue, Jul 27, 2010 at 06:19:36PM +0200, Kevin Wells wrote:
> > > I just wanted to drop a friendly reminder on this pull request. As
> > > of yesterday, everything still built fine with the latest tree, but
> > > it's in need of some updates. Can you still pull this and I'll
> apply
> > > the updates in another patch series in the next week?
> >
> > Yes, with one change - the defconfig needs attention.  Uwe has a tool
> > which can be used to compress it.
> >
> > Even so, I don't think we want, at this stage, to antagonise Linus
> > by adding a new defconfig - we already have more than too many.
> 

Can you pull the series if I completely remove the defconfig file (for
now at least)?

> You'll also need at some point to add an apb_pclk clock (can be a dummy)
> as the amba infrastructure will want it.

I'll get this and the other updates posted in the next few days.

Git pull request: ARM LPC32XX architecture

[Russell King - ARM Linux]

On Tue, Jul 27, 2010 at 10:00:16PM +0200, Kevin Wells wrote:
> Can you pull the series if I completely remove the defconfig file (for
> now at least)?

Yes.

Git pull request: ARM LPC32XX architecture

[Kevin Wells]

Hi Russell,

> On Tue, Jul 27, 2010 at 10:00:16PM +0200, Kevin Wells wrote:
> > Can you pull the series if I completely remove the defconfig file
> (for
> > now at least)?
> 
> Yes.

Please pull the updated LPC32xx tree from:
git://git.lpclinux.com/linux-2.6-lpc wells/lpc32xx-arch_v2

There is no defconfig in this, but I'll post that as a separate
patch and it can be pulled later if needed.

thanks!
Kevin