提交 3ef56e61 编写于 作者: P Paul Kocialkowski 提交者: Tom Rini

omap-common: Rename set_muxconf_regs_essential to set_muxconf_regs

There is no distinction between essential and non-essential mux configuration,
so it doesn't make sense to have an "essential" prefix.
Signed-off-by: NPaul Kocialkowski <contact@paulk.fr>
上级 ed5ddebe
...@@ -35,13 +35,13 @@ static void set_mux_conf_regs(void) ...@@ -35,13 +35,13 @@ static void set_mux_conf_regs(void)
{ {
switch (omap_hw_init_context()) { switch (omap_hw_init_context()) {
case OMAP_INIT_CONTEXT_SPL: case OMAP_INIT_CONTEXT_SPL:
set_muxconf_regs_essential(); set_muxconf_regs();
break; break;
case OMAP_INIT_CONTEXT_UBOOT_AFTER_SPL: case OMAP_INIT_CONTEXT_UBOOT_AFTER_SPL:
break; break;
case OMAP_INIT_CONTEXT_UBOOT_FROM_NOR: case OMAP_INIT_CONTEXT_UBOOT_FROM_NOR:
case OMAP_INIT_CONTEXT_UBOOT_AFTER_CH: case OMAP_INIT_CONTEXT_UBOOT_AFTER_CH:
set_muxconf_regs_essential(); set_muxconf_regs();
break; break;
} }
} }
......
...@@ -46,7 +46,7 @@ void gpmc_init(void); ...@@ -46,7 +46,7 @@ void gpmc_init(void);
void watchdog_init(void); void watchdog_init(void);
u32 get_device_type(void); u32 get_device_type(void);
void do_set_mux(u32 base, struct pad_conf_entry const *array, int size); void do_set_mux(u32 base, struct pad_conf_entry const *array, int size);
void set_muxconf_regs_essential(void); void set_muxconf_regs(void);
u32 wait_on_value(u32, u32, void *, u32); u32 wait_on_value(u32, u32, void *, u32);
void sdelay(unsigned long); void sdelay(unsigned long);
void setup_early_clocks(void); void setup_early_clocks(void);
......
...@@ -45,7 +45,7 @@ void watchdog_init(void); ...@@ -45,7 +45,7 @@ void watchdog_init(void);
u32 get_device_type(void); u32 get_device_type(void);
void do_set_mux(u32 base, struct pad_conf_entry const *array, int size); void do_set_mux(u32 base, struct pad_conf_entry const *array, int size);
void do_set_mux32(u32 base, struct pad_conf_entry const *array, int size); void do_set_mux32(u32 base, struct pad_conf_entry const *array, int size);
void set_muxconf_regs_essential(void); void set_muxconf_regs(void);
u32 wait_on_value(u32, u32, void *, u32); u32 wait_on_value(u32, u32, void *, u32);
void sdelay(unsigned long); void sdelay(unsigned long);
void setup_early_clocks(void); void setup_early_clocks(void);
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if !defined(CONFIG_SPL_BUILD) #if !defined(CONFIG_SPL_BUILD)
inline void set_muxconf_regs_essential(void){}; inline void set_muxconf_regs(void){};
#endif #endif
const struct omap_sysinfo sysinfo = { const struct omap_sysinfo sysinfo = {
......
...@@ -75,10 +75,10 @@ const struct pad_conf_entry wkup_padconf_array_essential[] = { ...@@ -75,10 +75,10 @@ const struct pad_conf_entry wkup_padconf_array_essential[] = {
}; };
/* /*
* Routine: set_muxconf_regs_essential * Routine: set_muxconf_regs
* Description: setup board pinmux configuration. * Description: setup board pinmux configuration.
*/ */
void set_muxconf_regs_essential(void) void set_muxconf_regs(void)
{ {
do_set_mux((*ctrl)->control_padconf_core_base, do_set_mux((*ctrl)->control_padconf_core_base,
core_padconf_array_essential, core_padconf_array_essential,
......
...@@ -87,7 +87,7 @@ int misc_init_r(void) ...@@ -87,7 +87,7 @@ int misc_init_r(void)
return 0; return 0;
} }
void set_muxconf_regs_essential(void) void set_muxconf_regs(void)
{ {
do_set_mux((*ctrl)->control_padconf_core_base, do_set_mux((*ctrl)->control_padconf_core_base,
core_padconf_array_essential, core_padconf_array_essential,
......
...@@ -335,7 +335,7 @@ int board_late_init(void) ...@@ -335,7 +335,7 @@ int board_late_init(void)
return 0; return 0;
} }
void set_muxconf_regs_essential(void) void set_muxconf_regs(void)
{ {
do_set_mux32((*ctrl)->control_padconf_core_base, do_set_mux32((*ctrl)->control_padconf_core_base,
early_padconf, ARRAY_SIZE(early_padconf)); early_padconf, ARRAY_SIZE(early_padconf));
......
...@@ -338,7 +338,7 @@ void do_board_detect(void) ...@@ -338,7 +338,7 @@ void do_board_detect(void)
} }
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_SPL_BUILD */
void set_muxconf_regs_essential(void) void set_muxconf_regs(void)
{ {
do_set_mux32((*ctrl)->control_padconf_core_base, do_set_mux32((*ctrl)->control_padconf_core_base,
early_padconf, ARRAY_SIZE(early_padconf)); early_padconf, ARRAY_SIZE(early_padconf));
......
...@@ -198,7 +198,7 @@ int misc_init_r(void) ...@@ -198,7 +198,7 @@ int misc_init_r(void)
return 0; return 0;
} }
void set_muxconf_regs_essential(void) void set_muxconf_regs(void)
{ {
do_set_mux((*ctrl)->control_padconf_core_base, do_set_mux((*ctrl)->control_padconf_core_base,
core_padconf_array_essential, core_padconf_array_essential,
......
...@@ -268,7 +268,7 @@ int misc_init_r(void) ...@@ -268,7 +268,7 @@ int misc_init_r(void)
return 0; return 0;
} }
void set_muxconf_regs_essential(void) void set_muxconf_regs(void)
{ {
do_set_mux((*ctrl)->control_padconf_core_base, do_set_mux((*ctrl)->control_padconf_core_base,
core_padconf_array_essential, core_padconf_array_essential,
......
...@@ -53,7 +53,7 @@ int misc_init_r(void) ...@@ -53,7 +53,7 @@ int misc_init_r(void)
return 0; return 0;
} }
void set_muxconf_regs_essential(void) void set_muxconf_regs(void)
{ {
do_set_mux((*ctrl)->control_padconf_core_base, do_set_mux((*ctrl)->control_padconf_core_base,
core_padconf_array_essential, core_padconf_array_essential,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册