diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:04:15 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:06:24 -0500 |
| commit | a7790532f5b7358c33a6b1834dc2b318de209f31 (patch) | |
| tree | 0ceb9e24b3f54cb5c8453fb5a218e2a94a0f1cce /arch/arm/mach-omap2/mux.h | |
| parent | 2764fb4244cc1bc08df3667924ca4a972e90ac70 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
The SmartMedia FTL code depends on new kfifo bits from 2.6.33
Diffstat (limited to 'arch/arm/mach-omap2/mux.h')
| -rw-r--r-- | arch/arm/mach-omap2/mux.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h index d8b4d5ad2278..f8c2e7a8f063 100644 --- a/arch/arm/mach-omap2/mux.h +++ b/arch/arm/mach-omap2/mux.h | |||
| @@ -147,6 +147,30 @@ u16 omap_mux_get_gpio(int gpio); | |||
| 147 | void omap_mux_set_gpio(u16 val, int gpio); | 147 | void omap_mux_set_gpio(u16 val, int gpio); |
| 148 | 148 | ||
| 149 | /** | 149 | /** |
| 150 | * omap_mux_read() - read mux register | ||
| 151 | * @mux_offset: Offset of the mux register | ||
| 152 | * | ||
| 153 | */ | ||
| 154 | u16 omap_mux_read(u16 mux_offset); | ||
| 155 | |||
| 156 | /** | ||
| 157 | * omap_mux_write() - write mux register | ||
| 158 | * @val: New mux register value | ||
| 159 | * @mux_offset: Offset of the mux register | ||
| 160 | * | ||
| 161 | * This should be only needed for dynamic remuxing of non-gpio signals. | ||
| 162 | */ | ||
| 163 | void omap_mux_write(u16 val, u16 mux_offset); | ||
| 164 | |||
| 165 | /** | ||
| 166 | * omap_mux_write_array() - write an array of mux registers | ||
| 167 | * @board_mux: Array of mux registers terminated by MAP_MUX_TERMINATOR | ||
| 168 | * | ||
| 169 | * This should be only needed for dynamic remuxing of non-gpio signals. | ||
| 170 | */ | ||
| 171 | void omap_mux_write_array(struct omap_board_mux *board_mux); | ||
| 172 | |||
| 173 | /** | ||
| 150 | * omap3_mux_init() - initialize mux system with board specific set | 174 | * omap3_mux_init() - initialize mux system with board specific set |
| 151 | * @board_mux: Board specific mux table | 175 | * @board_mux: Board specific mux table |
| 152 | * @flags: OMAP package type used for the board | 176 | * @flags: OMAP package type used for the board |