mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-02 07:29:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
286,652 Commits 1 Branch 928 Tags
0355e2ff4466fa0bddee64e3cdc2ba687372f4e2
Commit Graph

286652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Russell King
0355e2ff44 Merge branch 'sched_clock-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2012-02-04 10:32:18 +00:00
Russell King
bea15fd77f Merge branch 'sparse_irq' of git://sources.calxeda.com/kernel/linux into devel-stable 2012-02-04 10:31:38 +00:00
Marc Zyngier
6905a65879 ARM: Make the sched_clock framework mandatory 
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>
 2012-02-03 11:34:27 +00:00
Marc Zyngier
bc8d849d91 ARM: prima2: convert to common sched_clock() implementation 
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>
 2012-02-03 11:34:26 +00:00
Marc Zyngier
30c9c5b157 ARM: davinci: convert to common sched_clock() implementation 
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>
 2012-02-03 11:34:25 +00:00
Sekhar Nori
5d0ef6ae63 ARM: davinci: time.c: group related header files together 
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>
 2012-02-03 11:34:24 +00:00
Jamie Iles
72ee8499eb ARM: picoxcell: remove mach/irqs.h 
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>
 2012-01-30 13:25:42 -06:00
Rob Herring
fdfa64a4b7 ARM: highbank: select SPARSE_IRQ and remove irqs.h 
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>
 2012-01-30 13:25:42 -06:00
Rob Herring
a2be01b154 ARM: only include mach/irqs.h for !SPARSE_IRQ 
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>
 2012-01-30 13:24:37 -06:00
Russell King
dcf81c1af8 Merge branch 'amba' into for-armsoc 2012-01-26 19:59:44 +00:00
Russell King
75c06963dd ARM: amba: samsung: use common amba device initializers 
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-26 19:59:30 +00:00
Russell King
b5b654f2c7 ARM: amba: spear: use common amba device initializers 
Acked-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-26 19:59:30 +00:00
Russell King
53d68af1c2 ARM: amba: nomadik: use common amba device initializers 
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>
 2012-01-26 19:59:29 +00:00
Russell King
6db2a457dd ARM: amba: u300: use common amba device initializers 
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-26 19:59:29 +00:00
Russell King
e78b68ae76 ARM: amba: lpc32xx: use common amba device initializers 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-26 19:59:29 +00:00
Russell King
d948b454b0 ARM: amba: netx: use common amba device initializers 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-26 19:59:29 +00:00
Russell King
8ede1ae65e ARM: amba: bcmring: use common amba device initializers 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-26 19:59:29 +00:00
Russell King
0b26051b3e ARM: amba: ep93xx: use common amba device initializers 
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-26 19:59:28 +00:00
Russell King
e911ff1746 ARM: amba: omap2: use common amba device initializers 
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-26 19:59:28 +00:00
Russell King
2f64ccd9e0 ARM: amba: integrator: use common amba device initializers 
Tested-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-26 19:59:28 +00:00
Russell King
9199340bf0 ARM: amba: realview: get rid of private platform amba_device initializer 
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-26 19:59:18 +00:00
Rob Herring
250a27237e ARM: shmobile: remove NR_IRQS 
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>
 2012-01-25 20:37:51 -06:00
Rob Herring
4e611091f8 ARM: pxa: remove NR_IRQS 
Remove NR_IRQS and add a per machine .nr_irqs setting.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
 2012-01-25 20:37:49 -06:00
Rob Herring
8661fb9204 ARM: mmp: remove NR_IRQS 
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>
 2012-01-25 20:37:48 -06:00
Rob Herring
0f55239348 sh: intc: remove dependency on NR_IRQS 
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>
 2012-01-25 20:37:48 -06:00
Rob Herring
7f1e76370b sh: intc: unify evt2irq/irq2evt macros for sh and arm 
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>
 2012-01-25 20:37:47 -06:00
Rob Herring
bc0a15171a ARM: it8152: explicitly include mach/irqs.h 
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>
 2012-01-25 20:37:46 -06:00
Rob Herring
bd8abc9a32 ARM: mc146818rtc: remove unnecessary include of mach/irqs.h 
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>
 2012-01-25 20:37:45 -06:00
Rob Herring
ba3e88acfb ARM: remove mc146818rtc.h from time.c 
mc146818rtc.h is not needed in time.c, so remove it.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
 2012-01-25 20:37:44 -06:00
Rob Herring
feefe73fcb gpio: pxa: explicitly include mach/irqs.h 
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>
 2012-01-25 20:37:43 -06:00
Rob Herring
9482ee7175 sound: pxa2xx-ac97: include mach/irqs.h directly 
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>
 2012-01-25 20:37:42 -06:00
Rob Herring
2ed86b16ea irq: make SPARSE_IRQ an optionally hidden option 
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
 2012-01-25 20:37:42 -06:00
Russell King
8f5088b614 ARM: amba: versatile: get rid of private platform amba_device initializer 
Tested-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-25 11:04:03 +00:00
Russell King
cdd4e1a76c ARM: amba: vexpress: get rid of private platform amba_device initializer 
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-25 11:04:03 +00:00
Russell King
cc6e75af8d ARM: amba: provide common initializers for static amba devices 
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-25 11:04:03 +00:00
Russell King
2eac58d502 ARM: amba: make use of -1 IRQs warn 
Make the core warn about the use of -1 (NO_IRQ)

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-25 11:04:02 +00:00
Russell King
3bf9688997 ARM: amba: u300: get rid of NO_IRQ initializers 
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-25 11:04:02 +00:00
Russell King
8395e9dd56 ARM: amba: spear: get rid of NO_IRQ initializers 
Acked-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-25 11:04:02 +00:00
Russell King
0860cc2826 ARM: amba: netx: get rid of NO_IRQ initializers 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-25 11:04:02 +00:00
Russell King
b962f1bb11 ARM: amba: nomadik: get rid of NO_IRQ initializers 
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>
 2012-01-25 11:04:02 +00:00
Russell King
887d5557f6 ARM: amba: mxs: get rid of NO_IRQ initializers 
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-25 11:04:01 +00:00
Russell King
cfbd209f34 ARM: amba: lpc32xx: get rid of NO_IRQ initializers 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-25 11:04:01 +00:00
Russell King
0dada61a29 ARM: amba: integrator/realview/versatile/vexpress: get rid of NO_IRQ initializers 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-25 11:04:01 +00:00
Russell King
8a47ae8b96 ARM: amba: samsung: get rid of NO_IRQ initializers 
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-25 11:02:03 +00:00
Russell King
0250eb5e7d ARM: amba: get rid of NO_IRQ initializers 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-25 11:02:03 +00:00
Russell King
4ce02fdc4e ARM: amba: ux500: get rid of NO_IRQ 
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>
 2012-01-25 11:02:02 +00:00
Russell King
023f117c54 ARM: amba: make irq 0 invalid 
Fix core bus and MMCI such that irq 0 means that there is no IRQ
attached.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-25 11:02:02 +00:00
Russell King
039e7ad892 ARM: amba: mxs: convert to use amba_device_alloc 
Convert MXS to use the new amba_device_alloc APIs.

Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-25 11:02:02 +00:00
Russell King
9a25706b71 ARM: amba: integrator: convert to use amba_device_alloc 
Convert Integrator IM/PD-1 to use the new amba_device_alloc APIs.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2012-01-25 11:02:02 +00:00
Russell King
46d4bb9b52 ARM: amba: ux500: convert to use amba_device_alloc 
Convert ux500 to use the new amba_device_alloc APIs.

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>
 2012-01-25 11:02:02 +00:00