ARM: LPC32xx: core update

GIT PULL Roland Stigge 4 participants 6 messages Sep 6, 2012 – Sep 26, 2012 Memory technology devices (MTD)

lore

Share & tools

lore

Roland Stigge

author

2012-09-06 11:58 UTC #0 lore raw

Hi Arnd and Olof,

below is the LPC32xx core update branch for 3.7.

Thanks,

Roland

The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d:

Linux 3.6-rc4 (2012-09-01 10:39:58 -0700)

are available in the git repository at:

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

for you to fetch changes up to 7a5deff68f9e0a1db170ac9dd3b2b4aaddc1b80c:

ARM: LPC32xx: Remove board specific GPIO init (2012-09-06 11:39:29 +0200)

----------------------------------------------------------------
Roland Stigge (3):
ARM: LPC32xx: Use handle_edge_irq() callback on edge type irqs
ARM: LPC32xx: Provide DMA filter callbacks via platform data
ARM: LPC32xx: Remove board specific GPIO init

 arch/arm/mach-lpc32xx/irq.c     |    7 ++++---
 arch/arm/mach-lpc32xx/phy3250.c |   20 ++++++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

Olof Johansson

2012-09-07 22:04 UTC #1 lore raw

Quoted 10 lines · Roland Stigge

Hi Arnd and Olof,
below is the LPC32xx core update branch for 3.7.
Thanks,
Roland

Quoted 7 lines

The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d:
Linux 3.6-rc4 (2012-09-01 10:39:58 -0700)
are available in the git repository at:
git://git.antcom.de/linux-2.6.git lpc32xx/core

Thanks, pulled into next/soc.

-Olof

Arnd Bergmann

2012-09-13 11:55 UTC #2 lore raw

In reply to Roland Stigge

Quoted 1 line · Roland Stigge

ARM: LPC32xx: Provide DMA filter callbacks via platform data

This patch results in build errors in the for-next branch with lpc32xx_defconfig:

arch/arm/mach-lpc32xx/phy3250.c:40:35: fatal error: linux/mtd/lpc32xx_slc.h: No such file or directory arch/arm/mach-lpc32xx/phy3250.c:41:35: fatal error: linux/mtd/lpc32xx_mlc.h: No such file or directory arch/arm/mach-lpc32xx/phy3250.c:226:15: error: variable 'lpc32xx_slc_data' has initializer but incomplete type arch/arm/mach-lpc32xx/phy3250.c:227:2: error: unknown field 'dma_filter' specified in initializer arch/arm/mach-lpc32xx/phy3250.c:227:2: error: excess elements in struct initializer [-Werror] arch/arm/mach-lpc32xx/phy3250.c:227:2: error: (near initialization for 'lpc32xx_slc_data') [-Werror] arch/arm/mach-lpc32xx/phy3250.c:230:15: error: variable 'lpc32xx_mlc_data' has initializer but incomplete type arch/arm/mach-lpc32xx/phy3250.c:231:2: error: unknown field 'dma_filter' specified in initializer arch/arm/mach-lpc32xx/phy3250.c:231:2: error: excess elements in struct initializer [-Werror] arch/arm/mach-lpc32xx/phy3250.c:231:2: error: (near initialization for 'lpc32xx_mlc_data') [-Werror]

It seems that we're missing a dependency. Which tree did the patch to add these go through? Can we add that to the same branch in arm-soc?

Arnd

Roland Stigge

author

2012-09-14 09:52 UTC #3 lore raw

Hi Arnd,

Quoted 16 lines · Arnd Bergmann

Quoted 1 line · Roland Stigge
ARM: LPC32xx: Provide DMA filter callbacks via platform data
This patch results in build errors in the for-next branch with lpc32xx_defconfig:
arch/arm/mach-lpc32xx/phy3250.c:40:35: fatal error: linux/mtd/lpc32xx_slc.h: No such file or directory arch/arm/mach-lpc32xx/phy3250.c:41:35: fatal error: linux/mtd/lpc32xx_mlc.h: No such file or directory arch/arm/mach-lpc32xx/phy3250.c:226:15: error: variable 'lpc32xx_slc_data' has initializer but incomplete type arch/arm/mach-lpc32xx/phy3250.c:227:2: error: unknown field 'dma_filter' specified in initializer arch/arm/mach-lpc32xx/phy3250.c:227:2: error: excess elements in struct initializer [-Werror] arch/arm/mach-lpc32xx/phy3250.c:227:2: error: (near initialization for 'lpc32xx_slc_data') [-Werror] arch/arm/mach-lpc32xx/phy3250.c:230:15: error: variable 'lpc32xx_mlc_data' has initializer but incomplete type arch/arm/mach-lpc32xx/phy3250.c:231:2: error: unknown field 'dma_filter' specified in initializer arch/arm/mach-lpc32xx/phy3250.c:231:2: error: excess elements in struct initializer [-Werror] arch/arm/mach-lpc32xx/phy3250.c:231:2: error: (near initialization for 'lpc32xx_mlc_data') [-Werror]

