Commit dc7b602d authored by Konstantin Porotchkin's avatar Konstantin Porotchkin Committed by Nicolas Pitre

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: default avatarKonstantin Porotchkin <kostap@marvell.com>
Acked-by: default avatarSaeed Bishara <saeed.bishara@gmail.com>
Signed-off-by: default avatarNicolas Pitre <nico@fluxnic.net>
parent 7780c803
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
#define DOVE_MPP_GENERAL_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE | 0xe803c) #define DOVE_MPP_GENERAL_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE | 0xe803c)
#define DOVE_AU1_SPDIFO_GPIO_EN (1 << 1) #define DOVE_AU1_SPDIFO_GPIO_EN (1 << 1)
#define DOVE_NAND_GPIO_EN (1 << 0) #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_SPI_GPIO_SEL (1 << 5)
#define DOVE_UART1_GPIO_SEL (1 << 4) #define DOVE_UART1_GPIO_SEL (1 << 4)
#define DOVE_AU1_GPIO_SEL (1 << 3) #define DOVE_AU1_GPIO_SEL (1 << 3)
......
...@@ -147,9 +147,6 @@ void __init dove_mpp_conf(unsigned int *mpp_list) ...@@ -147,9 +147,6 @@ void __init dove_mpp_conf(unsigned int *mpp_list)
u32 pmu_sig_ctrl[PMU_SIG_REGS]; u32 pmu_sig_ctrl[PMU_SIG_REGS];
int i; int i;
/* Initialize gpiolib. */
orion_gpio_init();
for (i = 0; i < MPP_NR_REGS; i++) for (i = 0; i < MPP_NR_REGS; i++)
mpp_ctrl[i] = readl(MPP_CTRL(i)); mpp_ctrl[i] = readl(MPP_CTRL(i));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment