summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-rmk' of ↵Russell King2008-10-0927-115/+1270
|\ | | | | | | | | | | git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git Merge branch 'imx-devel' into devel
| * MX2: Add DMA support for mx2 and (eventually) mx1Sascha Hauer2008-09-093-1/+930
| | | | | | | | | | | | | | | | This patch adds DMA support for Freescale i.MX27 SoCs. It is derived from the i.MX1 port and should (though currently untested) still be working for the i.MX1. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX: Add FIQ supportPaulius Zaleckas2008-09-092-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Drivers which are going to use it will have to select it and use imx_set_irq_fiq() to set FIQ mode for this interrupt. Changes since V1: - removed '#ifdef CONFIG_FIQ' from irqs.h - renamed imx_set_irq_type() to imx_set_irq_fiq() - made irqt unsigned - fixed irq number check Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MXC: Remove WD IRQ priority settingDarius Augulis2008-09-091-5/+0
| | | | | | | | | | | | | | | | Remove WD IRQ priority setting from ARCH_MXC common init code, because it's application specific. Signed-off-by: Darius Augulis <augulis.darius@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX3: Fix compiler warningsLuotao Fu2008-09-094-3/+7
| | | | | | | | | | | | | | Fix some base address declaration by adding a cast. Signed-off-by: Luotao Fu <l.fu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MXC: add RTCK alternate function definitionsLuotao Fu2008-09-091-0/+2
| | | | | | | | | | | | | | | | | | This one adds definitions to configure RTCK pad (PE16) in primary and alternate function. The RTCK Pin is used by one wire master controller and as JTAG Clock return. Signed-off-by: Luotao Fu <l.fu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mxc: add cscr register defintionsLuotao Fu2008-09-091-0/+6
| | | | | | | | | | | | | | | | | | | | This adds macros to get CSCR upper, lower and additional registers. These registers are needed to configure a chip select line. The offset layouts of these Registers are identical on mx27 and mx31, hence we can use the macros in generic way Signed-off-by: Luotao Fu <l.fu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MX31: add macros to configure spi pinsLuotao Fu2008-09-091-0/+20
| | | | | | | | | | | | | | | | this adds convenience values usable by mxc_iomux_mode() to configure Pins of the spi interfaces on mx31. Signed-off-by: Luotao Fu <l.fu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MXC: Lets handle IRQ by priority, defined with exported API functionDarius Augulis2008-09-094-11/+48
| | | | | | | | | | Signed-off-by: Darius Augulis <augulis.darius@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX31ADS: Add CPLD interrupts demultiplexing (take 3).Gilles Chanteperdrix2008-09-092-1/+93
| | | | | | | | | | | | | | | | Needed for 8250 serial port and CS89x0 ethernet interface. Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX31ADS: Enable the first IMX serial port. (take 3)Gilles Chanteperdrix2008-09-091-0/+23
| | | | | | | | | | | | Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX27: add definitions for USB pinsSascha Hauer2008-09-091-0/+22
| | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX2: make SoC devices globally availableSascha Hauer2008-09-094-52/+34
| | | | | | | | | | | | | | | | Make SoC devices globally available to boards rather than using a device specific init function. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX3: make SoC devices globally availableSascha Hauer2008-09-093-40/+15
| | | | | | | | | | | | | | | | Make SoC devices globally available to boards rather than using a device specific init function. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MXC: add convenience function to register platform devicesSascha Hauer2008-09-093-1/+40
| | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'pxa-all' into develRussell King2008-10-09193-5311/+15153
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/corgi.c arch/arm/mach-pxa/include/mach/hardware.h arch/arm/mach-pxa/spitz.c
| * | [ARM] 5239/1: Palm Zire 72 power management supportSergey Lapin2008-10-092-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contains Palm Zire 72 power management support. Depends on #5238/1 Signed-off-by: Sergey Lapin <slapin@ossfans.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5298/1: Drop desc_handle_irq()Dmitry Baryshkov2008-10-0942-162/+72
| | | | | | | | | | | | | | | | | | | | | | | | desc_handle_irq() was declared as obsolete since long ago. Replace it with generic_handle_irq() Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] pxa: allow multi-machine PCMCIA buildsRussell King2008-10-071-9/+11
| | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] pxa: add preliminary CPUFREQ support for PXA3xxEric Miao2008-10-072-0/+259
| | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.hEric Miao2008-10-071-0/+22
| | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.cEric Miao2008-10-072-2/+6
| | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] pxa/zylonite: add support for USB OHCIEric Miao2008-10-073-0/+25
| | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] ohci-pxa27x: use ioremap() and offset for register accessEric Miao2008-10-072-84/+109
| | | | | | | | | | | | | | | | | | | | | | | | This avoid the pre-mapping of OHCI controller register space, and the mapping is made only when necessary (OHCI is probed). Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()Eric Miao2008-10-072-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Direct access to pxa27x specific register PSSR in a generic ohci driver is no good, introduce pxa27x_clear_otgph() and move the implementation into processor specific code. Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resourceEric Miao2008-10-071-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Depending on the order of how resource is defined in the platform device is not good, use platform_get_{irq,resource} for the IRQ and memory resources. Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] ohci-pxa27x: move OHCI controller specific registers into the driverEric Miao2008-10-072-75/+72
| | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registersEric Miao2008-10-0712-104/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Direct access to USB host controller registers is considered to be not portable, and is usually a bad sign for poorly abstracted interface. Introduce .flags and .power_on_delay to "struct pxaohci_platform_data" so that most platforms don't bother to write their own .init/.exit() sequences. Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.cEric Miao2008-10-072-38/+41
| | | | | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] pxa: simplify DMA register definitionsEric Miao2008-10-076-173/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. DRCMRxx is no longer recommended, use DRCMR(xx) instead, and pass DRCMR index by "struct resource" if possible 2. DCSRxx, DDADRxx, DSADRxx, DTADRxx, DCMDxx is never used, use DCSR(), DDADR(), DSADR(), DTADR(), DCMD() instead Signed-off-by: Eric Miao <eric.miao@marvell.com> Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] pxa: make additional DCSR bits valid for PXA3xxEric Miao2008-10-071-6/+7
| | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] pxa: move i2c register and bit definitions into i2c-pxa.cEric Miao2008-10-072-44/+39
| | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] pxa: fix incorrect initialization of mfp sysdev when not pxa2xxEric Miao2008-10-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | The initialization of mfp sysdev in pxa2xx_mfp_init() shall really be avoided when !cpu_is_pxa2xx(). Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | Merge branches 'pxa-core' and 'pxa-machines' into pxa-allRussell King2008-10-071025-14250/+47324
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c
| | * \ Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-imRussell King2008-10-0711-436/+456
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pxa-eseries' into pxa-machines Conflicts: arch/arm/mach-pxa/Makefile
| | | * | [ARM] eseries: move UDC defs to machine filesIan Molton2008-08-1910-58/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patchset moves the UDC definitons for e7xx compatible eseries machines to a common location and moves the 'oddball' e800 definition to its machine file. Signed-off-by: Ian Molton <spyro@f2s.com>
| | | * | [ARM] eseries: move LCD defs into machine filesIan Molton2008-08-199-451/+349
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the seperate files used for the LCD definitions on e-series and places the definitions into the machine specific files. Signed-off-by: Ian Molton <spyro@f2s.com>
| | | * | [ARM] eseries: Split machine definitionsIan Molton2008-08-199-154/+295
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patchset breaks out the e-series machine definitions into one-per-machine. Signed-off-by: Ian Molton <spyro@f2s.com>
| | * | | Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-armRussell King2008-10-0715-52/+2994
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pxa-viper' into pxa-machines Conflicts: arch/arm/mach-pxa/Makefile drivers/pcmcia/Kconfig drivers/pcmcia/Makefile
| | | * | | Add default configuration for Arcom/Eurotech Viper SBCMarc Zyngier2008-09-091-0/+1678
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marc Zyngier <marc.zyngier@altran.com>
| | | * | | Add support for the Arcom/Eurotech Viper SBC CompactFlash card slotMarc Zyngier2008-09-094-23/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Arcom/Eurotech Viper needs some extra care to run. On this board, the PC104 connector is actually wired to the second PCMCIA slot. Therefore, this second socket needs to be enabled, despite not being managed by the PCMCIA code. I'd rather have the MECR setup in the platform support code so I could, for example, use the PC104 bus without having the PCMCIA module loaded. Signed-off-by: Marc Zyngier <marc.zyngier@altran.com>
| | | * | | Add support for the Arcom/Eurotech Viper SBC onboard ethernet.Marc Zyngier2008-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marc Zyngier <marc.zyngier@altran.com>
| | | * | | Basic support for the Arcom/Eurotech Viper SBC.Marc Zyngier2008-09-094-0/+1057
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marc Zyngier <marc.zyngier@altran.com>
| | | * | | Export smc91x led definitionsMarc Zyngier2008-09-092-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we can configure smc91x leds from its platform data, it seems rather useful to move the led definitions to the externally visible header file. Signed-off-by: Marc Zyngier <marc.zyngier@altran.com>
| | | * | | Merge branch 'smc91x' into pxa-viperRussell King2008-09-073-2/+11
| | | |\ \ \
| | * | \ \ \ Merge branch 'pxa-palm' into pxa-machinesRussell King2008-10-0720-452/+2403
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/mfd/Kconfig drivers/pcmcia/Makefile
| | | * | | | | [ARM] 5248/1: wm97xx generic battery driverMarek Vašut2008-10-026-203/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds generic battery driver for wm97xx chips. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Anton Vorontsov <cbouatmailru@gmail.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | | | | [ARM] 5238/2: Very basic Palm Zire 72 supportSergey Lapin2008-09-266-0/+1515
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contains very basic support of Palm Zire 72. Signed-off-by: Sergey Lapin <slapin@ossfans.org> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | | | | [ARM] 5184/1: Split ucb1400_ts into core and touchscreenMarek Vašut2008-08-206-248/+412
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch splits ucb1400_ts into ucb1400_ts and ucb1400_core. Since this chip supports more features than only touchscreen, it was necessary to prepare it for feature addition. The previous functionality is preserved by applying this patch. [Build fixes for non-ARM by Stephen Rothwell and Takashi Iwai] Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | | | | [ARM] 5199/1: PalmLD: PCMCIA driverMarek Vašut2008-08-162-1/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PCMCIA driver for Palm LifeDrive Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
OpenPOWER on IntegriCloud