9 years agoMerge branch 'for-rmk/samsung6' of git://git.fluff.org/bjdooks/linux into devel-stable
Russell King [Mon, 8 Mar 2010 16:08:46 +0000]
Merge branch 'for-rmk/samsung6' of git://git.fluff.org/bjdooks/linux into devel-stable

9 years agoARM: Merge next-samsung-s3c2443-clock
Ben Dooks [Sun, 7 Mar 2010 22:56:19 +0000]
ARM: Merge next-samsung-s3c2443-clock

Merge branch 'next-samsung-s3c2443-clock' into next-samsung

9 years agoARM: S3C2443: Add set_rate and round_rate calls for armdiv clock
Ben Dooks [Sat, 30 Jan 2010 09:14:14 +0000]
ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock

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>

9 years agoARM: S3C2443: Remove #if 0 for clk_mpll
Ben Dooks [Sat, 30 Jan 2010 08:49:15 +0000]
ARM: S3C2443: Remove #if 0 for clk_mpll

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>

9 years agoARM: S3C2443: Update notes on MPLLREF clock
Ben Dooks [Sat, 30 Jan 2010 08:46:52 +0000]
ARM: S3C2443: Update notes on MPLLREF clock

Add note on MPLLREF clock source and why it cannot be easily removed.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>

9 years agoARM: S3C2443: Further clksrc-clk conversions
Ben Dooks [Sat, 30 Jan 2010 08:25:49 +0000]
ARM: S3C2443: Further clksrc-clk conversions

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>

9 years agoARM: S3C2443: Change to using plat-samsung clksrc-clk implementation
Ben Dooks [Sat, 30 Jan 2010 07:19:59 +0000]
ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation

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>

9 years agoUSB: Fix s3c-hsotg build following Samsung platform header moves
Mark Brown [Mon, 1 Mar 2010 18:51:42 +0000]
USB: Fix s3c-hsotg build following Samsung platform header moves

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>

9 years agoARM: S3C64XX: Reintroduce unconditional build of audio device
Mark Brown [Fri, 5 Mar 2010 10:47:23 +0000]
ARM: S3C64XX: Reintroduce unconditional build of audio device

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>

9 years agoASoC: Fix S3C64xx IIS driver for Samsung header reorg
Mark Brown [Mon, 1 Mar 2010 19:57:59 +0000]
ASoC: Fix S3C64xx IIS driver for Samsung header reorg

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>

9 years agoARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support
Ben Dooks [Thu, 4 Mar 2010 23:14:44 +0000]
ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support

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>

9 years agoMerge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable
Russell King [Tue, 2 Mar 2010 23:40:15 +0000]
Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable

Conflicts:
arch/arm/Kconfig
arch/arm/Makefile

9 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Russell King [Tue, 2 Mar 2010 23:31:07 +0000]
Merge /linux/kernel/git/lethal/genesis-2.6 into devel-stable

Conflicts:
arch/arm/Kconfig

9 years agoMerge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Russell King [Tue, 2 Mar 2010 23:29:32 +0000]
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

Conflicts:
arch/arm/Makefile

9 years ago[ARM] pxa: fix typo in mxm8x10.h
Eric Miao [Tue, 2 Mar 2010 02:24:14 +0000]
[ARM] pxa: fix typo in mxm8x10.h

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] pxa/raumfeld: set GPIO drive bits for LED pins
Daniel Mack [Wed, 24 Feb 2010 17:50:16 +0000]
[ARM] pxa/raumfeld: set GPIO drive bits for LED pins

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>

9 years ago[ARM] pxa/zeus: Add support for mcp2515 CAN bus
Marc Zyngier [Thu, 18 Feb 2010 20:33:02 +0000]
[ARM] pxa/zeus: Add support for mcp2515 CAN bus

Signed-off-by: Marc Zyngier <maz@misterjones.org>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] pxa/zeus: Add support for onboard max6369 watchdog
Marc Zyngier [Thu, 18 Feb 2010 20:31:43 +0000]
[ARM] pxa/zeus: Add support for onboard max6369 watchdog

