Skip to content
Snippets Groups Projects
Commit 84683638 authored by Valentin Longchamp's avatar Valentin Longchamp Committed by Albert ARIBAUD
Browse files

kirkwood: fix calls to kirkwood_mpp_conf


With the new second save argument introduced by the previous patch, all
the calls to the function had to be fixed.

Signed-off-by: default avatarValentin Longchamp <valentin.longchamp@keymile.com>
cc: Holger Brunck <holger.brunck@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
parent 8f5d7a03
No related branches found
No related tags found
No related merge requests found
...@@ -75,7 +75,7 @@ int board_early_init_f(void) ...@@ -75,7 +75,7 @@ int board_early_init_f(void)
0 0
}; };
kirkwood_mpp_conf(kwmpp_config); kirkwood_mpp_conf(kwmpp_config, NULL);
return 0; return 0;
} }
......
...@@ -73,7 +73,7 @@ int board_early_init_f(void) ...@@ -73,7 +73,7 @@ int board_early_init_f(void)
MPP33_GPIO, /* Fan speed (bit 2) */ MPP33_GPIO, /* Fan speed (bit 2) */
0 0
}; };
kirkwood_mpp_conf(kwmpp_config); kirkwood_mpp_conf(kwmpp_config, NULL);
return 0; return 0;
} }
......
...@@ -99,7 +99,7 @@ int board_early_init_f(void) ...@@ -99,7 +99,7 @@ int board_early_init_f(void)
MPP49_GPIO, /* Wifi AP LED */ MPP49_GPIO, /* Wifi AP LED */
0 0
}; };
kirkwood_mpp_conf(kwmpp_config); kirkwood_mpp_conf(kwmpp_config, NULL);
return 0; return 0;
} }
......
...@@ -96,7 +96,7 @@ int board_early_init_f(void) ...@@ -96,7 +96,7 @@ int board_early_init_f(void)
MPP49_GPIO, /* B_GLED */ MPP49_GPIO, /* B_GLED */
0 0
}; };
kirkwood_mpp_conf(kwmpp_config); kirkwood_mpp_conf(kwmpp_config, NULL);
return 0; return 0;
} }
......
...@@ -98,7 +98,7 @@ int board_early_init_f(void) ...@@ -98,7 +98,7 @@ int board_early_init_f(void)
MPP49_GPIO, MPP49_GPIO,
0 0
}; };
kirkwood_mpp_conf(kwmpp_config); kirkwood_mpp_conf(kwmpp_config, NULL);
return 0; return 0;
} }
......
...@@ -102,7 +102,7 @@ int board_early_init_f(void) ...@@ -102,7 +102,7 @@ int board_early_init_f(void)
0 0
}; };
kirkwood_mpp_conf(kwmpp_config); kirkwood_mpp_conf(kwmpp_config, NULL);
return 0; return 0;
} }
......
...@@ -97,7 +97,7 @@ int board_early_init_f(void) ...@@ -97,7 +97,7 @@ int board_early_init_f(void)
MPP49_GPIO, MPP49_GPIO,
0 0
}; };
kirkwood_mpp_conf(kwmpp_config); kirkwood_mpp_conf(kwmpp_config, NULL);
return 0; return 0;
} }
......
...@@ -96,7 +96,7 @@ int board_early_init_f(void) ...@@ -96,7 +96,7 @@ int board_early_init_f(void)
MPP49_GPIO, MPP49_GPIO,
0 0
}; };
kirkwood_mpp_conf(kwmpp_config); kirkwood_mpp_conf(kwmpp_config, NULL);
return 0; return 0;
} }
......
...@@ -100,7 +100,7 @@ int board_early_init_f(void) ...@@ -100,7 +100,7 @@ int board_early_init_f(void)
MPP49_GPIO, MPP49_GPIO,
0 0
}; };
kirkwood_mpp_conf(kwmpp_config); kirkwood_mpp_conf(kwmpp_config, NULL);
return 0; return 0;
} }
......
...@@ -71,7 +71,7 @@ int board_early_init_f(void) ...@@ -71,7 +71,7 @@ int board_early_init_f(void)
MPP49_GPIO, /* LED orange */ MPP49_GPIO, /* LED orange */
0 0
}; };
kirkwood_mpp_conf(kwmpp_config); kirkwood_mpp_conf(kwmpp_config, NULL);
return 0; return 0;
} }
......
...@@ -97,7 +97,7 @@ int board_early_init_f(void) ...@@ -97,7 +97,7 @@ int board_early_init_f(void)
MPP49_GPIO, /* thermal sensor */ MPP49_GPIO, /* thermal sensor */
0 0
}; };
kirkwood_mpp_conf(kwmpp_config); kirkwood_mpp_conf(kwmpp_config, NULL);
kw_gpio_set_blink(DNS325_GPIO_LED_POWER , 1); kw_gpio_set_blink(DNS325_GPIO_LED_POWER , 1);
......
...@@ -244,7 +244,7 @@ int board_early_init_f(void) ...@@ -244,7 +244,7 @@ int board_early_init_f(void)
{ {
u32 tmp; u32 tmp;
kirkwood_mpp_conf(kwmpp_config); kirkwood_mpp_conf(kwmpp_config, NULL);
/* /*
* The FLASH_GPIO_PIN switches between using a * The FLASH_GPIO_PIN switches between using a
...@@ -299,7 +299,7 @@ int do_spi_toggle(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ...@@ -299,7 +299,7 @@ int do_spi_toggle(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
kwmpp_config[2] = MPP2_NF_IO4; kwmpp_config[2] = MPP2_NF_IO4;
kwmpp_config[3] = MPP3_NF_IO5; kwmpp_config[3] = MPP3_NF_IO5;
kirkwood_mpp_conf(kwmpp_config); kirkwood_mpp_conf(kwmpp_config, NULL);
tmp = readl(KW_GPIO0_BASE); tmp = readl(KW_GPIO0_BASE);
writel(tmp | FLASH_GPIO_PIN , KW_GPIO0_BASE); writel(tmp | FLASH_GPIO_PIN , KW_GPIO0_BASE);
} else if ((strcmp(argv[1], "on") == 0)) { } else if ((strcmp(argv[1], "on") == 0)) {
...@@ -310,7 +310,7 @@ int do_spi_toggle(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ...@@ -310,7 +310,7 @@ int do_spi_toggle(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
kwmpp_config[2] = MPP2_SPI_SCK; kwmpp_config[2] = MPP2_SPI_SCK;
kwmpp_config[3] = MPP3_SPI_MISO; kwmpp_config[3] = MPP3_SPI_MISO;
kirkwood_mpp_conf(kwmpp_config); kirkwood_mpp_conf(kwmpp_config, NULL);
tmp = readl(KW_GPIO0_BASE); tmp = readl(KW_GPIO0_BASE);
writel(tmp & (~FLASH_GPIO_PIN) , KW_GPIO0_BASE); writel(tmp & (~FLASH_GPIO_PIN) , KW_GPIO0_BASE);
} else { } else {
......
...@@ -66,7 +66,7 @@ int board_early_init_f(void) ...@@ -66,7 +66,7 @@ int board_early_init_f(void)
MPP29_GPIO, /* USB Copy button */ MPP29_GPIO, /* USB Copy button */
0 0
}; };
kirkwood_mpp_conf(kwmpp_config); kirkwood_mpp_conf(kwmpp_config, NULL);
return 0; return 0;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment