diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap1/clock.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/mux.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index b67ba34c5636..f625f6dd228a 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c | |||
@@ -691,7 +691,7 @@ int __init omap1_clk_init(void) | |||
691 | 691 | ||
692 | info = omap_get_config(OMAP_TAG_CLOCK, struct omap_clock_config); | 692 | info = omap_get_config(OMAP_TAG_CLOCK, struct omap_clock_config); |
693 | if (info != NULL) { | 693 | if (info != NULL) { |
694 | if (!cpu_is_omap1510()) | 694 | if (!cpu_is_omap15xx()) |
695 | crystal_type = info->system_clock_type; | 695 | crystal_type = info->system_clock_type; |
696 | } | 696 | } |
697 | 697 | ||
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, |