Signed-off-by: Marc Zyngier <maz@misterjones.org>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] pxa/zeus: Add Eurotech as the manufacturer
Marc Zyngier [Thu, 18 Feb 2010 20:30:31 +0000]
[ARM] pxa/zeus: Add Eurotech as the manufacturer

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>

9 years ago[ARM] pxa/zeus: Correct the USB host initialisation flags
Marc Zyngier [Thu, 18 Feb 2010 20:29:24 +0000]
[ARM] pxa/zeus: Correct the USB host initialisation flags

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>

9 years ago[ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress
Marc Zyngier [Fri, 19 Feb 2010 06:07:37 +0000]
[ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress

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>

9 years ago[ARM] pxa: refactor uncompress.h for non-PXA uarts
Eric Miao [Fri, 19 Feb 2010 05:49:39 +0000]
[ARM] pxa: refactor uncompress.h for non-PXA uarts

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>

9 years ago[ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs
Eric Miao [Wed, 3 Feb 2010 07:39:35 +0000]
[ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded 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>

9 years ago[ARM] mmp2: add handling on PMIC IRQ
Haojian Zhuang [Wed, 3 Feb 2010 15:01:18 +0000]
[ARM] mmp2: add handling on PMIC IRQ

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>

9 years ago[ARM] mmp2: add support for board IRQs
Haojian Zhuang [Thu, 28 Jan 2010 04:34:59 +0000]
[ARM] mmp2: add support for board IRQs

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] mmp2: add missing ICU register definitions
Haojian Zhuang [Thu, 28 Jan 2010 04:27:36 +0000]
[ARM] mmp2: add missing ICU register definitions

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] mmp2: add gpio initialization
Haojian Zhuang [Mon, 25 Jan 2010 11:03:54 +0000]
[ARM] mmp2: add gpio initialization

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] mmp2: add mfpr setting
Haojian Zhuang [Mon, 25 Jan 2010 11:03:25 +0000]
[ARM] mmp2: add mfpr setting

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] mmp2: add mask function in irq-mmp2.c
Haojian Zhuang [Mon, 25 Jan 2010 11:02:50 +0000]
[ARM] mmp2: add mask function in irq-mmp2.c

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years agoMAINTAINERS: add maintainers for Marvell MMP2 (aka ARMADA610) support
Eric Miao [Tue, 5 Jan 2010 07:28:26 +0000]
MAINTAINERS: add maintainers for Marvell MMP2 (aka ARMADA610) support

Cc: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] mmp: support jasper development board
Haojian Zhuang [Wed, 6 Jan 2010 14:07:15 +0000]
[ARM] mmp: support jasper development board

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] mmp: add default configuration for MMP2
Haojian Zhuang [Tue, 5 Jan 2010 07:02:19 +0000]
[ARM] mmp: add default configuration for MMP2

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] mmp: add support for Marvell MMP2
Haojian Zhuang [Fri, 4 Dec 2009 14:41:28 +0000]
[ARM] mmp: add support for Marvell MMP2

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>

9 years ago[ARM] mmp: rename irq.c to irq-pxa168.c to allow other SoC IRQ chips
Eric Miao [Tue, 5 Jan 2010 07:06:37 +0000]
[ARM] mmp: rename irq.c to irq-pxa168.c to allow other SoC IRQ chips

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] mmp: update pxa168_defconfig and include avengers lite support
Haojian Zhuang [Tue, 12 Jan 2010 01:07:45 +0000]
[ARM] mmp: update pxa168_defconfig and include avengers lite support

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>

9 years ago[ARM] mmp: avengers lite (pxa168) board bring up
Haojian Zhuang [Tue, 12 Jan 2010 00:54:50 +0000]
[ARM] mmp: avengers lite (pxa168) board bring up

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>

