Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

omap: Fix functions for dynamic remuxing of pins

Browse source 
Make the omap_mux_read and write available for board code,
and rename omap_mux_set_board_signals into omap_mux_write_array.
Also add the related prototypes and comments into mux.h.

In some cases we want to change the signals dynamically,
mostly for power management.

Note that we cannot use the signal names as they are set
__init to save memory.

Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren 2010-01-19 15:15:24 -08:00
parent 2cb0c54f3a
commit d4bb72e50a
2 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
arch/arm/mach-omap2/mux.c
View file

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

24
arch/arm/mach-omap2/mux.h
View file

@ -146,6 +146,30 @@ u16 omap_mux_get_gpio(int gpio);
*/ */
void omap_mux_set_gpio(u16 val, int gpio); void omap_mux_set_gpio(u16 val, int gpio);
/**
* omap_mux_read() - read mux register
* @mux_offset: Offset of the mux register
*
*/
u16 omap_mux_read(u16 mux_offset);
/**
* omap_mux_write() - write mux register
* @val: New mux register value
* @mux_offset: Offset of the mux register
*
* This should be only needed for dynamic remuxing of non-gpio signals.
*/
void omap_mux_write(u16 val, u16 mux_offset);
/**
* omap_mux_write_array() - write an array of mux registers
* @board_mux: Array of mux registers terminated by MAP_MUX_TERMINATOR
*
* This should be only needed for dynamic remuxing of non-gpio signals.
*/
void omap_mux_write_array(struct omap_board_mux *board_mux);
/** /**
* omap3_mux_init() - initialize mux system with board specific set * omap3_mux_init() - initialize mux system with board specific set
* @board_mux: Board specific mux table * @board_mux: Board specific mux table