summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'devel-stable' into for-linusRussell King2012-03-27235-2451/+1068
|\ | | | | | | | | | | | | | | | | Conflicts: arch/arm/Kconfig.debug arch/arm/plat-versatile/Kconfig Merge fixes: arch/arm/mach-integrator/Kconfig drivers/clocksource/Kconfig
| * Merge branch 'sched_clock-for-rmk' of ↵Russell King2012-03-081-2/+10
| |\ | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable
| | * msm: timer: Support sched_clock()Stephen Boyd2012-02-241-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that sched_clock is mandatory on ARM it's simple to add sched_clock support to the MSM timer code. Add it so that we get more accurate sched_clock output than the jiffies based version that's provided by default. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Acked-by: David Brown <davidb@codeaurora.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
| * | ARM: 7344/1: pxa: mainstone: add missing include for IRQ_BOARD_STARTRob Herring2012-02-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | As part of mach/irqs.h include removal from sparse, mainstone.h was missed. This fixes the compile of the pcmcia driver. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | Merge branch 'sched_clock-for-rmk' of ↵Russell King2012-02-047-55/+19
| |\ \ | | |/ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable
| | * ARM: Make the sched_clock framework mandatoryMarc Zyngier2012-02-035-25/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All sched_clock() providers have been converted to the sched_clock framework, which also provides a jiffy based implementation for the platforms that do not provide a counter. It is now possible to make the sched_clock framework mandatory, effectively preventing new platforms to add new sched_clock() functions, which would be detrimental to the single zImage work. Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
| | * ARM: prima2: convert to common sched_clock() implementationMarc Zyngier2012-02-032-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prima2 has its own sched_clock() implementation, which gets in the way of a single zImage. Moving to the common sched_clock framework makes the code slightly cleaner (the mapping hack in sched_clock() goes away...). Acked-by: Barry Song <baohua.song@csr.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
| | * ARM: davinci: convert to common sched_clock() implementationMarc Zyngier2012-02-032-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Davinci has its own sched_clock() implementation, which gets in the way of a single zImage. Moving to the common sched_clock framework makes the code slightly cleaner. Acked-by: Sekhar Nori <nsekhar@ti.com> Cc: Kevin Hilman <khilman@ti.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
| | * ARM: davinci: time.c: group related header files togetherSekhar Nori2012-02-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Rearrange header files to keep related header files together. Signed-off-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
| * | Merge branch 'sparse_irq' of git://sources.calxeda.com/kernel/linux into ↵Russell King2012-02-0488-75/+130
| |\ \ | | |/ | |/| | | | devel-stable
| | * ARM: picoxcell: remove mach/irqs.hJamie Iles2012-01-301-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | picoxcell uses SPARSE_IRQ which means we don't need a mach/irqs.h anymore so kill it off. Signed-off-by: Jamie Iles <jamie@jamieiles.com> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| | * ARM: highbank: select SPARSE_IRQ and remove irqs.hRob Herring2012-01-303-7/+1
| | | | | | | | | | | | | | | | | | | | | irqs.h is optional now for SPARSE_IRQ, so select it and remove mach/irqs.h from highbank. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| | * ARM: only include mach/irqs.h for !SPARSE_IRQRob Herring2012-01-301-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make mach/irqs.h optional for SPARSE_IRQ. With this change mach/irqs.h can be removed by converting platforms over to sparse irq. Platforms either need to set nr_irqs in their machine desc or all irqchips used by a platform need to allocate their irq_descs. There cannot be a mixture. Once this is done, the platforms can select SPARSE_IRQ. shmobile does the latter, and mmp and pxa do the former. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| | * ARM: shmobile: remove NR_IRQSRob Herring2012-01-2519-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | Remove NR_IRQS and explicitly include mach/irqs.h as needed. shmobile properly allocates irq_descs for each irqchip, so setting .nr_irqs for each machine is not needed. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| | * ARM: pxa: remove NR_IRQSRob Herring2012-01-2536-1/+46
| | | | | | | | | | | | | | | | | | Remove NR_IRQS and add a per machine .nr_irqs setting. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| | * ARM: mmp: remove NR_IRQSRob Herring2012-01-2511-13/+19
| | | | | | | | | | | | | | | | | | | | | Remove NR_IRQS and add a per machine .nr_irqs setting. Clean-up namespace replacing usage of IRQ_BOARD_START with MMP_NR_IRQS. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| | * sh: intc: remove dependency on NR_IRQSRob Herring2012-01-255-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | SH intc has a compile time dependency on NR_IRQS. Make this dependency a local define so that shmobile (and ARM in general) can have run-time NR_IRQS setting. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| | * sh: intc: unify evt2irq/irq2evt macros for sh and armRob Herring2012-01-254-15/+17
| | | | | | | | | | | | | | | | | | | | | Move evt2irq and irq2evt macros definitions out of sh and arm includes into a common location. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| | * ARM: it8152: explicitly include mach/irqs.hRob Herring2012-01-251-0/+3
| | | | | | | | | | | | | | | | | | | | | In preparation to make mach/irqs.h optional, directly include mach/irq.h to get IRQ_BOARD_START. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| | * ARM: mc146818rtc: remove unnecessary include of mach/irqs.hRob Herring2012-01-251-1/+3
| | | | | | | | | | | | | | | | | | | | | The include of mach/irqs.h isn't needed, so remove it. Compiled CMOS rtc driver. Add a check to make sure nothing depends on RTC_IRQ. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| | * ARM: remove mc146818rtc.h from time.cRob Herring2012-01-251-2/+0
| | | | | | | | | | | | | | | | | | mc146818rtc.h is not needed in time.c, so remove it. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| | * gpio: pxa: explicitly include mach/irqs.hRob Herring2012-01-251-0/+2
| | | | | | | | | | | | | | | | | | | | | In preparation to make mach/irqs.h optional and remove from asm/irq.h, directly include mach/irq.h to get MMP_GPIO_TO_IRQ and PXA_GPIO_TO_IRQ. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| | * sound: pxa2xx-ac97: include mach/irqs.h directlyRob Herring2012-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | In preparation of removing mach/irqs.h include from asm/irq.h, include mach/irqs.h directly. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| | * irq: make SPARSE_IRQ an optionally hidden optionRob Herring2012-01-256-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On ARM, we don't want SPARSE_IRQ to be a user visible option. Make SPARSE_IRQ visible based on MAY_HAVE_SPARSE_IRQ instead of depending on HAVE_SPARSE_IRQ. With this, SPARSE_IRQ is not visible on C6X and ARM. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Mark Salter <msalter@redhat.com> Cc: Aurelien Jacquiot <a-jacquiot@ti.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Paul Mundt <lethal@linux-sh.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: linux-c6x-dev@linux-c6x.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-sh@vger.kernel.org
| * | Merge branch 'amba' into for-armsocRussell King2012-01-2639-816/+489
| |\ \
| | * | ARM: amba: samsung: use common amba device initializersRussell King2012-01-264-113/+23
| | | | | | | | | | | | | | | | | | | | Acked-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: spear: use common amba device initializersRussell King2012-01-262-35/+6
| | | | | | | | | | | | | | | | | | | | Acked-by: Viresh Kumar <viresh.kumar@st.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: nomadik: use common amba device initializersRussell King2012-01-262-20/+6
| | | | | | | | | | | | | | | | | | | | | | | | Acked-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: u300: use common amba device initializersRussell King2012-01-261-69/+16
| | | | | | | | | | | | | | | | | | | | Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: lpc32xx: use common amba device initializersRussell King2012-01-261-28/+4
| | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: netx: use common amba device initializersRussell King2012-01-261-12/+1
| | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: bcmring: use common amba device initializersRussell King2012-01-261-21/+2
| | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: ep93xx: use common amba device initializersRussell King2012-01-261-40/+6
| | | | | | | | | | | | | | | | | | | | Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: omap2: use common amba device initializersRussell King2012-01-261-24/+2
| | | | | | | | | | | | | | | | | | | | Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: integrator: use common amba device initializersRussell King2012-01-262-97/+22
| | | | | | | | | | | | | | | | | | | | Tested-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: realview: get rid of private platform amba_device initializerRussell King2012-01-266-110/+100
| | | | | | | | | | | | | | | | | | | | Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: versatile: get rid of private platform amba_device initializerRussell King2012-01-253-38/+28
| | | | | | | | | | | | | | | | | | | | Tested-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: vexpress: get rid of private platform amba_device initializerRussell King2012-01-253-31/+14
| | | | | | | | | | | | | | | | | | | | Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: provide common initializers for static amba devicesRussell King2012-01-251-0/+33
| | | | | | | | | | | | | | | | | | | | Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: make use of -1 IRQs warnRussell King2012-01-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Make the core warn about the use of -1 (NO_IRQ) Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: u300: get rid of NO_IRQ initializersRussell King2012-01-251-3/+3
| | | | | | | | | | | | | | | | | | | | Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: spear: get rid of NO_IRQ initializersRussell King2012-01-253-8/+8
| | | | | | | | | | | | | | | | | | | | Acked-by: Viresh Kumar <viresh.kumar@st.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: netx: get rid of NO_IRQ initializersRussell King2012-01-251-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: nomadik: get rid of NO_IRQ initializersRussell King2012-01-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Acked-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: mxs: get rid of NO_IRQ initializersRussell King2012-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | Acked-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: lpc32xx: get rid of NO_IRQ initializersRussell King2012-01-251-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: integrator/realview/versatile/vexpress: get rid of NO_IRQ ↵Russell King2012-01-2510-129/+129
| | | | | | | | | | | | | | | | | | | | | | | | initializers Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: samsung: get rid of NO_IRQ initializersRussell King2012-01-254-7/+7
| | | | | | | | | | | | | | | | | | | | Acked-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: get rid of NO_IRQ initializersRussell King2012-01-251-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: amba: ux500: get rid of NO_IRQRussell King2012-01-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | irq 0 now means no irq, so get rid of this unnecessary initializer. Acked-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
OpenPOWER on IntegriCloud