9 years ago[ARM] pxa/imote2: Remove redundant pin entry for nCS.
Stefan Schmidt [Sat, 13 Feb 2010 20:59:32 +0000]
[ARM] pxa/imote2: Remove redundant pin entry for nCS.

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>

9 years ago[ARM] pxa/imote2: Add defconfig for the imote2 platform.
Stefan Schmidt [Sun, 14 Feb 2010 09:19:21 +0000]
[ARM] pxa/imote2: Add defconfig for the imote2 platform.

Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years agoASoC: Remove legacy SSP API usage from pxa-ssp.c
Eric Miao [Tue, 9 Feb 2010 11:46:01 +0000]
ASoC: Remove legacy SSP API usage from pxa-ssp.c

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] pxa: introduce PXA_SSP_LEGACY for legacy SSP API
Eric Miao [Tue, 9 Feb 2010 03:10:10 +0000]
[ARM] pxa: introduce PXA_SSP_LEGACY for legacy SSP API

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] pxa: define zeus_power_off() only when CONFIG_PM enabled
Stefan Schmidt [Tue, 16 Feb 2010 21:42:55 +0000]
[ARM] pxa: define zeus_power_off() only when CONFIG_PM enabled

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>

9 years ago[ARM] pxa: enable check_scoop_reg() only if CONFIG_PM is set.
Stefan Schmidt [Tue, 16 Feb 2010 21:41:52 +0000]
[ARM] pxa: enable check_scoop_reg() only if CONFIG_PM is set.

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>

9 years ago[ARM] pxa: add support for Embedian MXM-8x10
Edwin Peer [Fri, 5 Feb 2010 16:31:48 +0000]
[ARM] pxa: add support for Embedian MXM-8x10

Signed-off-by: Edwin Peer <epeer@tmtservices.co.za>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] pxa: move board board IRQ definitions out of irqs.h
Eric Miao [Sun, 27 Dec 2009 15:01:25 +0000]
[ARM] pxa: move board board IRQ definitions out of irqs.h

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] sa1111: allow cascaded IRQs to be used by platforms
Eric Miao [Sat, 26 Dec 2009 08:23:02 +0000]
[ARM] sa1111: allow cascaded IRQs to be used by platforms

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] sa1111: avoid using hardcoded IRQ numbers for PCMCIA driver
Eric Miao [Sat, 26 Dec 2009 04:32:38 +0000]
[ARM] sa1111: avoid using hardcoded IRQ numbers for PCMCIA driver

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>

9 years ago[ARM] locomo: allow cascaded IRQ base to be specified by platforms
Eric Miao [Fri, 5 Feb 2010 02:07:33 +0000]
[ARM] locomo: allow cascaded IRQ base to be specified by platforms

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] locomo: remove unused IRQs and avoid unnecessary cascade
Eric Miao [Fri, 25 Dec 2009 04:18:33 +0000]
[ARM] locomo: remove unused IRQs and avoid unnecessary cascade

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>

9 years ago[ARM] locomo: avoid unnecessary cascaded keyboard IRQ
Eric Miao [Fri, 5 Feb 2010 01:13:55 +0000]
[ARM] locomo: avoid unnecessary cascaded keyboard IRQ

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>

9 years ago[ARM] sa1100: remove unreferenced IRQ definitions
Eric Miao [Wed, 23 Dec 2009 06:52:07 +0000]
[ARM] sa1100: remove unreferenced IRQ definitions

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>

9 years ago[ARM] pxa/tosa: make use of the matrix keypad driver
Eric Miao [Fri, 1 Jan 2010 07:28:21 +0000]
[ARM] pxa/tosa: make use of the matrix keypad driver

Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] pxa/cm-x270: avoid direct access of GPIO/MFP registers
Eric Miao [Mon, 4 Jan 2010 05:34:05 +0000]
[ARM] pxa/cm-x270: avoid direct access of GPIO/MFP registers

Cc: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] pxa: remove now unnecessary pxa_gpio_mode() calls in ac97
Eric Miao [Mon, 4 Jan 2010 09:14:21 +0000]
[ARM] pxa: remove now unnecessary pxa_gpio_mode() calls in ac97

