diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-07 17:10:56 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-07 17:10:56 +0100 |
| commit | 725278e0ecdabbbced6f1b05a23473ec9e4cafee (patch) | |
| tree | 6f0843aa39f5a2df292613b9ed0b537be5047301 /arch/arm/mach-orion5x | |
| parent | ARM: Fix DMA coherent allocator alignment (diff) | |
| parent | ARM: orion5x/kirkwood/mv78xx0: fix MPP configuration corner cases (diff) | |
| download | linux-725278e0ecdabbbced6f1b05a23473ec9e4cafee.tar.xz linux-725278e0ecdabbbced6f1b05a23473ec9e4cafee.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion
Diffstat (limited to 'arch/arm/mach-orion5x')
| -rw-r--r-- | arch/arm/mach-orion5x/mpp.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/ts78xx-setup.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-orion5x/mpp.c b/arch/arm/mach-orion5x/mpp.c index bc4c3b9aaf83..db485d3b8144 100644 --- a/arch/arm/mach-orion5x/mpp.c +++ b/arch/arm/mach-orion5x/mpp.c @@ -127,7 +127,7 @@ void __init orion5x_mpp_conf(struct orion5x_mpp_mode *mode) /* Initialize gpiolib. */ orion_gpio_init(); - while (mode->mpp >= 0) { + for ( ; mode->mpp >= 0; mode++) { u32 *reg; int num_type; int shift; @@ -160,8 +160,6 @@ void __init orion5x_mpp_conf(struct orion5x_mpp_mode *mode) orion_gpio_set_unused(mode->mpp); orion_gpio_set_valid(mode->mpp, !!(mode->type == MPP_GPIO)); - - mode++; } writel(mpp_0_7_ctrl, MPP_0_7_CTRL); diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c index 16f1bd5324be..c1c1cd04bdde 100644 --- a/arch/arm/mach-orion5x/ts78xx-setup.c +++ b/arch/arm/mach-orion5x/ts78xx-setup.c @@ -239,7 +239,7 @@ static struct platform_nand_data ts78xx_ts_nand_data = { static struct resource ts78xx_ts_nand_resources = { .start = TS_NAND_DATA, .end = TS_NAND_DATA + 4, - .flags = IORESOURCE_IO, + .flags = IORESOURCE_MEM, }; static struct platform_device ts78xx_ts_nand_device = { |