diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 21:26:37 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 21:26:37 +0100 |
| commit | 91fed558d0f33c74477569f50ed883fe6d430f1f (patch) | |
| tree | 84b32eb5f9b995efc21e39ee241fed38372d5f3b /arch/arm/plat-pxa | |
| parent | db1c5628eb8a321af7585e58019de99ccd2f28b2 (diff) | |
| parent | 1a64200ec5e93be03e27c3b2fc332e04ae443eb2 (diff) | |
| download | kernel_samsung_smdk4412-91fed558d0f33c74477569f50ed883fe6d430f1f.zip kernel_samsung_smdk4412-91fed558d0f33c74477569f50ed883fe6d430f1f.tar.gz kernel_samsung_smdk4412-91fed558d0f33c74477569f50ed883fe6d430f1f.tar.bz2 | |
Merge branch 'pxa/fixes' into next/fixes
Diffstat (limited to 'arch/arm/plat-pxa')
| -rw-r--r-- | arch/arm/plat-pxa/gpio.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-pxa/include/plat/mfp.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-pxa/mfp.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-pxa/gpio.c b/arch/arm/plat-pxa/gpio.c index a11dc36..0db7615 100644 --- a/arch/arm/plat-pxa/gpio.c +++ b/arch/arm/plat-pxa/gpio.c @@ -122,7 +122,7 @@ static int __init pxa_init_gpio_chip(int gpio_end) struct gpio_chip *c = &chips[i].chip; sprintf(chips[i].label, "gpio-%d", i); - chips[i].regbase = (void __iomem *)GPIO_BANK(i); + chips[i].regbase = GPIO_BANK(i); c->base = gpio; c->label = chips[i].label; diff --git a/arch/arm/plat-pxa/include/plat/mfp.h b/arch/arm/plat-pxa/include/plat/mfp.h index 89e68e0..5c79c29 100644 --- a/arch/arm/plat-pxa/include/plat/mfp.h +++ b/arch/arm/plat-pxa/include/plat/mfp.h @@ -456,7 +456,7 @@ struct mfp_addr_map { #define MFP_ADDR_END { MFP_PIN_INVALID, 0 } -void __init mfp_init_base(unsigned long mfpr_base); +void __init mfp_init_base(void __iomem *mfpr_base); void __init mfp_init_addr(struct mfp_addr_map *map); /* diff --git a/arch/arm/plat-pxa/mfp.c b/arch/arm/plat-pxa/mfp.c index be12ead..2c4dbb1 100644 --- a/arch/arm/plat-pxa/mfp.c +++ b/arch/arm/plat-pxa/mfp.c @@ -229,7 +229,7 @@ void mfp_write(int mfp, unsigned long val) spin_unlock_irqrestore(&mfp_spin_lock, flags); } -void __init mfp_init_base(unsigned long mfpr_base) +void __init mfp_init_base(void __iomem *mfpr_base) { int i; @@ -237,7 +237,7 @@ void __init mfp_init_base(unsigned long mfpr_base) for (i = 0; i < ARRAY_SIZE(mfp_table); i++) mfp_table[i].config = -1; - mfpr_mmio_base = (void __iomem *)mfpr_base; + mfpr_mmio_base = mfpr_base; } void __init mfp_init_addr(struct mfp_addr_map *map) |