Now most (if not all) PXA platforms have been switched to the new MFP
API, it's rather safe to remove these unnecessary pxa_gpio_mode() calls
in pxa2xx-ac97-lib.c now.

Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] pxa: add the missing AC97 pin configurations
Eric Miao [Mon, 4 Jan 2010 09:00:13 +0000]
[ARM] pxa: add the missing AC97 pin configurations

Missing AC97 pin configurations are added where pxa_set_ac97_info() are
called for all pxa25x/pxa27x platforms. Where no exact configuration is
provided, use the default as in sound/arm/pxa2xx-ac97-lib.c

Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] pxa: introduce processor specific pxa27x_assert_ac97reset()
Eric Miao [Mon, 4 Jan 2010 08:30:58 +0000]
[ARM] pxa: introduce processor specific pxa27x_assert_ac97reset()

This is really pxa27x specific and should be kept in pxa27x.c. With this
newly introduced function, the original set_resetgpio_mode() is deprecated.

Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] pxa: remove the unnecessary restoring of MFP registers
Eric Miao [Mon, 4 Jan 2010 08:26:32 +0000]
[ARM] pxa: remove the unnecessary restoring of MFP registers

MFP registers are saved and restored by the mfp sys_device before all
other platform devices, and it is unnecessary here.

Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] pxa: simplify the LCD pin configuration for pxa27x platforms
Eric Miao [Mon, 4 Jan 2010 03:37:14 +0000]
[ARM] pxa: simplify the LCD pin configuration for pxa27x platforms

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] pxa: simplify the LCD pin configuration for pxa25x platforms
Eric Miao [Mon, 4 Jan 2010 03:25:10 +0000]
[ARM] pxa: simplify the LCD pin configuration for pxa25x platforms

There are only limited possible LCD pin configurations for pxa25x
platforms, simplify this by macro.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years ago[ARM] pxa: use chip->ack() instead of accessing GEDR directly
Eric Miao [Fri, 1 Jan 2010 07:29:22 +0000]
[ARM] pxa: use chip->ack() instead of accessing GEDR directly

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9 years agoMerge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Russell King [Thu, 25 Feb 2010 20:41:34 +0000]
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable

9 years agoMerge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx...
Uwe Kleine-König [Thu, 25 Feb 2010 13:01:49 +0000]
Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/master

Removed selection of COMMON_CLKDEV by CONFIG_ARCH_MX5.  This is handled
in 03e09cd8902717b66f940357257d8ad76114d9f2.

arch/arm/plat-mxc/iomux-mx1-mx2.c was moved to
arch/arm/plat-mxc/iomux-v1.c in 5e2e95f520538e095d10456acd28d9107317aa32
and got bug fixed in 5c17ef878fa25e04b1e8f1d8f5fa8b267753472c.  The bug
in arch/arm/plat-mxc/iomux-v1.c isn't present any more since
bac3fcfad565c9bbceeed8b607f140c29df97355, so
arch/arm/plat-mxc/iomux-mx1-mx2.c is simply deleted.

Conflicts:
arch/arm/plat-mxc/Kconfig
arch/arm/plat-mxc/Makefile
arch/arm/plat-mxc/iomux-mx1-mx2.c

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoARM: mach-shmobile: ap4evb: Add KEYSC support
Kuninori Morimoto [Tue, 23 Feb 2010 07:07:01 +0000]
ARM: mach-shmobile: ap4evb: Add KEYSC support

Because AP4 board has capacitor for KEYSC,
we need much time for waiting.

Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

9 years agoARM: S3C64XX: Add initial support for board specific IRQs
Mark Brown [Wed, 24 Feb 2010 16:45:54 +0000]
ARM: S3C64XX: Add initial support for board specific IRQs

Follow the scheme used for IRQs. By default 16 GPIOs are allocated
for board use.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

