ARM: OMAP: omap1501->15xx conversions needed for sx1
PATCH 1/1 ARM: OMAP: omap1501->15xx conversions needed for sx1
From: Vladimir Ananiev <[email protected]>
Convert 1501->15xx in generic omap code, so that sx1 can work.
Signed-off-by Pavel Machek <[email protected]>
arch/arm/mach-omap1/clock.c +1 -1
@@ -691,7 +691,7 @@ #endif info = omap_get_config(OMAP_TAG_CLOCK, struct omap_clock_config);if (info !=NULL ) { -if (!cpu_is_omap1510 ()) +if (!cpu_is_omap15xx ()) crystal_type = info->system_clock_type; }
arch/arm/plat-omap/dsp/dsp_common.c +1 -1
@@ -273,7 +273,7 @@ static int __init omap_dsp_init(void) dspmem_size =0 ;#ifdef CONFIG_ARCH_OMAP15XX -if (cpu_is_omap1510 ()) { +if (cpu_is_omap15xx ()) { dspmem_base =OMAP1510_DSP_BASE ; dspmem_size =OMAP1510_DSP_SIZE ; daram_base =OMAP1510_DARAM_BASE ;
index 7e91779..4e5f9b7 100644
arch/arm/plat-omap/mux.c +2 -2
@@ -127,7 +127,7 @@ #endif }/* 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) {spin_lock_irqsave (&mux_spin_lock, flags); pu_pd_orig =omap_readl (cfg->pu_pd_reg);
@@ -183,7 +183,7 @@ #ifdef CONFIG_OMAP_MUX_DEBUGprintk (" %s (0x%08x) = 0x%08x -> 0x%08x\n" , 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) { printk(" %s (0x%08x) = 0x%08x -> 0x%08x\n", cfg->pu_pd_name, cfg->pu_pd_reg,
include/asm-arm/arch-omap/memory.h +1 -1
@@ -70,7 +70,7 @@ #define OMAP1510_LB_OFFSET UL(0x30000000#define virt_to_lbus (x) ((x) - PAGE_OFFSET + OMAP1510_LB_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) ? \ (dma_addr_t)virt_to_lbus(page_address(page)) : \
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Tony Lindgren
reviewerQuoted 3 lines · Pavel Machek
From: Vladimir Ananiev <[email protected]>
Convert 1501->15xx in generic omap code, so that sx1 can work.
Pushing today to linux-omap tree.
Tony