summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'devel' of ↵Russell King2010-05-13297-5113/+4981
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
| * [ARM] pxa: add namespace on sspHaojian Zhuang2010-05-114-87/+87
| | | | | | | | | | | | | | | | In order to prevent code ambiguous, add namespace on functions in ssp driver. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] mmp: append device support in jasperHaojian Zhuang2010-05-111-0/+64
| | | | | | | | | | | | | | | | | | Support regulator MAX8649, PMIC MAX8925 into the Jasper. Backlight & power supply components of MAX8925 are enabled in Jasper. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] mmp: update twsi indexHaojian Zhuang2010-05-111-7/+7
| | | | | | | | | | | | | | Sync twsi index to register index. It's used to avoid typo error. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] mmp: add smc registers definitionMingliang Hu2010-05-111-0/+37
| | | | | | | | | | | | Signed-off-by: Mingliang Hu <mhu4@marvell.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] mmp: add dma support to mmp2Haojian Zhuang2010-05-111-0/+2
| | | | | | | | | | | | | | | | Add DMA support in MMP2. Signed-off-by: Lei Wen <leiwen@marvell.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] mmp: update mfp settingHaojian Zhuang2010-05-113-16/+221
| | | | | | | | | | | | | | Update mfp setting for mmp2. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] mmp: fix clock tick rate in mmp2Mingliang Hu2010-05-111-0/+4
| | | | | | | | | | | | | | | | In MMP2, clock tick rate should be 6500000. Signed-off-by: Mingliang Hu <mhu4@marvell.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] mmp: configure gpio pins from 128 to 192Haojian Zhuang2010-05-111-1/+1
| | | | | | | | | | | | | | | | In mmp2, 6 banks of GPIO registers are supported. So we can support 192 GPIO pins at most. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] mmp: update mmp2 defconfigHaojian Zhuang2010-05-111-23/+50
| | | | | | | | | | | | | | | | Enable MAX8649 & MAX8925 regulator, dynamic debug, Marvell Jasper platform. Disable DNOTIFY, MAX8660 regulator, 88pm860x PMIC. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] mmp: enable L2 in mmp2Haojian Zhuang2010-05-113-1/+8
| | | | | | | | | | | | | | Enable Tauros2 L2 in mmp2. Tauros2 L2 is shared in Marvell ARM cores. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] mmp: update clock register functionHaojian Zhuang2010-05-111-1/+1
| | | | | | | | | | | | | | Use clk_add_table in order to sync with clock driver. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecondEric Miao2010-05-1126-41/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delay_detect in HZ is confusing, convert it to be millisecond based. And thus remove those unnecessary call to msecs_to_jiffies() at runtime for this field. Other constants are converted assuming HZ == 100, which are basically true for those platforms. The assignment in csb726.c was incorrect, and is fixed in this patch as a result. Signed-off-by: Eric Miao <eric.y.miao@gmail.com> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Acked-by: Marc Zyngier <maz@misterjones.org> Acked-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Daniel Mack <daniel@caiaq.de>
| * MAINTAINERS: New MAINTAINERS entries for Zipit Z2 and Voipac PXA270Marek Vasut2010-05-111-0/+14
| | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/vpac270: fix now invalid bit of UP2OCRMarek Vasut2010-05-111-2/+2
| | | | | | | | | | | | | | | | This patch removes write to UP2OCR[DMSTATE] (ex-UP2OCR_DPPUBE) which is invalid on PXA270C5 and later. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/vpac270: add OneNAND supportMarek Vasut2010-05-111-3/+48
| | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/vpac270: remove TS_IRQ magic numberMarek Vasut2010-05-112-1/+3
| | | | | | | | | | | | | | | | The touchscreen GPIO IRQ was used as a magic number. Define it properly in the board header file. This is a simple cleanup patch. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/vpac270: add ide supportMarek Vasut2010-05-113-0/+53
| | | | | | | | | | | | | | | | | | | | This patch adds support for the on-board IDE channel. I tested this with a CDROM connected over 2.5-3.5 IDE reduction with external power supplied to the CDROM. This was not tested with the Voipac 270-HDD-000 (official Voipac HDD module), but I expect no problems. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/vpac270: Add DS1339 RTC supportMarek Vasut2010-05-111-0/+26
| | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/vpac270: Add touchscreen supportMarek Vasut2010-05-111-0/+42
| | | | | | | | | | | | | | This adds support for the UCB1400 touchscreen found in the VPAC270 device. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/vpac270: add ethernet supportMarek Vasut2010-05-112-0/+52
| | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/vpac270: UDC and UHC supportMarek Vasut2010-05-112-0/+79
| | | | | | | | | | | | | | | | | | | | | | NOTE: I wasn't able to get it running without reseting the HXOE (so it's there based on my tests with the hardware). I'll have to investigate it properly when I have more time. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Reviewed-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: add support for Voipac PXA270 PCMCIAMarek Vasut2010-05-115-1/+260
| | | | | | | | | | | | | | PCMCIA support for Voipac PXA270 Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: add basic support for Voipac PXA270 SBCMarek2010-05-114-0/+338
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds basic support for the Voipac PXA270 SBC. The device consists of the following hardware: - PXA270 @ 520 MHz - 256MB RAM (sparsemem, 2*128MB regions) - 64MB NOR flash - 640x480 LCD - Ports: 2xUHC, 1xUDC, 1xPCMCIA, VGA, FFUART, 2xPS2, Speaker, MIC Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: add basic support for the Aeronix Zipit Z2 handheldMarek Vasut2010-05-114-0/+657
| | | | | | | | | | | | | | | | | | This patch adds support for the Zipit Z2. The parts missing from this patch are the battery support, SPI driver for the LCD and support for the Silicon Serial ID chip. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/cm-x300: update the memory fixup.Igor Grinberg2010-05-111-7/+7
| | | | | | | | | | | | | | | | | | | | | | CM-X300 bootloader passes DRAM configuration information in ATAGS, however, the first memory bank is reported at actual physical address 0x8000000. Use the configuration information supplied by the bootloader and cope with the necessity to have PHYS_ADDR=0xa0000000. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/cm-x300: add regulator on vcc_coreIgor Grinberg2010-05-111-0/+27
| | | | | | | | | | Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/cm-x300: fix da903x IRQ line assignmentIgor Grinberg2010-05-111-1/+1
| | | | | | | | | | Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/cm-x300: da903x WLED is not connected on cm-x300Igor Grinberg2010-05-111-4/+0
| | | | | | | | | | Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/cm-x300.c: add battery charger supportIgor Grinberg2010-05-111-1/+56
| | | | | | | | | | Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: remove pxa_gpio_mode() and filesEric Miao2010-05-113-407/+0
| | | | | | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * input: remove obsolete {corgi,spitz,tosa}kbd.cEric Miao2010-05-116-1393/+0
| | | | | | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/tosa: move CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES to mach/KconfigEric Miao2010-05-113-11/+13
| | | | | | | | | | | | | | | | Tosa is now able to use generic matrix keypad driver instead of the deprecated tosakbd.c, where CONFIG_KEYBOARD_TOSA_USE_EXT_KEYCODES is still useful. Move it to mach/Kconfig. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/corgi: cleanup GPIO configurations and low power mode settingsEric Miao2010-05-112-59/+32
| | | | | | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/corgi: use generic GPIO API and remove pxa_gpio_mode()Eric Miao2010-05-112-21/+25
| | | | | | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/spitz: use generic GPIO API and remove pxa_gpio_mode()Eric Miao2010-05-112-8/+24
| | | | | | | | | | | | | | | | REVISIT: change to GPIO18 is ugly, need to make sure whether that's really necessary - GPIO18_RDY as an VLIO input signal - we don't normally need to do such kind of trick during low power mode. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: allow MFP_LPM_INPUT to be explicitly specifiedEric Miao2010-05-112-0/+2
| | | | | | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: allow keypad GPIOs to wakeup when configured as genericEric Miao2010-05-111-9/+22
| | | | | | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: add MFP_LPM_KEEP_OUTPUT flag to pin configEric Miao2010-05-112-0/+13
| | | | | | | | | | | | | | Some pins are expected to keep their last level during suspend, and introduce MFP_LPM_KEEP_OUTPUT for this. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: use resource_size() in ssp.cJulia Lawall2010-05-111-4/+4
| | | | | | | | | | Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: avoid NULL dereferencing in error handling of ssp.cJulia Lawall2010-05-111-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assignments of res to the results of the two calls to platform_get_resource make it impossible to use res in the error handling code in the arguments to release_mem_region. The semantic match that finds the former problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r exists@ expression E, E1; identifier f; statement S1,S3; iterator iter; @@ if ((E == NULL && ...) || ...) { ... when != false ((E == NULL && ...) || ...) when != true ((E != NULL && ...) || ...) when != iter(E,...) S1 when != E = E1 ( sizeof(E->f) | * E->f ) ... when any return ...; } else S3 // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] mmp: enable ssp in aspeniteHaojian Zhuang2010-05-111-0/+13
| | | | | | | | | | | | | | Configure both ssp and wm8753 in aspenite. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] mmp: support ssp in pxa168Haojian Zhuang2010-05-116-10/+48
| | | | | | | | | | | | | | Support ssp devices in PXA168. PXA168 could reuse the code of PXA SSP. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: simplify ifdef in ssp.hHaojian Zhuang2010-05-111-26/+15
| | | | | | | | | | | | | | | | | | Try to keep minimum ifdef in ssp.h. Some of the definitions are valid only to specific SoCs, and device drivers should be responsible to take care of these difference. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: remove incorrect select PXA_SSP in KconfigEric Miao2010-05-112-13/+1
| | | | | | | | | | | | | | | | PXA_SSP is actually used by drivers like drivers/spi/pxa2xx_spi.c and sound/soc/pxa/pxa-ssp.c, not by boards. Remove those incorrect 'select' from Kconfig and make SOC_PXA_SSP to select. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: move ssp into common plat-pxaHaojian Zhuang2010-05-119-10/+10
| | | | | | | | | | | | Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: remove unnecessary #include of <mach/ssp.h>Eric Miao2010-05-113-3/+0
| | | | | | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: merge regs-ssp.h into ssp.hEric Miao2010-05-115-130/+122
| | | | | | | | | | | | No need to separate them as they should be together from the begining. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: correct SSCR0_SCR to support multiple SoCsEric Miao2010-05-112-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | The previous definitions of SSCR0_SCR and SSCR0_SerClkDiv() prevented them being used simultaneously when supporting multiple PXA SoCs, esp. in drivers/spi/pxa2xx_spi.c, make them correct. The change from SSCR0_SerClkDiv(2) to SSCR0_SCR(2), will make the result a little bit different in pxa2xx_spi_probe(), however, since that's only used as a default initialization value, it's acceptable. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: remove the now legacy SSP APIEric Miao2010-05-113-326/+0
| | | | | | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
OpenPOWER on IntegriCloud