From 67249d8fe50184bca5c7cd61b33ca2fa1ec5c552 Mon Sep 17 00:00:00 2001 From: Vladimir Ananiev Date: Mon, 11 Dec 2006 13:32:29 -0800 Subject: [PATCH] ARM: OMAP: omap1501->15xx conversions needed for sx1, non-core Convert 1501->15xx in drivers omap code, so that sx1 can work. Signed-off-by: Pavel Machek Signed-off-by: Tony Lindgren --- drivers/usb/host/ohci-omap.c | 4 ++-- drivers/video/omap/omapfb_main.c | 8 ++++---- sound/oss/omap-audio-dma-intfc.c | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 9c02177de50..46ac407a452 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c @@ -227,7 +227,7 @@ static int ohci_omap_init(struct usb_hcd *hcd) omap_ohci_clock_power(1); - if (cpu_is_omap1510()) { + if (cpu_is_omap15xx()) { omap_1510_local_bus_power(1); omap_1510_local_bus_init(); } @@ -315,7 +315,7 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver, if (IS_ERR(usb_host_ck)) return PTR_ERR(usb_host_ck); - if (!cpu_is_omap1510()) + if (!cpu_is_omap15xx()) usb_dc_ck = clk_get(0, "usb_dc_ck"); else usb_dc_ck = clk_get(0, "lb_ck"); diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index f6586985006..b2dce7b9507 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c @@ -459,7 +459,7 @@ static int set_fb_var(struct fb_info *fbi, xres_max = panel->x_res; yres_min = OMAPFB_PLANE_YRES_MIN; yres_max = panel->y_res; - if (cpu_is_omap1510()) { + if (cpu_is_omap15xx()) { var->xres = panel->x_res; var->yres = panel->y_res; } @@ -470,7 +470,7 @@ static int set_fb_var(struct fb_info *fbi, xres_max = panel->y_res; yres_min = OMAPFB_PLANE_XRES_MIN; yres_max = panel->x_res; - if (cpu_is_omap1510()) { + if (cpu_is_omap15xx()) { var->xres = panel->y_res; var->yres = panel->x_res; } @@ -552,7 +552,7 @@ static struct fb_var_screeninfo new_var; /* Set rotation (0, 90, 180, 270 degree), and switch to the new mode. */ static void omapfb_rotate(struct fb_info *fbi, int rotate) { - if (cpu_is_omap1510() && rotate != fbi->var.rotate) { + if (cpu_is_omap15xx() && rotate != fbi->var.rotate) { memcpy(&new_var, &fbi->var, sizeof(new_var)); new_var.rotate = rotate; if (set_fb_var(fbi, &new_var) == 0 && @@ -594,7 +594,7 @@ static int omapfb_mirror(struct fb_info *fbi, int mirror) int r = 0; mirror = mirror ? 1 : 0; - if (cpu_is_omap1510()) + if (cpu_is_omap15xx()) r = -EINVAL; else if (mirror != plane->info.mirror) { plane->info.mirror = mirror; diff --git a/sound/oss/omap-audio-dma-intfc.c b/sound/oss/omap-audio-dma-intfc.c index 3974efc6ade..146e28871f7 100644 --- a/sound/oss/omap-audio-dma-intfc.c +++ b/sound/oss/omap-audio-dma-intfc.c @@ -312,7 +312,7 @@ omap_request_sound_dma(int device_id, const char *device_name, void *data, } /* Chain the channels together */ - if (!cpu_is_omap1510()) + if (!cpu_is_omap15xx()) omap_sound_dma_link_lch(data); spin_unlock(&dma_list_lock); @@ -362,7 +362,7 @@ int omap_free_sound_dma(void *data, int **channels) } chan = (*channels); - if (!cpu_is_omap1510()) + if (!cpu_is_omap15xx()) omap_sound_dma_unlink_lch(data); for (i = 0; i < nr_linked_channels; i++) { int cur_chan = chan[i]; @@ -555,7 +555,7 @@ int audio_sync(struct file *file) * to complete. So it's need to unlink dma channels * to avoid empty dma work. */ - if (!cpu_is_omap1510() && AUDIO_QUEUE_EMPTY(s)) + if (!cpu_is_omap15xx() && AUDIO_QUEUE_EMPTY(s)) omap_sound_dma_unlink_lch(s); shiftval = s->fragsize - b->offset; @@ -699,7 +699,7 @@ static int audio_set_dma_params_play(int channel, dma_addr_t dma_ptr, FN_IN; - if (cpu_is_omap1510() || cpu_is_omap16xx()) { + if (cpu_is_omap15xx() || cpu_is_omap16xx()) { dest_start = AUDIO_MCBSP_DATAWRITE; dest_port = OMAP_DMA_PORT_MPUI; } @@ -729,7 +729,7 @@ static int audio_set_dma_params_capture(int channel, dma_addr_t dma_ptr, FN_IN; - if (cpu_is_omap1510() || cpu_is_omap16xx()) { + if (cpu_is_omap15xx() || cpu_is_omap16xx()) { src_start = AUDIO_MCBSP_DATAREAD; src_port = OMAP_DMA_PORT_MPUI; } @@ -871,7 +871,7 @@ static void sound_dma_irq_handler(int sound_curr_lch, u16 ch_status, void *data) ch_status, dma_status, data); if (dma_status & (DCSR_ERROR)) { - if (cpu_is_omap1510() || cpu_is_omap16xx()) + if (cpu_is_omap15xx() || cpu_is_omap16xx()) OMAP_DMA_CCR_REG(sound_curr_lch) &= ~DCCR_EN; ERR("DCSR_ERROR!\n"); FN_OUT(-1); @@ -952,7 +952,7 @@ dma_callback_t audio_get_dma_callback(void) static int __init audio_dma_init(void) { - if (!cpu_is_omap1510()) + if (!cpu_is_omap15xx()) nr_linked_channels = 2; return 0; -- 2.41.0