9 years agoARM: S5PV210: Add S5PC110 configuration file
Kukjin Kim [Wed, 24 Feb 2010 07:41:01 +0000]
ARM: S5PV210: Add S5PC110 configuration file

This patch adds S5PC110 default configuration file.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

9 years agoARM: S5PV210: Add S5PV210 configuration file
Kukjin Kim [Wed, 24 Feb 2010 07:40:57 +0000]
ARM: S5PV210: Add S5PV210 configuration file

This patch adds S5PV210 default configuration file.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

9 years agoARM: S5PV210: Add SMDKC110 board support file
Kukjin Kim [Wed, 24 Feb 2010 07:40:53 +0000]
ARM: S5PV210: Add SMDKC110 board support file

This patch adds SMDKC110 board support file.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

9 years agoARM: S5PV210: Add SMDKV210 board support file
Kukjin Kim [Wed, 24 Feb 2010 07:40:49 +0000]
ARM: S5PV210: Add SMDKV210 board support file

This patch adds SMDKV210 board support file.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

9 years agoARM: S5PV210: Update Kconfig and Makefiles
Kukjin Kim [Wed, 24 Feb 2010 07:40:44 +0000]
ARM: S5PV210: Update Kconfig and Makefiles

Updates arch/arm Kconfig and Makefile for building the S5PV210 support.
Also modifies the plat-s5p Kconfig file to include the support for plat-s5p
for S5PV210.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

9 years agoARM: S5PV210: Add IRQ support
Kukjin Kim [Wed, 24 Feb 2010 07:40:40 +0000]
ARM: S5PV210: Add IRQ support

This patch adds IRQ support for S5PV210. This patch adds interrupt
register definitions, IRQ definitions for various interrupt sources
and new VIC base for VIC2 and VIC3 in plat-s5p common irq code.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

9 years agoARM: S5PV210: Add clock support for S5PV210
Kukjin Kim [Wed, 24 Feb 2010 07:40:36 +0000]
ARM: S5PV210: Add clock support for S5PV210

This patch adds clock support for S5PV210. This patch adds the clock
register definitions and the various system clocks in S5PV210.
Clocks that are common to other S5P SoC'c are added in the common
S5P clock support.

Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

9 years agoARM: S5PV210: Add Samsung S5PV210 CPU support
Kukjin Kim [Wed, 24 Feb 2010 07:40:29 +0000]
ARM: S5PV210: Add Samsung S5PV210 CPU support

This patch adds support for Samsung S5PV210 CPU. This patch also adds
an entry for S5PV210 cpu in plat-s5p cpu table.

Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

9 years agomx25: move ARCH_MXC_IOMUX_V3 to the ARCH level
Baruch Siach [Wed, 24 Feb 2010 09:31:31 +0000]
mx25: move ARCH_MXC_IOMUX_V3 to the ARCH level

ARCH_MXC_IOMUX_V3 is not specific to the i.MX25 PDK platform. Thus,
ARCH_MXC_IOMUX_V3 should be selected by ARCH_MX25.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

9 years agomx51_babbage: Fix ckih2 parameter in mx51_clocks_init function
Fabio Estevam [Wed, 17 Feb 2010 20:02:56 +0000]
mx51_babbage: Fix ckih2 parameter in mx51_clocks_init function

This patch is to be applied into Sascha's mxc-master branch.

Fix ckih2 parameter in mx51_clocks_init funtion. CKIH2 pin is left unconnected on Babbage.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Amit Kucheria <amit.kucheria@canonical.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

9 years agomx31ads: Configure SSI5 pins in IOMUX for PMIC module audio support
Mark Brown [Tue, 23 Feb 2010 11:05:11 +0000]
mx31ads: Configure SSI5 pins in IOMUX for PMIC module audio support

SSI5 on the CPU is connected to the PMIC module to provide audio support
so unconditionally configure the relevant pins on the CPU to route out
the signals.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

