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>
This commit is contained in:
parent
193506106d
commit
99c658a6c0
|
@ -691,7 +691,7 @@ int __init omap1_clk_init(void)
|
||||||
|
|
||||||
info = omap_get_config(OMAP_TAG_CLOCK, struct omap_clock_config);
|
info = omap_get_config(OMAP_TAG_CLOCK, struct omap_clock_config);
|
||||||
if (info != NULL) {
|
if (info != NULL) {
|
||||||
if (!cpu_is_omap1510())
|
if (!cpu_is_omap15xx())
|
||||||
crystal_type = info->system_clock_type;
|
crystal_type = info->system_clock_type;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -116,7 +116,7 @@ int __init_or_module omap_cfg_reg(const unsigned long index)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Check for pull up or pull down selection on 1610 */
|
/* Check for pull up or pull down selection on 1610 */
|
||||||
if (!cpu_is_omap1510()) {
|
if (!cpu_is_omap15xx()) {
|
||||||
if (cfg->pu_pd_reg && cfg->pull_val) {
|
if (cfg->pu_pd_reg && cfg->pull_val) {
|
||||||
spin_lock_irqsave(&mux_spin_lock, flags);
|
spin_lock_irqsave(&mux_spin_lock, flags);
|
||||||
pu_pd_orig = omap_readl(cfg->pu_pd_reg);
|
pu_pd_orig = omap_readl(cfg->pu_pd_reg);
|
||||||
|
@ -172,7 +172,7 @@ int __init_or_module omap_cfg_reg(const unsigned long index)
|
||||||
printk(" %s (0x%08x) = 0x%08x -> 0x%08x\n",
|
printk(" %s (0x%08x) = 0x%08x -> 0x%08x\n",
|
||||||
cfg->mux_reg_name, cfg->mux_reg, reg_orig, reg);
|
cfg->mux_reg_name, cfg->mux_reg, reg_orig, reg);
|
||||||
|
|
||||||
if (!cpu_is_omap1510()) {
|
if (!cpu_is_omap15xx()) {
|
||||||
if (cfg->pu_pd_reg && cfg->pull_val) {
|
if (cfg->pu_pd_reg && cfg->pull_val) {
|
||||||
printk(" %s (0x%08x) = 0x%08x -> 0x%08x\n",
|
printk(" %s (0x%08x) = 0x%08x -> 0x%08x\n",
|
||||||
cfg->pu_pd_name, cfg->pu_pd_reg,
|
cfg->pu_pd_name, cfg->pu_pd_reg,
|
||||||
|
|
|
@ -70,7 +70,7 @@
|
||||||
|
|
||||||
#define virt_to_lbus(x) ((x) - PAGE_OFFSET + OMAP1510_LB_OFFSET)
|
#define virt_to_lbus(x) ((x) - PAGE_OFFSET + OMAP1510_LB_OFFSET)
|
||||||
#define lbus_to_virt(x) ((x) - OMAP1510_LB_OFFSET + PAGE_OFFSET)
|
#define lbus_to_virt(x) ((x) - OMAP1510_LB_OFFSET + PAGE_OFFSET)
|
||||||
#define is_lbus_device(dev) (cpu_is_omap1510() && dev && (strncmp(dev->bus_id, "ohci", 4) == 0))
|
#define is_lbus_device(dev) (cpu_is_omap15xx() && dev && (strncmp(dev->bus_id, "ohci", 4) == 0))
|
||||||
|
|
||||||
#define __arch_page_to_dma(dev, page) ({is_lbus_device(dev) ? \
|
#define __arch_page_to_dma(dev, page) ({is_lbus_device(dev) ? \
|
||||||
(dma_addr_t)virt_to_lbus(page_address(page)) : \
|
(dma_addr_t)virt_to_lbus(page_address(page)) : \
|
||||||
|
|
Loading…
Reference in New Issue