Quoted 2 lines

It seems that we're missing a dependency. Which tree did the patch to add these go through? Can we add that to the same branch in arm-soc?

Right - there is a dependency on l2-mtd.git here.

Since they didn't request pull for 3.6, there is quite some stuff pending in their tree (but I wonder why it isn't already part of linux-next, so the above error at least shouldn't occur in linux-next).

So we have several alternative options here:

* If it is possible, include l2-mtd.git as a dependency in arm-soc.git
* Merge the following 2 patches as minimal dependency:
http://git.infradead.org/users/dedekind/l2-mtd-2.6.git/commitdiff/c47bc5c84a65c31f41a555706363f9e350ca6338
http://git.infradead.org/users/dedekind/l2-mtd-2.6.git/commitdiff/f5e87dd7350c98a34aa7041264c337f0f33c02ff
You actually only need the two .h files, ignore the patches for yet non-existing .c mtd driver files in arm-soc.git.
* Defer the above (single) patch in arm-soc until l2-mtd is merged linux-next or mainline. Maybe l2-mtd.git will appear in linux-next soon, otherwise we will need to defer the above patch for lpc32xx/core for 3.8?

Sorry for the confusion,

Roland

Artem Bityutskiy

2012-09-26 08:24 UTC #4 lore raw

Quoted 19 lines · Roland Stigge

Hi Arnd,
Quoted 16 lines · Arnd Bergmann
Quoted 1 line · Roland Stigge
ARM: LPC32xx: Provide DMA filter callbacks via platform data
This patch results in build errors in the for-next branch with lpc32xx_defconfig:
arch/arm/mach-lpc32xx/phy3250.c:40:35: fatal error: linux/mtd/lpc32xx_slc.h: No such file or directory arch/arm/mach-lpc32xx/phy3250.c:41:35: fatal error: linux/mtd/lpc32xx_mlc.h: No such file or directory arch/arm/mach-lpc32xx/phy3250.c:226:15: error: variable 'lpc32xx_slc_data' has initializer but incomplete type arch/arm/mach-lpc32xx/phy3250.c:227:2: error: unknown field 'dma_filter' specified in initializer arch/arm/mach-lpc32xx/phy3250.c:227:2: error: excess elements in struct initializer [-Werror] arch/arm/mach-lpc32xx/phy3250.c:227:2: error: (near initialization for 'lpc32xx_slc_data') [-Werror] arch/arm/mach-lpc32xx/phy3250.c:230:15: error: variable 'lpc32xx_mlc_data' has initializer but incomplete type arch/arm/mach-lpc32xx/phy3250.c:231:2: error: unknown field 'dma_filter' specified in initializer arch/arm/mach-lpc32xx/phy3250.c:231:2: error: excess elements in struct initializer [-Werror] arch/arm/mach-lpc32xx/phy3250.c:231:2: error: (near initialization for 'lpc32xx_mlc_data') [-Werror]

Quoted 8 lines

Quoted 2 lines
It seems that we're missing a dependency. Which tree did the patch to add these go through? Can we add that to the same branch in arm-soc?
Right - there is a dependency on l2-mtd.git here.
Since they didn't request pull for 3.6, there is quite some stuff pending in their tree (but I wonder why it isn't already part of linux-next, so the above error at least shouldn't occur in linux-next).

It is in linux-next:

