summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-03-08Merge branch 'for-rmk/samsung6' of git://git.fluff.org/bjdooks/linux into ↵Russell King8-595/+267
devel-stable
2010-03-08ARM: Merge next-samsung-s3c2443-clockBen Dooks3-589/+261
Merge branch 'next-samsung-s3c2443-clock' into next-samsung
2010-03-08ARM: S3C2443: Add set_rate and round_rate calls for armdiv clockBen Dooks1-20/+73
Add set_rate and round_rate calls to armdiv for future use with cpu frequency scaling. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-03-08ARM: S3C2443: Remove #if 0 for clk_mpllBen Dooks1-8/+0
The clk_mpll has long been moved into common clock code, remove the code completely instead of the nasty #if 0 block. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-03-08ARM: S3C2443: Update notes on MPLLREF clockBen Dooks1-2/+4
Add note on MPLLREF clock source and why it cannot be easily removed. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-03-08ARM: S3C2443: Further clksrc-clk conversionsBen Dooks2-128/+62
Move more of the core clocks that where left over from the last commit as they are much more core to the system operation. This should allow for easier tracking of any problems. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-03-08ARM: S3C2443: Change to using plat-samsung clksrc-clk implementationBen Dooks3-415/+128
The S3C2443 clock code could easily make use of the clksrc implementation in plat-samsung for many of the clocks. Make the clocks that easily move to clksrc-clk over, update any initialisation and remove the old register definitions from the header file (it is only being used once). Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-03-08USB: Fix s3c-hsotg build following Samsung platform header movesMark Brown1-1/+1
Fix a reference to regs-sys.h got missed in the reorganisation of the Samsung platform headers targetted for 2.6.34. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-03-08ARM: S3C64XX: Reintroduce unconditional build of audio deviceMark Brown1-1/+1
Ben Dooks' commit cf9814eb (ARM: S3C64XX: Make audio device code built unconditionally) made the struct devices for the audio blocks in the S3C64xx series processors be built unconditionally but this change seems to have gone AWOL in the various Samsung platform moves this release cycle, causing link failures with machine drivers that rely on it. Reintroduce the change. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-03-05ASoC: Fix S3C64xx IIS driver for Samsung header reorgMark Brown1-2/+2
The reorgs of the Samsung headers have moved the GPIO bank definitions from plat/ to mach/ - the IIS driver needs to be updated to take care of this. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-03-05ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 supportBen Dooks2-2/+2
Commit 58bac7b8ded70c39bcd5f7037091051c277618aa failed to move the two PLL files s3c2440-pll-12000000.c and s3c2440-pll-16934400.c, so place these in arch/arm/mach-s3c2440 to fix this commit up. As a note, these are not built by the default configuration and thus the failure to move wasn't spotted until much later. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-03-03Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into ↵Russell King229-1454/+7782
devel-stable Conflicts: arch/arm/Kconfig arch/arm/Makefile
2010-03-03Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into ↵Russell King44-229/+11517
devel-stable Conflicts: arch/arm/Kconfig
2010-03-03Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King123-3235/+7603
devel-stable Conflicts: arch/arm/Makefile
2010-03-02[ARM] pxa: fix typo in mxm8x10.hEric Miao1-1/+1
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa/raumfeld: set GPIO drive bits for LED pinsDaniel Mack1-0/+8
Set GPIO bits to pull the pins connected to LEDs for lower power mode. We want all LEDs off when devices are in suspend. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa/zeus: Add support for mcp2515 CAN busMarc Zyngier2-6/+51
Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa/zeus: Add support for onboard max6369 watchdogMarc Zyngier2-7/+14
Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa/zeus: Add Eurotech as the manufacturerMarc Zyngier1-1/+1
Signed-off-by: Amit Walambe <amit.walambe@eurotech.com> Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa/zeus: Correct the USB host initialisation flagsMarc Zyngier1-1/+3
Signed-off-by: Amit Walambe <amit.walambe@eurotech.com> Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompressMarc Zyngier1-0/+6
Zeus console port is wired to a 8250-compatible device (pxa UARTs are reserved to other uses). This patch allows such a configuration in the uncompress sequence. Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa: refactor uncompress.h for non-PXA uartsEric Miao1-7/+28
The original patch came from Marc Zyngier where support of 8250-compatible UART is required to show the uncompress information. Modified a little bit here, including changes below: 1. #include <mach/regs-uart.h> is actually not necessary 2. introduced uart_{read,write}() for different base and shift 3. introduced uart_is_enabled() and assumed enabled always for non-PXA uarts Signed-off-by: Eric Miao <eric.y.miao@gmail.com> Acked-by: Marc Zyngier <maz@misterjones.org>
2010-03-02[ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded ↵Eric Miao1-1/+5
IRQs The irq_chip is not yet registered, so no default irq_chip.mask_ack(), which we have to handle it correctly manually here. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] mmp2: add handling on PMIC IRQHaojian Zhuang3-1/+22
Since PMIC INT pin is a special pin of CPU, the status of PMIC INT pin needs to be cleared after PMIC IRQ occured. Now append the clear operation in irq chip handler. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] mmp2: add support for board IRQsHaojian Zhuang1-1/+5
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] mmp2: add missing ICU register definitionsHaojian Zhuang1-0/+12
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] mmp2: add gpio initializationHaojian Zhuang3-1/+25
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] mmp2: add mfpr settingHaojian Zhuang2-0/+11
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] mmp2: add mask function in irq-mmp2.cHaojian Zhuang1-0/+2
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02MAINTAINERS: add maintainers for Marvell MMP2 (aka ARMADA610) supportEric Miao1-0/+7
Cc: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] mmp: support jasper development boardHaojian Zhuang3-0/+91
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] mmp: add default configuration for MMP2Haojian Zhuang1-0/+1194
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] mmp: add support for Marvell MMP2Haojian Zhuang16-8/+892
Marvell MMP2 (aka ARMADA610) is a SoC based on PJ4 core. It's ARMv6 compatible. Support basic interrupt handler and timer, and basic support for MMP2 based FLINT platform. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] mmp: rename irq.c to irq-pxa168.c to allow other SoC IRQ chipsEric Miao2-3/+3
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] mmp: update pxa168_defconfig and include avengers lite supportHaojian Zhuang1-73/+156
Signed-off-by: Gavin Gu <gavin.gu@marvell.com> Signed-off-by: Jing Xiang <jxiang@marvell.com> Signed-off-by: Jack Ren <jack.ren@marvell.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] mmp: avengers lite (pxa168) board bring upHaojian Zhuang5-4/+72
Signed-off-by: Gavin Gu <gavin.gu@marvell.com> Signed-off-by: Jing Xiang <jxiang@marvell.com> Signed-off-by: Jack Ren <jack.ren@marvell.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa/imote2: Remove redundant pin entry for nCS.Stefan Schmidt1-2/+1
Also remove a trailing whitespace while being there. Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa/imote2: Add defconfig for the imote2 platform.Stefan Schmidt1-0/+2077
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02ASoC: Remove legacy SSP API usage from pxa-ssp.cEric Miao2-30/+61
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa: introduce PXA_SSP_LEGACY for legacy SSP APIEric Miao4-0/+14
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa: define zeus_power_off() only when CONFIG_PM enabledStefan Schmidt1-0/+4
Add some safety check for CONFIG_PM around zeus_power_off(). Without it linking can fail like this: arch/arm/mach-pxa/built-in.o: In function `zeus_power_off': e800.c:(.text+0x2bc8): undefined reference to `pxa27x_cpu_suspend' Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> Acked-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa: enable check_scoop_reg() only if CONFIG_PM is set.Stefan Schmidt1-1/+1
This function gets only called from scoop_suspend() and scoop_resume() which are only built in if we have CONFIG_PM set. Make it the same for check_scoop_reg(). This fixes the following warning: arch/arm/common/scoop.c:143: warning: ‘check_scoop_reg’ defined but not used Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa: add support for Embedian MXM-8x10Edwin Peer6-0/+867
Signed-off-by: Edwin Peer <epeer@tmtservices.co.za> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa: move board board IRQ definitions out of irqs.hEric Miao8-66/+66
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] sa1111: allow cascaded IRQs to be used by platformsEric Miao8-130/+116
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] sa1111: avoid using hardcoded IRQ numbers for PCMCIA driverEric Miao1-5/+20
The IRQs for card detect and status change are currently hardcoded in SA1111 PCMCIA driver, which can be actually obtained from the .irq[] from 'struct sa1111_dev' to keep it generic. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] locomo: allow cascaded IRQ base to be specified by platformsEric Miao6-39/+48
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] locomo: remove unused IRQs and avoid unnecessary cascadeEric Miao4-314/+11
IRQ_LOCOMO_* are never used elsewhere, remove these definitions. As well as the cascade of these IRQs. IRQ_LOCOMO_*_BASE changed to IRQ_LOCOMO_*. IRQ_LOCOMO_LT and IRQ_LOCOMO_SPI are likely to be used in a same way as IRQ_LOCOMO_KEY. IRQ_LOCOMO_GPIO and the demultiplex handler should really be living somewhere else. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] locomo: avoid unnecessary cascaded keyboard IRQEric Miao4-62/+39
It is not necessary and is over-complicated for IRQ_LOCOMO_KEY to be a cascaded IRQ of IRQ_LOCOMO_KEY_BASE. Removed and introduced locomokbd_{open,close} for masking/unmasking of the keyboard IRQ. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] sa1100: remove unreferenced IRQ definitionsEric Miao1-7/+0
These IRQ definitions related to LOCOMO are never referenced anywhere, thus could be safely removed. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
generated by cgit v1.2.3 (git 2.39.0) at 2025-02-10 18:35:57 +0300