diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-12 11:10:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-12 11:10:24 -0400 |
| commit | 25f4a81ef51b7c279786f5b81fe6d89510f46d99 (patch) | |
| tree | c8054ad0b03ce5355477ef2645fa2c9ddd6ed643 /arch/arm/plat-omap/mux.c | |
| parent | 487194a19d2069bfcc9791c3ab2204bed59b136a (diff) | |
| parent | e3318fb40092fecbf5069e7a5daa0040a427d1b4 (diff) | |
Merge branch 'omap-fixes' into fixes
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 | ||