* [PATCH 0/8] Convert Ux500 to SPARSE_IRQ
@ 2012-10-18 17:18 Linus Walleij
2012-10-19 7:42 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Linus Walleij @ 2012-10-18 17:18 UTC (permalink / raw)
To: linux-arm-kernel
From: Linus Walleij <linus.walleij@linaro.org>
This patch series fixes the prerequisites and then converts Ux500
to SPARSE_IRQ.
- Patch [1/8] "clk/ux500: explicitly include register header"
can be applied as a fix to the -rc:s into Mikes clk tree.
If I shall keep it in this series I request Mike to ACK it.
- Patch [6/8] and [7/8] needs to be tested with device tree
boots to make sure they do not cause regressions, Lee can you
help me with this? After that I'd prefer to get Sam's ACK
and merge with this series so it becomes bisectable.
The rest is within my own Ux500/pinctrl domain.
However it is based off the nomadik branch in the pinctrl
tree and the dependency is hard to cut. Here is why:
- Earlier pinctrl patches (not in this series) alter the
<plat/gpio-nomadik.h> file, merges <plat/pincfg.h> and
finally move it down into
<linux/platform_data/pinctrl-nomadik.h>
- Then this series further moves <plat/ste_dma40.h> out of
the way and down into <linux/platform_data/dma-ste-dma40.h>
- Then there are some patches to the clocksource driver
residng in plat-nomadik/timer.c
- Finally the clocksource driver in plat-nomadik/timer.c
is moved out to drivers/clocksource/nomadik-mtu.c and
it's header is simultaneously moved to
<linux/platform_data/clocksource-nomadik-mtu.h>
- At this point, plat-nomadik is empty and must be deleted,
because apart from looking ugly, the build system does not
allow an empty Makefile.
So for this reason the final MTU patch will close the light
and delete plat-nomadik.
Imagine some of these files going through different trees...
(The alternative is of course to split the stuff across
two merge windows or something like that, but if all the
stuff shall go in at once this is the best I can think of.)
Therefore I will probably request that all the queued pinctrl
patches for Ux500 with this series on top be funneled into ARM
SoC for the next merge window once this series is deemed stable.
Alternatively I can carry all of it in the pinctrl tree with
proper ACKs.
After this series I tried turning on multiplatform for ux500
but there are still headers in <mach/*> creating problems
so we are still just halfway.
Linus Walleij (8):
clk/ux500: explicitly include register header
ARM: plat-nomadik: pass IRQ to timer driver
ARM: plat-nomadik: use DIV_ROUND_CLOSEST()
ARM: plat-nomadik: move DMA40 header to <linux/platform_data>
ARM: plat-nomadik: move MTU, kill plat-nomadik
mfd/ab8500-core: use irq_domain_add_simple()
mfd/db8500-prcmu: use the irq_domain_add_simple()
ARM: plat-nomadik: convert platforms to SPARSE_IRQ
arch/arm/Kconfig | 3 +-
arch/arm/Makefile | 1 -
arch/arm/mach-nomadik/Kconfig | 2 +-
arch/arm/mach-nomadik/board-nhk8815.c | 10 +-
arch/arm/mach-nomadik/include/mach/irqs.h | 2 +-
arch/arm/mach-ux500/Kconfig | 2 +-
arch/arm/mach-ux500/board-mop500-audio.c | 3 +-
arch/arm/mach-ux500/board-mop500-sdi.c | 2 +-
arch/arm/mach-ux500/board-mop500.c | 4 +-
arch/arm/mach-ux500/cpu-db8500.c | 1 +
arch/arm/mach-ux500/devices-common.c | 1 +
arch/arm/mach-ux500/devices-db8500.c | 4 +-
arch/arm/mach-ux500/devices-db8500.h | 1 +
arch/arm/mach-ux500/include/mach/irqs.h | 2 +-
arch/arm/mach-ux500/include/mach/msp.h | 2 +-
arch/arm/mach-ux500/timer.c | 5 +-
arch/arm/mach-ux500/usb.c | 4 +-
arch/arm/plat-nomadik/Kconfig | 29 ---
arch/arm/plat-nomadik/Makefile | 5 -
arch/arm/plat-nomadik/include/plat/mtu.h | 9 -
arch/arm/plat-nomadik/include/plat/ste_dma40.h | 223 --------------------
arch/arm/plat-nomadik/timer.c | 223 --------------------
drivers/char/hw_random/Kconfig | 2 +-
drivers/clk/ux500/u8500_clk.c | 2 +-
drivers/clocksource/Kconfig | 17 +-
drivers/clocksource/Makefile | 1 +
drivers/clocksource/nomadik-mtu.c | 224 +++++++++++++++++++++
drivers/crypto/ux500/cryp/cryp_core.c | 3 +-
drivers/dma/ste_dma40.c | 3 +-
drivers/dma/ste_dma40_ll.c | 2 +-
drivers/input/keyboard/Kconfig | 2 +-
drivers/mfd/ab8500-core.c | 13 +-
drivers/mfd/db8500-prcmu.c | 12 +-
drivers/mtd/nand/Kconfig | 2 +-
drivers/pinctrl/pinctrl-nomadik.c | 3 +-
.../linux/platform_data/clocksource-nomadik-mtu.h | 9 +
include/linux/platform_data/crypto-ux500.h | 2 +-
include/linux/platform_data/dma-ste-dma40.h | 223 ++++++++++++++++++++
sound/soc/ux500/ux500_pcm.c | 3 +-
39 files changed, 519 insertions(+), 542 deletions(-)
delete mode 100644 arch/arm/plat-nomadik/Kconfig
delete mode 100644 arch/arm/plat-nomadik/Makefile
delete mode 100644 arch/arm/plat-nomadik/include/plat/mtu.h
delete mode 100644 arch/arm/plat-nomadik/include/plat/ste_dma40.h
delete mode 100644 arch/arm/plat-nomadik/timer.c
create mode 100644 drivers/clocksource/nomadik-mtu.c
create mode 100644 include/linux/platform_data/clocksource-nomadik-mtu.h
create mode 100644 include/linux/platform_data/dma-ste-dma40.h
--
1.7.11.3
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 0/8] Convert Ux500 to SPARSE_IRQ
2012-10-18 17:18 [PATCH 0/8] Convert Ux500 to SPARSE_IRQ Linus Walleij
@ 2012-10-19 7:42 ` Arnd Bergmann
2012-10-19 15:12 ` Linus Walleij
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2012-10-19 7:42 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 18 October 2012, Linus Walleij wrote:
> From: Linus Walleij <linus.walleij@linaro.org>
>
> This patch series fixes the prerequisites and then converts Ux500
> to SPARSE_IRQ.
Great stuff! In case any patches end up going through other trees,
please add my
Acked-by: Arnd Bergmann <arnd@arndb.de>
> After this series I tried turning on multiplatform for ux500
> but there are still headers in <mach/*> creating problems
> so we are still just halfway.
Which ones are still left? This is the list of inclusions I saw
in the 3.6-rc1 version of my multiplatform branch being included
from outside of the mach-ux500 directory.
I should probably redo that branch to see which ones are gone now,
but you would also catch most of these with a simple defconfig build.
3 include <mach-ux500/board-mop500-msp.h>
2 include <mach-ux500/crypto-ux500.h>
1 include <mach-ux500/db8500-regs.h>
1 include <mach-ux500/gpio.h>
8 include <mach-ux500/hardware.h>
3 include <mach-ux500/id.h>
3 include <mach-ux500/irqs.h>
1 include <mach-ux500/setup.h>
1 include <mach-ux500/usb.h>
Arnd
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 0/8] Convert Ux500 to SPARSE_IRQ
2012-10-19 7:42 ` Arnd Bergmann
@ 2012-10-19 15:12 ` Linus Walleij
0 siblings, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2012-10-19 15:12 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 19, 2012 at 9:42 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Thursday 18 October 2012, Linus Walleij wrote:
>> After this series I tried turning on multiplatform for ux500
>> but there are still headers in <mach/*> creating problems
>> so we are still just halfway.
>
> Which ones are still left? This is the list of inclusions I saw
> in the 3.6-rc1 version of my multiplatform branch being included
> from outside of the mach-ux500 directory.
>
> I should probably redo that branch to see which ones are gone now,
> but you would also catch most of these with a simple defconfig build.
>
> 3 include <mach-ux500/board-mop500-msp.h>
> 2 include <mach-ux500/crypto-ux500.h>
> 1 include <mach-ux500/db8500-regs.h>
> 1 include <mach-ux500/gpio.h>
> 8 include <mach-ux500/hardware.h>
This is the one causing the build to fail.
> 3 include <mach-ux500/id.h>
I'm working on a patch for this one.
> 3 include <mach-ux500/irqs.h>
> 1 include <mach-ux500/setup.h>
> 1 include <mach-ux500/usb.h>
Basically I think it's pretty easy to hack something that builds
multiplatform on top of the SPARSE_IRQ patch set.
I just need to do it :-) (famous last words...)
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-19 15:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-18 17:18 [PATCH 0/8] Convert Ux500 to SPARSE_IRQ Linus Walleij
2012-10-19 7:42 ` Arnd Bergmann
2012-10-19 15:12 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox