summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-06-14Merge branch 'for-rmk' of ↵Russell King
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
2009-06-14Merge branch 'copy_user' of git://git.marvell.com/orion into develRussell King
2009-06-13MAINTAINERS: update Eric Miao's email address and statusEric Miao
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2009-06-13fb: add support of LCD display controller on pxa168/910 (base layer)Lennert Buytenhek
This driver is originally written by Lennert, modified by Green to be feature complete, and ported by Jun Nie and Kevin Liu for pxa168/910 processors. The patch adds support for the on-chip LCD display controller, it currently supports the base (graphics) layer only. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: Green Wan <gwan@marvell.com> Cc: Peter Liao <pliao@marvell.com> Signed-off-by: Jun Nie <njun@marvell.com> Signed-off-by: Kevin Liu <kliu5@marvell.com> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2009-06-11[ARM] 5552/1: ep93xx get_uart_rate(): use EP93XX_SYSCON_PWRCNT and ↵Matthias Kaehlcke
EP93XX_SYSCON_PWRCN ep93xx: get_uart_rate() uses the constants EP93XX_SYSCON_CLOCK_CONTROL and EP93XX_SYSCON_CLOCK_UARTBAUD, which no longer exist. Use EP93XX_SYSCON_PWRCNT and EP93XX_SYSCON_PWRCNT_UARTBAUD instead Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-06-11[ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routinesPavel Machek
For suspend/resume to work, spitz needs pxa_pm_suspend/resume to be called. Otherwise PSPR is not set properly, and system will die during resume. Signed-off-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2009-06-11[ARM] 5544/1: Trust PrimeCell resource sizesLinus Walleij
I found the PrimeCell/AMBA Bus drivers distrusting the resource passed in as part of the struct amba_device abstraction. This patch removes all hard coded resource sizes found in the PrimeCell drivers and move the responsibility of this definition back to the platform/board device definition, which already exist and appear to be correct for all in-tree users of these drivers. We do this using the resource_size() inline function which was also replicated in the only driver using the resource size, so that has been changed too. The KMI_SIZE was left in kmi.h in case someone likes it. Test-compiled against Versatile and Integrator defconfigs, seems to work but I don't posess these boards and cannot test them. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-06-11Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into develRussell King
Conflicts: arch/arm/Kconfig arch/arm/kernel/smp.c arch/arm/mach-realview/Makefile arch/arm/mach-realview/platsmp.c
2009-06-11Merge branch 'w90x900' into develRussell King
2009-06-11[ARM] pxa/sharpsl_pm: cleanup of gpio-related code.Dmitry Eremin-Solenikov
Replace calls to pxa_gpio_mode with respective gpio_request() / gpio_direction_input(). In principle these calls can be dropped as the only use of those GPIO are IRQs and IRQ code does setup GPIO correctly. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-06-11[ARM] pxa/sharpsl_pm: drop set_irq_type callsDmitry Eremin-Solenikov
Merge set_irq_type() into respective request_irq() calls. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-06-11[ARM] pxa/sharpsl_pm: merge pxa-specific code into generic oneDmitry Eremin-Solenikov
As pxa now is the only user of sharpsl_pm we can drop several startup functions into generic code thus dropping several global functions. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-06-11[ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specificDmitry Eremin-Solenikov
collie_pm was the only non-PXA user of sharpsl_pm. Now as it's gone we can merge code into one single file to allow further cleanup. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-06-11[ARM] sa1100: remove unused collie_pm.cDmitry Eremin-Solenikov
This file was never enabled in the mainline kernel, new ongoing work on battery driver by Thomas Kunze makes it completely obsolete, so remove it now. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-06-11[ARM] pxa: fix the conflicting non-static declarations of global_gpios[]Eric Miao
Signed-off-by: Eric Miao <eric.y.miao@gmail.com> Cc: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
2009-06-11[ARM] 5550/1: Add default configure file for w90p910 platformwanzongshun
Add default configure file for w90p910 platform. Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-06-11[ARM] 5549/1: Add clock api for w90p910 platform.wanzongshun
Add clock api for w90p910 platform. Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-06-11[ARM] 5548/1: Add gpio api for w90p910 platformwanzongshun
Add gpio api for w90p910 platform. Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-06-11[ARM] 5551/1: Add multi-function pin api for w90p910 platform.wanzongshun
Add multi-function pin api for w90p910 platform. Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-06-10[ARM] Make ARM_VIC_NR depend on ARM_VICRussell King
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-06-10Merge branch for-rmk-devel of git://aeryn.fluff.org.uk/bjdooks/linux into develRussell King
2009-06-10Merge branch 'ep93xx' into develRussell King
2009-06-10Merge branch 'at91' into develRussell King
2009-06-10[ARM] 5546/1: ARM PL022 SSP/SPI driver v3Linus Walleij
This adds a driver for the ARM PL022 PrimeCell SSP/SPI driver found in the U300 platforms as well as in some ARM reference hardware, and in a modified version on the Nomadik board. Reviewed-by: Alessandro Rubini <rubini-list@gnudd.com> Reviewed-by: Russell King <linux@arm.linux.org.uk> Reviewed-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-06-10Merge branch 'for_rmk' of ↵Russell King
git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into devel
2009-06-09ARM: OMAP4: SMP: Update defconfig for OMAP4430Santosh Shilimkar
This patch updates omap_4430sdp_defconfig to add SMP and LOCAL_TIMER support for OMAP4430 SDP platform. Additionally the defconfig is made in sync with 2.6.30-rc7 Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2009-06-09ARM: OMAP4: SMP: Enable SMP support for OMAP4430Santosh Shilimkar
This patch enables SMP on OMAP4430 SDP platform. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2009-06-09ARM: OMAP4: SMP: Add mpu timer support for OMAP4430Santosh Shilimkar
This patch adds SMP platform specific parts for local(mpu) timer support for OMAP4430 platform. Each Cortex-a9 core has it's own local timer in the MPU domain. These timers are not in wakeup domain. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2009-06-09ARM: OMAP4: SMP: Add OMAP4430 SMP board filesSantosh Shilimkar
This patch adds SMP platform files support for OMAP4430SDP. TI's OMAP4430 SOC is based on ARM Cortex-A9 SMP architecture. It's a dual core SOC with GIC used for interrupt handling and SCU for cache coherency. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2009-06-08Merge branch 'for-rmk' of git://git.marvell.com/orion into develRussell King
2009-06-08Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King
devel
2009-06-08[ARM] Kirkwood: platform device registration for the crypto engineNicolas Pitre
Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-06-08[ARM] Kirkwood: create a mapping for the Security Accelerator SRAMNicolas Pitre
Always creating the physical mapping should do no harm, so let's remove the interface that was provided for its optional creation and make the mapping static. Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-06-08[ARM] Kirkwood: let's use real size for resourcesNicolas Pitre
We don't have to define resources to the minimal physical window size as setup_cpu_win() will cope with smaller sizes already. Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-06-08[ARM] orion5x: add sram support for cryptoSebastian Andrzej Siewior
The security accelerator which can act as a puppet player for the crypto engine requires its commands in the sram. This patch adds support for the phys mapping and creates a platform device for the actual driver. [ nico: renamed device name from "mv,orion5x-crypto" to "mv_crypto" so to match the module name and be more generic for Kirkwood use ] Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-06-08[ARM] orion5x: WNR854T switch supportImre Kaloz
This patch adds support for the switch found on the Netgear WNR854T router. Signed-off-by: Imre Kaloz <kaloz@openwrt.org> Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-06-08[ARM] Orion/Kirkwood: rename orion5x_wdt to orion_wdtNicolas Pitre
The Orion watchdog driver is also used on Kirkwood. Convention is to use orion5x for stuff specific to 88F5xxx Orion chips and simply "orion" for shared stuff across SoCs including Kirkwood. Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-06-08[ARM] Kirkwood: Add the watchdog timer as a platform device.Thomas Reitmayr
The Kirkwood architecture uses the same watchdog device as the Orion architecture. This patch adds orion5x_wdt as a platform device for Kirkwood. Signed-off-by: Thomas Reitmayr <treitmayr@devbase.at> Tested-by: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-06-08[ARM] orion5x: Change names of defines for Reset-Out-Mask registerThomas Reitmayr
The name of the define for the Reset-Out-Mask register as well as its bit for the watchdog reset are changed to match the names used for Kirkwood (which in turn match the processor specification more closely). There is no functional change. This patch prepares for adding orion5x_wdt as a platform device to Kirkwood. Signed-off-by: Thomas Reitmayr <treitmayr@devbase.at> Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-06-08[ARM] Kirkwood: clock gating for unused peripheralsRabeeh Khoury
To save power: 1. Enabling clock gating of unused peripherals 2. PLL and PHY of the units are also disabled (when possible. Signed-off-by: Rabeeh Khoury <rabeeh@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-06-08[ARM] Kirkwood: rationalize NAND setup a bitNicolas Pitre
Common resource and platform device structures are moved to common.c and only the partition table and chip delay remains a per board parameter. Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-06-08[ARM] orion: convert gpio to use gpiolibErik Benada
Signed-off-by: Erik Benada <erikbenada@yahoo.ca> [ nico: fix locking, additional cleanups ] Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-06-08[ARM] Kirkwood: comment type fixNicolas Pitre
Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-06-08[ARM] Kirkwood: only map peripheral register space onceNicolas Pitre
Just like commit 1419468ab548, let's save some TLB entries by making ioremap() return pointers into the boot-time Kirkwood peripheral iotable mapping whenever someone tries to ioremap any part of the Kirkwood peripheral register space. Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-06-08[ARM] Kirkwood: enable gpio leds/buttons for the mv88f6281gtw_ge boardSiddarth Gore
Signed-off-by: Siddarth Gore <gores@marvell.com> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
2009-06-08[ARM] Kirkwood: add Marvell 88F6281 GTW GE board supportLennert Buytenhek
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
2009-06-08[ARM] orion: make sure sched_clock() usage of cnt32_to_63() is safeNicolas Pitre
With a TCLK = 200MHz, the half period of the hardware timer is roughly 10 seconds. Because cnt32_to_63() must be called at least once per half period of the base hardware counter, it is a bit risky to rely solely on scheduling to generate frequent enough calls. Let's use a kernel timer to ensure this. Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-06-08[ARM] orion: sched_clock implementation for orion platformsStefan Agner
sched_clock implementation for orion platform. Its realized using free-running clocksource timer, which provides a resolution of 7.5ns (depending on tclk). It's derived from PXA's sched_clock implementation. [ nico: renamed orion2ns to tclk2ns, fixed max value in the comment ] Signed-off-by: Stefan Agner <stefan.agner@yahoo.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-06-08[ARM] Kirkwood: CPU idle driverRabeeh Khoury
The patch adds support for Kirkwood cpu idle. Two idle states are defined: 1. Wait-for-interrupt (replacing default kirkwood wfi) 2. Wait-for-interrupt and DDR self refresh Signed-off-by: Rabeeh Khoury <rabeeh@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-06-08MXC : update i.MX21 clock support for USB host.Martin Fuzzey
* Use correct clkdev style usb clock name * Implement rate setting for USB clock * Introduce _clk_generic_round_rate to factorize the (now 3) uses of rounding code. Signed-off-by: Martin Fuzzey <mfuzzey@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>