aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/mux.c
diff options
context:
space:
mode:
authorVladimir Ananiev <vovan888@gmail.com>2006-12-11 16:30:21 -0500
committerTony Lindgren <tony@atomide.com>2007-03-02 04:47:12 -0500
commit99c658a6c018a88b336dbd54d2e552db85348894 (patch)
treef70dddad6ede4704f8868fd6ec9de7d2877af234 /arch/arm/plat-omap/mux.c
parent193506106d19ad54d56740612bf1be1c68d13bb8 (diff)
ARM: OMAP: omap1510->15xx conversions needed for sx1
Convert 1510->15xx in generic omap code, so that sx1 can work. Signed-off-by: Pavel Machek <pavel@suse.cz> 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c
index 042105ac30b8..6c798d288688 100644
--- a/arch/arm/plat-omap/mux.c
+++ b/arch/arm/plat-omap/mux.c
@@ -116,7 +116,7 @@ int __init_or_module omap_cfg_reg(const unsigned long index)
116 } 116 }
117 117
118 /* Check for pull up or pull down selection on 1610 */ 118 /* Check for pull up or pull down selection on 1610 */
119 if (!cpu_is_omap1510()) { 119 if (!cpu_is_omap15xx()) {
120 if (cfg->pu_pd_reg && cfg->pull_val) { 120 if (cfg->pu_pd_reg && cfg->pull_val) {
121 spin_lock_irqsave(&mux_spin_lock, flags); 121 spin_lock_irqsave(&mux_spin_lock, flags);
122 pu_pd_orig = omap_readl(cfg->pu_pd_reg); 122 pu_pd_orig = omap_readl(cfg->pu_pd_reg);
@@ -172,7 +172,7 @@ int __init_or_module omap_cfg_reg(const unsigned long index)
172 printk(" %s (0x%08x) = 0x%08x -> 0x%08x\n", 172 printk(" %s (0x%08x) = 0x%08x -> 0x%08x\n",
173 cfg->mux_reg_name, cfg->mux_reg, reg_orig, reg); 173 cfg->mux_reg_name, cfg->mux_reg, reg_orig, reg);
174 174
175 if (!cpu_is_omap1510()) { 175 if (!cpu_is_omap15xx()) {
176 if (cfg->pu_pd_reg && cfg->pull_val) { 176 if (cfg->pu_pd_reg && cfg->pull_val) {
177 printk(" %s (0x%08x) = 0x%08x -> 0x%08x\n", 177 printk(" %s (0x%08x) = 0x%08x -> 0x%08x\n",
178 cfg->pu_pd_name, cfg->pu_pd_reg, 178 cfg->pu_pd_name, cfg->pu_pd_reg,