diff options
author | Kyungmin Park <kyungmin.park@samsung.com> | 2006-12-06 20:13:54 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2007-05-10 18:51:09 -0400 |
commit | 7bbb3cc5c816fc167601ce9519adae5eced3ea6d (patch) | |
tree | 46230dd86d69905a2acbf76769036c9736156ae1 /arch/arm/plat-omap/mux.c | |
parent | d30c7369666ff1687f668ea5a65b99d1f7e06144 (diff) |
ARM: OMAP: 24xx pinmux updates
Add some OMAP 24xx pin mux declarations to support:
- TUSB 6010 EVM (on H4)
- All three full speed USB ports
- GPIOs used with USB0 on Apollon and H4
For OMAP2, issue MUX_WARNINGS and debug messages correctly; and make the
message look more like the OMAP1 message.
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/mux.c')
-rw-r--r-- | arch/arm/plat-omap/mux.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c index 6c798d288688..75211f20ccb3 100644 --- a/arch/arm/plat-omap/mux.c +++ b/arch/arm/plat-omap/mux.c | |||
@@ -83,10 +83,21 @@ int __init_or_module omap_cfg_reg(const unsigned long index) | |||
83 | reg |= OMAP24XX_PULL_ENA; | 83 | reg |= OMAP24XX_PULL_ENA; |
84 | if(cfg->pu_pd_val) | 84 | if(cfg->pu_pd_val) |
85 | reg |= OMAP24XX_PULL_UP; | 85 | reg |= OMAP24XX_PULL_UP; |
86 | #ifdef CONFIG_OMAP_MUX_DEBUG | 86 | #if defined(CONFIG_OMAP_MUX_DEBUG) || defined(CONFIG_OMAP_MUX_WARNINGS) |
87 | printk("Muxing %s (0x%08x): 0x%02x -> 0x%02x\n", | 87 | { |
88 | cfg->name, OMAP24XX_L4_BASE + cfg->mux_reg, | 88 | u8 orig = omap_readb(OMAP24XX_L4_BASE + cfg->mux_reg); |
89 | omap_readb(OMAP24XX_L4_BASE + cfg->mux_reg), reg); | 89 | u8 debug = 0; |
90 | |||
91 | #ifdef CONFIG_OMAP_MUX_DEBUG | ||
92 | debug = cfg->debug; | ||
93 | #endif | ||
94 | warn = (orig != reg); | ||
95 | if (debug || warn) | ||
96 | printk("MUX: setup %s (0x%08x): 0x%02x -> 0x%02x\n", | ||
97 | cfg->name, | ||
98 | OMAP24XX_L4_BASE + cfg->mux_reg, | ||
99 | orig, reg); | ||
100 | } | ||
90 | #endif | 101 | #endif |
91 | omap_writeb(reg, OMAP24XX_L4_BASE + cfg->mux_reg); | 102 | omap_writeb(reg, OMAP24XX_L4_BASE + cfg->mux_reg); |
92 | 103 | ||