aboutsummaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAge
* Merge branch 'for-armsoc' of ↵Arnd Bergmann2012-03-15
|\ | | | | | | | | | | | | | | | | | | | | | | | | http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2 Conflicts: arch/arm/mach-tegra/common.c arch/arm/mach-ux500/devices-common.c This resolves two conflicts and lets us merge the exynos5 branch cleanly. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux ↵Russell King2012-02-22
| |\ | | | | | | | | | into for-armsoc
| | * ARM: remove disable_fiq and arch_ret_to_user macrosRob Herring2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that most platforms don't need disable_fiq and arch_ret_to_user macros, we can remove the empty macros or empty entry-macro.S files. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Nicolas Pitre <nico@linaro.org> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Ryan Mallon <rmallon@gmail.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: Shawn Guo <shawn.guo@linaro.org>
| | * ARM: make entry-macro.S depend on !MULTI_IRQ_HANDLERRob Herring2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the removal of disable_fiq on rpc and addition MULTI_IRQ_HANDLER, entry-macro.S is no longer needed for platforms that select MULTI_IRQ_HANDLER and the include of it can be conditional. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Nicolas Pitre <nico@linaro.org> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
| | * ARM: rpc: make default fiq handler run-time installedRob Herring2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Only rpc uses disable_fiq macro. Change it to a run-time installed default FIQ handler. The handler is installed before FIQ is enabled so the behavior should be unchanged. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Nicolas Pitre <nico@linaro.org>
| | * ARM: make arch_ret_to_user macro optionalRob Herring2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | Only 3 platforms need arch_ret_to_user macro, so add ARCH_HAS_RET_TO_USER kconfig option and make iop13xx, iop32x and iop33x select it. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Nicolas Pitre <nico@linaro.org>
| * | Merge tag 'v3.3-rc2' into depends/rmk/for-armsocOlof Johansson2012-02-07
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were conflicts between fixes going in after 3.3-rc1 and Russell's stable arm-soc base branch. Resolving it in the dependency branch so that each topic branch shares the same resolution. Conflicts: arch/arm/mach-at91/at91cap9.c arch/arm/mach-at91/at91sam9g45.c
| * \ \ Merge branch 'amba' into for-armsocRussell King2012-01-26
| |\ \ \
| | * | | ARM: amba: samsung: use common amba device initializersRussell King2012-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | 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-26
| | | | | | | | | | | | | | | | | | | | | | | | | 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-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-26
| | | | | | | | | | | | | | | | | | | | | | | | | 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-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | ARM: amba: netx: use common amba device initializersRussell King2012-01-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | ARM: amba: bcmring: use common amba device initializersRussell King2012-01-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | ARM: amba: ep93xx: use common amba device initializersRussell King2012-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | 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-26
| | | | | | | | | | | | | | | | | | | | | | | | | 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-26
| | | | | | | | | | | | | | | | | | | | | | | | | 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-26
| | | | | | | | | | | | | | | | | | | | | | | | | 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-25
| | | | | | | | | | | | | | | | | | | | | | | | | 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-25
| | | | | | | | | | | | | | | | | | | | | | | | | Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | ARM: amba: u300: get rid of NO_IRQ initializersRussell King2012-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | 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-25
| | | | | | | | | | | | | | | | | | | | | | | | | 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-25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | ARM: amba: nomadik: get rid of NO_IRQ initializersRussell King2012-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-25
| | | | | | | | | | | | | | | | | | | | | | | | | 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-25
| | | | | | | | | | | | | | | | | | | | 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-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initializers Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | ARM: amba: samsung: get rid of NO_IRQ initializersRussell King2012-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | 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-25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | ARM: amba: ux500: get rid of NO_IRQRussell King2012-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | ARM: amba: mxs: convert to use amba_device_allocRussell King2012-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | ARM: amba: integrator: convert to use amba_device_allocRussell King2012-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert Integrator IM/PD-1 to use the new amba_device_alloc APIs. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | ARM: amba: ux500: convert to use amba_device_allocRussell King2012-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | ARM: 7300/1: realview: fix definition of GPIO0 interrupt on PB1176 to match TRMWill Deacon2012-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, -1 is used as the GPIO0 interrupt on realview PB1176 and an AMBA device is registered with this parameter. With the pending NO_IRQ cleanup, this will lead to a warning at boot time, since -1 is obviously broken. This patch updates the interrupt used for GPIO0 to match that specified by the TRM. Unfortunately, it's not clear how to trigger this interrupt so we trust that the documentation is correct. Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | | Merge branches 'debug' and 'idle' into for-armsocRussell King2012-01-23
| |\ \ \ \
| | * | | | ARM: big removal of now unused arch_idle()Nicolas Pitre2012-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this is the only content remaining in mach/system.h then the whole file is removed. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-and-tested-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: David Brown <davidb@codeaurora.org> Acked-by: Stephen Warren <swarren@nvidia.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
| | * | | | ARM: substitute arch_idle()Nicolas Pitre2012-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that all implementations of arch_idle() are equivalent to cpu_do_idle() we can just use the later directly and stop including mach/system.h. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-and-tested-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Tony Lindgren <tony@atomide.com> Tested-by: Stephen Warren <swarren@nvidia.com>
| | * | | | ARM: mach-tegra: properly disable CPU idle callNicolas Pitre2012-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Stephen Warren <swarren@nvidia.com>
| | * | | | ARM: mach-s3c64xx: use standard arch_idle() implementationNicolas Pitre2012-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: nicolas Pitre <nicolas.pitre@linaro.org> Tested-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| | * | | | ARM: mach-w90x900: properly disable CPU idle callNicolas Pitre2012-01-20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: nicolas Pitre <nicolas.pitre@linaro.org>
| | * | | | ARM: mach-shark: properly disable CPU idle callNicolas Pitre2012-01-20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * | | | ARM: mach-ixp4xx: properly disable CPU idle callNicolas Pitre2012-01-20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * | | | ARM: mach-ixp23xx: properly disable CPU idle callNicolas Pitre2012-01-20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * | | | ARM: mach-msm: hook special idle handlers to arm_pm_idleNicolas Pitre2012-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: David Brown <davidb@codeaurora.org>
| | * | | | ARM: plat-mxc: hook special idle handlers to arm_pm_idleNicolas Pitre2012-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and remove redundant include of <mach/system.h>. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * | | | ARM: s3c24xx: move special idle code to out of lineNicolas Pitre2012-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and hook it to arm_pm_idle. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * | | | ARM: mach-h720x: move special idle code out of lineNicolas Pitre2012-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and hook it to arm_pm_idle. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| | * | | | ARM: mach-gemini: move special idle code out of lineNicolas Pitre2012-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and hook it to arm_pm_idle. Signed-off-by: nicolas Pitre <nicolas.pitre@linaro.org>
| | * | | | ARM: mach-ebsa110: move special idle code out of lineNicolas Pitre2012-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and hook it to arm_pm_idle. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-21 05:47:35 -0400