diff options
author | Konstantin Porotchkin <kostap@marvell.com> | 2011-03-27 11:54:49 +0200 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-03-27 15:22:52 +0200 |
commit | dc7b602dd481cad61fc4f18874bbdc5b04b5ee3e (patch) | |
tree | 6fe062cd8ff26d8aa85d98a3b644e2ebc132a10c | |
parent | arm: mach-kirkwood: add led in sheevaplug-setup.c (diff) | |
download | linux-dc7b602dd481cad61fc4f18874bbdc5b04b5ee3e.tar.xz linux-dc7b602dd481cad61fc4f18874bbdc5b04b5ee3e.zip |
Fix the broken build for Marvell Dove platform.
Remove call to the old GPIO init function.
Fix old MPP control offset value.
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Acked-by: Saeed Bishara <saeed.bishara@gmail.com>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
-rw-r--r-- | arch/arm/mach-dove/include/mach/dove.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-dove/mpp.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-dove/include/mach/dove.h b/arch/arm/mach-dove/include/mach/dove.h index e5fcdd3f5bf5..b20ec9af7882 100644 --- a/arch/arm/mach-dove/include/mach/dove.h +++ b/arch/arm/mach-dove/include/mach/dove.h @@ -136,7 +136,7 @@ #define DOVE_MPP_GENERAL_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE | 0xe803c) #define DOVE_AU1_SPDIFO_GPIO_EN (1 << 1) #define DOVE_NAND_GPIO_EN (1 << 0) -#define DOVE_MPP_CTRL4_VIRT_BASE (DOVE_GPIO_VIRT_BASE + 0x40) +#define DOVE_MPP_CTRL4_VIRT_BASE (DOVE_GPIO_LO_VIRT_BASE + 0x40) #define DOVE_SPI_GPIO_SEL (1 << 5) #define DOVE_UART1_GPIO_SEL (1 << 4) #define DOVE_AU1_GPIO_SEL (1 << 3) diff --git a/arch/arm/mach-dove/mpp.c b/arch/arm/mach-dove/mpp.c index 71db2bdf2f28..c66c76346904 100644 --- a/arch/arm/mach-dove/mpp.c +++ b/arch/arm/mach-dove/mpp.c @@ -147,9 +147,6 @@ void __init dove_mpp_conf(unsigned int *mpp_list) u32 pmu_sig_ctrl[PMU_SIG_REGS]; int i; - /* Initialize gpiolib. */ - orion_gpio_init(); - for (i = 0; i < MPP_NR_REGS; i++) mpp_ctrl[i] = readl(MPP_CTRL(i)); |