[dedekind at sauron linux-next (master)]$ git log --format='%h %an %s' drivers/mtd/ | grep Stigge 562dec8 Roland Stigge mtd: lpc32xx_mlc: Cleanup after DT-only conversion
ad978ee Roland Stigge mtd: lpc32xx_slc: Cleanup after DT-only conversion
7359e4c Roland Stigge mtd: lpc32xx_mlc: Make driver independent of AMBA DMA engine driver fa5eae7 Roland Stigge mtd: lpc32xx_slc: Make driver independent of AMBA DMA engine driver 79f9df7 Roland Stigge mtd: lpc32xx_mlc: Adjust to pl08x DMA interface changes 314a156 Roland Stigge mtd: lpc32xx_slc: Adjust to pl08x DMA interface changes 70f7cb7 Roland Stigge mtd: add LPC32xx MLC NAND driver
d5842ab Roland Stigge mtd: lpc32xx_slc: Make probe() return -EPROBE_DEFER if necessary 21535ab Roland Stigge mtd: lpc32xx_slc: Use of_get_named_gpio()
2944a44 Roland Stigge mtd: add LPC32xx SLC NAND driver
9d7b4b5 Roland Stigge [MTD] [NAND] Fix refactoring of EDB7312 hwcontrol function. 4a32cfa Roland Stigge [MTD] [NAND] Fix refactoring of EDB7312 hwcontrol function.

Signature · 9 lines

Best Regards,
Artem Bityutskiy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120926/56636377/attachment.sig>

Roland Stigge

author

2012-09-26 08:52 UTC #5 lore raw

Quoted 41 lines · Artem Bityutskiy

Quoted 32 lines · Arnd Bergmann
Quoted 27 lines · Roland Stigge
Quoted 1 line
ARM: LPC32xx: Provide DMA filter callbacks via platform data
This patch results in build errors in the for-next branch with lpc32xx_defconfig:
arch/arm/mach-lpc32xx/phy3250.c:40:35: fatal error:
linux/mtd/lpc32xx_slc.h: No such file or directory arch/arm/mach-lpc32xx/phy3250.c:41:35: fatal error:
linux/mtd/lpc32xx_mlc.h: No such file or directory arch/arm/mach-lpc32xx/phy3250.c:226:15: error: variable 'lpc32xx_slc_data' has initializer but incomplete type arch/arm/mach-lpc32xx/phy3250.c:227:2: error: unknown field 'dma_filter' specified in initializer arch/arm/mach-lpc32xx/phy3250.c:227:2: error: excess elements in struct initializer [-Werror] arch/arm/mach-lpc32xx/phy3250.c:227:2: error: (near initialization for 'lpc32xx_slc_data') [-Werror] arch/arm/mach-lpc32xx/phy3250.c:230:15: error: variable 'lpc32xx_mlc_data' has initializer but incomplete type arch/arm/mach-lpc32xx/phy3250.c:231:2: error: unknown field 'dma_filter' specified in initializer arch/arm/mach-lpc32xx/phy3250.c:231:2: error: excess elements in struct initializer [-Werror] arch/arm/mach-lpc32xx/phy3250.c:231:2: error: (near initialization for 'lpc32xx_mlc_data') [-Werror]
Quoted 3 lines
It seems that we're missing a dependency. Which tree did the patch to add these go through? Can we add that to the same branch in arm-soc?
Quoted 6 lines
Right - there is a dependency on l2-mtd.git here.
Since they didn't request pull for 3.6, there is quite some stuff pending in their tree (but I wonder why it isn't already part of linux-next, so the above error at least shouldn't occur in linux-next).
It is in linux-next:

Quoted 16 lines

[dedekind at sauron linux-next (master)]$ git log --format='%h %an %s' drivers/mtd/ | grep Stigge 562dec8 Roland Stigge mtd: lpc32xx_mlc:
Cleanup after DT-only conversion ad978ee Roland Stigge mtd:
lpc32xx_slc: Cleanup after DT-only conversion 7359e4c Roland Stigge
mtd: lpc32xx_mlc: Make driver independent of AMBA DMA engine driver fa5eae7 Roland Stigge mtd: lpc32xx_slc: Make driver independent of AMBA DMA engine driver 79f9df7 Roland Stigge mtd:
lpc32xx_mlc: Adjust to pl08x DMA interface changes 314a156 Roland Stigge mtd: lpc32xx_slc: Adjust to pl08x DMA interface changes 70f7cb7 Roland Stigge mtd: add LPC32xx MLC NAND driver d5842ab Roland Stigge mtd: lpc32xx_slc: Make probe() return -EPROBE_DEFER if necessary 21535ab Roland Stigge mtd: lpc32xx_slc: Use of_get_named_gpio() 2944a44 Roland Stigge mtd: add LPC32xx SLC NAND driver 9d7b4b5 Roland Stigge [MTD] [NAND] Fix refactoring of EDB7312 hwcontrol function. 4a32cfa Roland Stigge [MTD] [NAND] Fix refactoring of EDB7312 hwcontrol function.

Good, thanks! Then, the above issue should be gone now.

Please note that there is still the dependency of mtd on mach-lpc32xx.

Roland