Patchwork [GIT,PULL]

login
register
mail settings
Submitter stigge@antcom.de
Date June 18, 2012, 8:48 p.m.
Message ID <4FDF9419.2090601@antcom.de>
Download mbox
Permalink /patch/165609/
State New
Headers show

Pull-request

git://git.antcom.de/linux-2.6.git lpc32xx-next

Comments

stigge@antcom.de - June 18, 2012, 8:48 p.m.
Hi Arnd and Olof,

this is the pull request for the 22 patches we discussed last week, still same
commits in the same branch (the 23rd patch was removed from the series, as
discussed on the list).

This time, purely mach-lpc32xx specific patches.

Please tell if sth. is missing, so I can know if I can build upon that. (I'm
already collecting new patches on top of this branch.)

Thanks in advance,

Roland



The following changes since commit cfaf025112d3856637ff34a767ef785ef5cf2ca9:

  Linux 3.5-rc2 (2012-06-08 18:40:09 -0700)

are available in the git repository at:

  git://git.antcom.de/linux-2.6.git lpc32xx-next

for you to fetch changes up to df072717eb0050326f0f63eed98200412c395831:

  ARM: LPC32xx: Move i2s1 dma enabling to clock.c (2012-06-14 16:16:19 +0200)

----------------------------------------------------------------
Alexandre Pereira da Silva (7):
      ARM: LPC32xx: Build arch dtbs
      ARM: LPC32xx: Add dt settings to the at25 node
      ARM: LPC32xx: Remove spi chipselect request from board init
      ARM: LPC32xx: Remove spi chip definitions
      ARM: LPC32xx: Cleanup board init, remove duplicate clock init
      ARM: LPC32xx: Move uart6 irda disable to serial.c
      ARM: LPC32xx: Move i2s1 dma enabling to clock.c

Roland Stigge (15):
      ARM: LPC32xx: Add NAND flash timing to PHY3250 board dts
      ARM: LPC32xx: Clock initialization for NAND controllers
      ARM: LPC32xx: Remove SLC controller initialization from platform init
      ARM: LPC32xx: Add DMA configuration to platform data
      ARM: LPC32xx: Adjust dtsi file for MLC controller configuration
      ARM: LPC32xx: Add dts for EA3250 reference board
      ARM: LPC32xx: DTS adjustment for key matrix controller
      ARM: LPC32xx: Clock adjustment for key matrix controller
      ARM: LPC32xx: Defconfig update
      ARM: LPC32xx: Add MMC controller support
      ARM: LPC32xx: DTS adjustment for using pl18x primecell
      ARM: LPC32xx: DT conversion of Standard UARTs
      ARM: LPC32xx: High Speed UART configuration via DT
      ARM: LPC32xx: Remove mach specific ARCH_NR_GPIOS, use default
      ARM: LPC32xx: Fix lpc32xx.dtsi status property: "disable" -> "disabled"

 arch/arm/Kconfig                          |    2 -
 arch/arm/boot/dts/ea3250.dts              |  157 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/lpc32xx.dtsi            |   74 +++++++++-----
 arch/arm/boot/dts/phy3250.dts             |   61 +++++++++++
 arch/arm/configs/lpc32xx_defconfig        |   24 +++--
 arch/arm/mach-lpc32xx/Kconfig             |   32 ------
 arch/arm/mach-lpc32xx/Makefile.boot       |    1 +
 arch/arm/mach-lpc32xx/clock.c             |   21 +++-
 arch/arm/mach-lpc32xx/include/mach/gpio.h |    2 -
 arch/arm/mach-lpc32xx/phy3250.c           |  158 ++++++++++++-----------------
 arch/arm/mach-lpc32xx/serial.c            |   90 ++--------------
 11 files changed, 376 insertions(+), 246 deletions(-)
 create mode 100644 arch/arm/boot/dts/ea3250.dts
 delete mode 100644 arch/arm/mach-lpc32xx/Kconfig
Olof Johansson - June 30, 2012, 11:29 p.m.
Hi,

On Mon, Jun 18, 2012 at 1:48 PM, Roland Stigge <stigge@antcom.de> wrote:
> Hi Arnd and Olof,
>
> this is the pull request for the 22 patches we discussed last week, still same
> commits in the same branch (the 23rd patch was removed from the series, as
> discussed on the list).
>
> This time, purely mach-lpc32xx specific patches.
>
> Please tell if sth. is missing, so I can know if I can build upon that. (I'm
> already collecting new patches on top of this branch.)

I'm very sorry for the slow response to this pull request.

The contents of it in itself looks good, but given the amount of
patches that you are building up now, I think it's time to start
organizing into topic branches that fit the structure of arm-soc a bit
better.

In other words, it makes sense to separate out things such as dts
updates in their own branch, core SoC updates in one, etc.

Given that you've based other work on top of this combined branch now,
and the fact that I should have gotten back to you sooner about it,
I'm going to pull it in under our next/soc branch this time. But I'd
like to see more topic-oriented pull requests in the future, ideally
for your updates here but definitely in the branches you stage for
3.7.

Let me know if you have any questions, or if there's something we
should explain a bit better about how we organize the branches.

> git://git.antcom.de/linux-2.6.git lpc32xx-next

Pulled as lpc32xx/devel and merged into next/soc. You can still use
this branch as a base for more fine-grained topic branches, we should
be able to deal with those dependencies in arm-soc.


Thanks,

-Olof
stigge@antcom.de - July 1, 2012, 3:40 p.m.
Hi,

On 01/07/12 01:29, Olof Johansson wrote:
>> This time, purely mach-lpc32xx specific patches.
>>
>> Please tell if sth. is missing, so I can know if I can build upon that. (I'm
>> already collecting new patches on top of this branch.)
> 
> I'm very sorry for the slow response to this pull request.
> 
> The contents of it in itself looks good, but given the amount of
> patches that you are building up now, I think it's time to start
> organizing into topic branches that fit the structure of arm-soc a bit
> better.
> 
> In other words, it makes sense to separate out things such as dts
> updates in their own branch, core SoC updates in one, etc.
> 
> Given that you've based other work on top of this combined branch now,
> and the fact that I should have gotten back to you sooner about it,
> I'm going to pull it in under our next/soc branch this time. But I'd
> like to see more topic-oriented pull requests in the future, ideally
> for your updates here but definitely in the branches you stage for
> 3.7.

I'm fine with this.

Building upon the branch you just pulled, I'll separate out the further
patches into topic branches. Is there a certain set of those which I
should use to adjust to arm-soc structure? E.g.:

lpc32xx/core
lpc32xx/defconfig
lpc32xx/dts

?

Thanks for pointing this out!

Roland
Olof Johansson - July 2, 2012, 4:25 p.m.
Hi,

On Sun, Jul 1, 2012 at 8:40 AM, Roland Stigge <stigge@antcom.de> wrote:

> Building upon the branch you just pulled, I'll separate out the further
> patches into topic branches. Is there a certain set of those which I
> should use to adjust to arm-soc structure? E.g.:
>
> lpc32xx/core
> lpc32xx/defconfig
> lpc32xx/dts
>
> ?
>
> Thanks for pointing this out!

Yep, that looks good.

In general, we've had the following categories in arm-soc:

* non-critical-fixes
* cleanup
* dts updates
* SoC support updates
* SoC driver updates
* power-management related changes
* clock related changes
* pinctrl related changes
+ other topics depending on what's going on that merge window
(defconfig, maintainers, etc).


Thanks!

-Olof