9 years agoarm/imx/iomux-v1: check for invalid modes in mxc_gpio_mode
Uwe Kleine-König [Mon, 15 Feb 2010 08:47:55 +0000]
arm/imx/iomux-v1: check for invalid modes in mxc_gpio_mode

mxc_gpio_mode checks for invalid pins and so it returns zero for
success, -EINVAL for invalid pins.

While at it, remove definitions of GPIO_PORT_MAX removed as they are
unused now.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx: let platform files include the SoC-specific iomux header
Uwe Kleine-König [Tue, 16 Feb 2010 10:07:49 +0000]
arm/imx: let platform files include the SoC-specific iomux header

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx/iomux-v1: rename header file
Uwe Kleine-König [Mon, 15 Feb 2010 20:52:34 +0000]
arm/imx/iomux-v1: rename header file

Addionally make iomux-mx*.h headers stand-alone and similar to iomux-v3
platform files should include their platform iomux header from now on.
For now iomux.h simply includes all iomux-v1 platform headers and so
provides compatibility until all files are converted.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/mx25: don't include iomux.h which is for iomux-v1 machines
Uwe Kleine-König [Mon, 15 Feb 2010 20:18:43 +0000]
arm/mx25: don't include iomux.h which is for iomux-v1 machines

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx/iomux-mx3.h: unify style and comments
Uwe Kleine-König [Mon, 15 Feb 2010 20:10:39 +0000]
arm/imx/iomux-mx3.h: unify style and comments

- use __MACH_IOMUX_MX3_H__ as header protector analogous to
  <mach/mx...h>
- use tabs for indention

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx/iomux-mx2x: unify style
Uwe Kleine-König [Mon, 15 Feb 2010 20:04:17 +0000]
arm/imx/iomux-mx2x: unify style

- use __MACH_IOMUX_MX2x_H__ as header protector analogous to
  <mach/mx...h>
- use tabs for indention

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx/iomux-mx27: unify style and comments
Uwe Kleine-König [Mon, 15 Feb 2010 19:56:03 +0000]
arm/imx/iomux-mx27: unify style and comments

- use __MACH_IOMUX_MX27_H__ as header protector analogous to
  <mach/mx...h>
- use tabs for indention
- fix sorting

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx/iomux-mx25: unify style and comment cleanup
Uwe Kleine-König [Mon, 15 Feb 2010 19:50:57 +0000]
arm/imx/iomux-mx25: unify style and comment cleanup

- use __MACH_IOMUX_MX25_H__ as header protector analogous to
  <mach/mx...h>
- remove doxygen comments
- remove #error about mach/iomux.h which is unused on mx25
- remove #ifndef __ASSEMBLY__ which is unneeded here

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx/iomux-mx21: unify style
Uwe Kleine-König [Mon, 15 Feb 2010 19:46:47 +0000]
arm/imx/iomux-mx21: unify style

- use __MACH_IOMUX_MX21_H__ as header protector analogous to
  <mach/mx...h>
- use tabs for indention

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx/iomux-mx1: unify style and comment cleanup
Uwe Kleine-König [Mon, 15 Feb 2010 19:39:59 +0000]
arm/imx/iomux-mx1: unify style and comment cleanup

- use __MACH_IOMUX_MX1_H__ as header protector analogous to
  <mach/mx...h>
- use tabs for indention

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx/iomux-v1: make base address a runtime choice
Uwe Kleine-König [Mon, 15 Feb 2010 15:57:09 +0000]
arm/imx/iomux-v1: make base address a runtime choice

While at it move register modification to static inlines and
so make the relevant code more readable.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx/iomux-v1: rename source file and reorganize Kconfig stuff
Uwe Kleine-König [Mon, 15 Feb 2010 08:42:59 +0000]
arm/imx/iomux-v1: rename source file and reorganize Kconfig stuff

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx/dma-v1: protect #ifdef'd blocks additionally by cpu_is_...
Uwe Kleine-König [Wed, 17 Feb 2010 21:17:43 +0000]
arm/imx/dma-v1: protect #ifdef'd blocks additionally by cpu_is_...

