diff options
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/hwinit-common.c | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-omap4/sys_proto.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-omap5/sys_proto.h | 2 | ||||
| -rw-r--r-- | board/compulab/cm_t54/cm_t54.c | 2 | ||||
| -rw-r--r-- | board/compulab/cm_t54/mux.c | 4 | ||||
| -rw-r--r-- | board/gumstix/duovero/duovero.c | 2 | ||||
| -rw-r--r-- | board/ti/am57xx/board.c | 2 | ||||
| -rw-r--r-- | board/ti/dra7xx/evm.c | 2 | ||||
| -rw-r--r-- | board/ti/omap5_uevm/evm.c | 2 | ||||
| -rw-r--r-- | board/ti/panda/panda.c | 2 | ||||
| -rw-r--r-- | board/ti/sdp4430/sdp.c | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/hwinit-common.c b/arch/arm/cpu/armv7/omap-common/hwinit-common.c index 99634fd..61bb56c 100644 --- a/arch/arm/cpu/armv7/omap-common/hwinit-common.c +++ b/arch/arm/cpu/armv7/omap-common/hwinit-common.c @@ -35,13 +35,13 @@ static void set_mux_conf_regs(void) { switch (omap_hw_init_context()) { case OMAP_INIT_CONTEXT_SPL: - set_muxconf_regs_essential(); + set_muxconf_regs(); break; case OMAP_INIT_CONTEXT_UBOOT_AFTER_SPL: break; case OMAP_INIT_CONTEXT_UBOOT_FROM_NOR: case OMAP_INIT_CONTEXT_UBOOT_AFTER_CH: - set_muxconf_regs_essential(); + set_muxconf_regs(); break; } } diff --git a/arch/arm/include/asm/arch-omap4/sys_proto.h b/arch/arm/include/asm/arch-omap4/sys_proto.h index 3e6a9da..c9f0b3a 100644 --- a/arch/arm/include/asm/arch-omap4/sys_proto.h +++ b/arch/arm/include/asm/arch-omap4/sys_proto.h @@ -46,7 +46,7 @@ void gpmc_init(void); void watchdog_init(void); u32 get_device_type(void); 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); void sdelay(unsigned long); void setup_early_clocks(void); diff --git a/arch/arm/include/asm/arch-omap5/sys_proto.h b/arch/arm/include/asm/arch-omap5/sys_proto.h index 23a33cb..804266a 100644 --- a/arch/arm/include/asm/arch-omap5/sys_proto.h +++ b/arch/arm/include/asm/arch-omap5/sys_proto.h @@ -45,7 +45,7 @@ void watchdog_init(void); u32 get_device_type(void); 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 set_muxconf_regs_essential(void); +void set_muxconf_regs(void); u32 wait_on_value(u32, u32, void *, u32); void sdelay(unsigned long); void setup_early_clocks(void); diff --git a/board/compulab/cm_t54/cm_t54.c b/board/compulab/cm_t54/cm_t54.c index 6d3b18a..b4f5d40 100644 --- a/board/compulab/cm_t54/cm_t54.c +++ b/board/compulab/cm_t54/cm_t54.c @@ -30,7 +30,7 @@ DECLARE_GLOBAL_DATA_PTR; #if !defined(CONFIG_SPL_BUILD) -inline void set_muxconf_regs_essential(void){}; +inline void set_muxconf_regs(void){}; #endif const struct omap_sysinfo sysinfo = { diff --git a/board/compulab/cm_t54/mux.c b/board/compulab/cm_t54/mux.c index da35383..45d868f 100644 --- a/board/compulab/cm_t54/mux.c +++ b/board/compulab/cm_t54/mux.c @@ -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. */ -void set_muxconf_regs_essential(void) +void set_muxconf_regs(void) { do_set_mux((*ctrl)->control_padconf_core_base, core_padconf_array_essential, diff --git a/board/gumstix/duovero/duovero.c b/board/gumstix/duovero/duovero.c index 1fb6b5d..9671c5a 100644 --- a/board/gumstix/duovero/duovero.c +++ b/board/gumstix/duovero/duovero.c @@ -87,7 +87,7 @@ int misc_init_r(void) return 0; } -void set_muxconf_regs_essential(void) +void set_muxconf_regs(void) { do_set_mux((*ctrl)->control_padconf_core_base, core_padconf_array_essential, diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 63bacfb..67191af 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -335,7 +335,7 @@ int board_late_init(void) return 0; } -void set_muxconf_regs_essential(void) +void set_muxconf_regs(void) { do_set_mux32((*ctrl)->control_padconf_core_base, early_padconf, ARRAY_SIZE(early_padconf)); diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 97174c8..4e45abf 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -338,7 +338,7 @@ void do_board_detect(void) } #endif /* CONFIG_SPL_BUILD */ -void set_muxconf_regs_essential(void) +void set_muxconf_regs(void) { do_set_mux32((*ctrl)->control_padconf_core_base, early_padconf, ARRAY_SIZE(early_padconf)); diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c index 853f196..50da410 100644 --- a/board/ti/omap5_uevm/evm.c +++ b/board/ti/omap5_uevm/evm.c @@ -198,7 +198,7 @@ int misc_init_r(void) return 0; } -void set_muxconf_regs_essential(void) +void set_muxconf_regs(void) { do_set_mux((*ctrl)->control_padconf_core_base, core_padconf_array_essential, diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index 959a23f..13b5daf 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c @@ -268,7 +268,7 @@ int misc_init_r(void) return 0; } -void set_muxconf_regs_essential(void) +void set_muxconf_regs(void) { do_set_mux((*ctrl)->control_padconf_core_base, core_padconf_array_essential, diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c index c456745..6037cdd 100644 --- a/board/ti/sdp4430/sdp.c +++ b/board/ti/sdp4430/sdp.c @@ -53,7 +53,7 @@ int misc_init_r(void) return 0; } -void set_muxconf_regs_essential(void) +void set_muxconf_regs(void) { do_set_mux((*ctrl)->control_padconf_core_base, core_padconf_array_essential, |