|
@@ -51,7 +51,7 @@ struct omap_mux_entry {
|
|
|
static unsigned long mux_phys;
|
|
|
static void __iomem *mux_base;
|
|
|
|
|
|
-static inline u16 omap_mux_read(u16 reg)
|
|
|
+u16 omap_mux_read(u16 reg)
|
|
|
{
|
|
|
if (cpu_is_omap24xx())
|
|
|
return __raw_readb(mux_base + reg);
|
|
@@ -59,7 +59,7 @@ static inline u16 omap_mux_read(u16 reg)
|
|
|
return __raw_readw(mux_base + reg);
|
|
|
}
|
|
|
|
|
|
-static inline void omap_mux_write(u16 val, u16 reg)
|
|
|
+void omap_mux_write(u16 val, u16 reg)
|
|
|
{
|
|
|
if (cpu_is_omap24xx())
|
|
|
__raw_writeb(val, mux_base + reg);
|
|
@@ -67,6 +67,14 @@ static inline void omap_mux_write(u16 val, u16 reg)
|
|
|
__raw_writew(val, mux_base + reg);
|
|
|
}
|
|
|
|
|
|
+void omap_mux_write_array(struct omap_board_mux *board_mux)
|
|
|
+{
|
|
|
+ while (board_mux->reg_offset != OMAP_MUX_TERMINATOR) {
|
|
|
+ omap_mux_write(board_mux->value, board_mux->reg_offset);
|
|
|
+ board_mux++;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
#if defined(CONFIG_ARCH_OMAP24XX) && defined(CONFIG_OMAP_MUX)
|
|
|
|
|
|
static struct omap_mux_cfg arch_mux_cfg;
|
|
@@ -833,14 +841,6 @@ static void __init omap_mux_set_cmdline_signals(void)
|
|
|
kfree(options);
|
|
|
}
|
|
|
|
|
|
-static void __init omap_mux_set_board_signals(struct omap_board_mux *board_mux)
|
|
|
-{
|
|
|
- while (board_mux->reg_offset != OMAP_MUX_TERMINATOR) {
|
|
|
- omap_mux_write(board_mux->value, board_mux->reg_offset);
|
|
|
- board_mux++;
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
static int __init omap_mux_copy_names(struct omap_mux *src,
|
|
|
struct omap_mux *dst)
|
|
|
{
|
|
@@ -1004,7 +1004,7 @@ int __init omap_mux_init(u32 mux_pbase, u32 mux_size,
|
|
|
|
|
|
#ifdef CONFIG_OMAP_MUX
|
|
|
omap_mux_set_cmdline_signals();
|
|
|
- omap_mux_set_board_signals(board_mux);
|
|
|
+ omap_mux_write_array(board_mux);
|
|
|
#endif
|
|
|
|
|
|
return 0;
|