This is necessary for a multi-SoC kernel.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx/dma-v1: don't use deprecated symbols DMA_BASE and MXC_INT_DMACH0
Uwe Kleine-König [Wed, 17 Feb 2010 18:37:05 +0000]
arm/imx/dma-v1: don't use deprecated symbols DMA_BASE and MXC_INT_DMACH0

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx: choose sane CONSISTENT_DMA_SIZE if video is enabled for both mx1 and mx3
Uwe Kleine-König [Wed, 17 Feb 2010 20:05:27 +0000]
arm/imx: choose sane CONSISTENT_DMA_SIZE if video is enabled for both mx1 and mx3

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx/irq: order definitions of MXC_GPIO_IRQS numerically
Uwe Kleine-König [Wed, 17 Feb 2010 20:08:00 +0000]
arm/imx/irq: order definitions of MXC_GPIO_IRQS numerically

This is important for kernels supporting more than one SoC.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx: don't depend on ARCH_MXC twice
Uwe Kleine-König [Mon, 15 Feb 2010 16:11:17 +0000]
arm/imx: don't depend on ARCH_MXC twice

MXC_IRQ_PRIOR, MXC_PWM and ARCH_HAS_RNGA are all defined in an "if
ARCH_MXC" ... "endif" block, so they depend on ARCH_MXC anyhow.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx: remove #ifndef CONFIG_COMMON_CLKDEV block
Uwe Kleine-König [Fri, 19 Feb 2010 14:29:26 +0000]
arm/imx: remove #ifndef CONFIG_COMMON_CLKDEV block

COMMON_CLKDEV is used on all imx platforms, so this isn't used.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx: remove MTD_XIP support
Uwe Kleine-König [Fri, 19 Feb 2010 16:08:42 +0000]
arm/imx: remove MTD_XIP support

This is broken since at least one year when

ec996ba (mxc timer: make compile time independent)

removed the symbol MXC_TCN.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx: don't explicitly select GENERIC_GPIO
Uwe Kleine-König [Fri, 19 Feb 2010 15:16:09 +0000]
arm/imx: don't explicitly select GENERIC_GPIO

ARCH_REQUIRE_GPIOLIB selects GPIOLIB which in turn selects GENERIC_GPIO

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx: let ARCH_MXC select COMMON_CLKDEV instead of each subfamily
Uwe Kleine-König [Mon, 15 Feb 2010 16:10:42 +0000]
arm/imx: let ARCH_MXC select COMMON_CLKDEV instead of each subfamily

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx: remove "NO_PAD_CTRL" from Copyright statements
Uwe Kleine-König [Mon, 15 Feb 2010 08:54:46 +0000]
arm/imx: remove "NO_PAD_CTRL" from Copyright statements

I assume this was introduced by something like

sed -i -e 's/)/, NO_PAD_CTRL)'

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx/audmux-v2: use SoC-prefixed names
Uwe Kleine-König [Fri, 12 Feb 2010 21:38:31 +0000]
arm/imx/audmux-v2: use SoC-prefixed names

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx/audmux-v1: use SoC-prefixed names
Uwe Kleine-König [Fri, 12 Feb 2010 21:38:31 +0000]
arm/imx/audmux-v1: use SoC-prefixed names

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx/gpio: remove a BUG_ON in hot path
Uwe Kleine-König [Mon, 8 Feb 2010 20:07:16 +0000]
arm/imx/gpio: remove a BUG_ON in hot path

Now if the problem occurs that triggered the BUG_ON before, the machine
runs in a NULL pointer dereference.  So it wouldn't be much harder now
to debug the situation if it occured.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

9 years agoarm/imx/gpio: use fls to find set bits in the irq status register
Uwe Kleine-König [Mon, 8 Feb 2010 20:02:30 +0000]
arm/imx/gpio: use fls to find set bits in the irq status register

As in most cases only few irqs are pending using fls is more effective
than looping over all bits.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>