aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-omap/mux.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-arm/arch-omap/mux.h')
-rw-r--r--include/asm-arm/arch-omap/mux.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-arm/arch-omap/mux.h b/include/asm-arm/arch-omap/mux.h
index b8fff50e6a87..0edc6ce91b33 100644
--- a/include/asm-arm/arch-omap/mux.h
+++ b/include/asm-arm/arch-omap/mux.h
@@ -559,11 +559,17 @@ enum omap24xx_index {
559 B13_24XX_KBC6, 559 B13_24XX_KBC6,
560}; 560};
561 561
562struct omap_mux_cfg {
563 struct pin_config *pins;
564 unsigned long size;
565 int (*cfg_reg)(const struct pin_config *cfg);
566};
567
562#ifdef CONFIG_OMAP_MUX 568#ifdef CONFIG_OMAP_MUX
563/* setup pin muxing in Linux */ 569/* setup pin muxing in Linux */
564extern int omap1_mux_init(void); 570extern int omap1_mux_init(void);
565extern int omap2_mux_init(void); 571extern int omap2_mux_init(void);
566extern int omap_mux_register(struct pin_config * pins, unsigned long size); 572extern int omap_mux_register(struct omap_mux_cfg *);
567extern int omap_cfg_reg(unsigned long reg_cfg); 573extern int omap_cfg_reg(unsigned long reg_cfg);
568#else 574#else
569/* boot loader does it all (no warnings from CONFIG_OMAP_MUX_WARNINGS) */ 575/* boot loader does it all (no warnings from CONFIG_OMAP_MUX_WARNINGS) */