From: Tony Lindgren Date: Mon, 3 Apr 2006 15:19:20 +0000 (-0700) Subject: Cleanup patch to sync with mainline kernel X-Git-Tag: v2.6.16-omap1~4 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=a742e30be38e97021bbaaba946001efdd88e09ab Cleanup patch to sync with mainline kernel --- diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 51634ce12cb..7eded8e1b91 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c @@ -286,13 +286,13 @@ static struct platform_device h2_lcd_device = { .id = -1, }; -static struct omap_mcbsp_reg_cfg mcbsp_regs = { +static struct omap_mcbsp_reg_cfg mcbsp_regs = { .spcr2 = FREE | FRST | GRST | XRST | XINTM(3), .spcr1 = RINTM(3) | RRST, .rcr2 = RPHASE | RFRLEN2(OMAP_MCBSP_WORD_8) | RWDLEN2(OMAP_MCBSP_WORD_16) | RDATDLY(1), .rcr1 = RFRLEN1(OMAP_MCBSP_WORD_8) | RWDLEN1(OMAP_MCBSP_WORD_16), - .xcr2 = XPHASE | XFRLEN2(OMAP_MCBSP_WORD_8) | + .xcr2 = XPHASE | XFRLEN2(OMAP_MCBSP_WORD_8) | XWDLEN2(OMAP_MCBSP_WORD_16) | XDATDLY(1) | XFIG, .xcr1 = XFRLEN1(OMAP_MCBSP_WORD_8) | XWDLEN1(OMAP_MCBSP_WORD_16), .srgr1 = FWID(15), @@ -301,7 +301,7 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = { .pcr0 = CLKXM | CLKRM | FSXP | FSRP | CLKXP | CLKRP, //.pcr0 = CLKXP | CLKRP, /* mcbsp: slave */ }; - + static struct omap_alsa_codec_config alsa_config = { .name = "H2 TSC2101", .mcbsp_regs_alsa = &mcbsp_regs, @@ -311,15 +311,15 @@ static struct omap_alsa_codec_config alsa_config = { .codec_clock_on = NULL, // tsc2101_clock_on, .codec_clock_off = NULL, // tsc2101_clock_off, .get_default_samplerate = NULL, // tsc2101_get_default_samplerate, -}; +}; static struct platform_device h2_mcbsp1_device = { .name = "omap_alsa_mcbsp", .id = 1, .dev = { .platform_data = &alsa_config, - }, -}; + }, +}; static struct platform_device *h2_devices[] __initdata = { &h2_nor_device, diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 24dd374224a..0884bc7c23b 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -167,7 +167,7 @@ void __init omap_serial_init() static struct platform_device serial_device = { .name = "serial8250", - .id = 0, + .id = PLAT8250_DEV_PLATFORM, .dev = { .platform_data = serial_platform_data, }, diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 29071ad3421..ca16552d2c1 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c @@ -67,7 +67,7 @@ struct clk * clk_get(struct device *dev, const char *id) clk = p; break; } - } + } mutex_unlock(&clocks_mutex); diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c index 6dd5292df07..305e9b990b7 100644 --- a/arch/arm/plat-omap/fb.c +++ b/arch/arm/plat-omap/fb.c @@ -20,14 +20,10 @@ static struct omapfb_platform_data omapfb_config; static u64 omap_fb_dma_mask = ~(u32)0; -/* in devices.c */ -extern void omap_nop_release(struct device *dev); - static struct platform_device omap_fb_device = { .name = "omapfb", .id = -1, .dev = { - .release = omap_nop_release, .dma_mask = &omap_fb_dma_mask, .coherent_dma_mask = ~(u32)0, .platform_data = &omapfb_config, diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index d87f21cc3c0..053178dfc44 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c @@ -310,10 +310,10 @@ int omap_mcbsp_request(unsigned int id) mcbsp[id].tx_irq, mcbsp[id].id); return err; } - + init_completion(&(mcbsp[id].tx_irq_completion)); - - + + err = request_irq(mcbsp[id].rx_irq, omap_mcbsp_rx_irq_handler, 0, "McBSP", (void *) (&mcbsp[id])); @@ -323,10 +323,10 @@ int omap_mcbsp_request(unsigned int id) free_irq(mcbsp[id].tx_irq, (void *) (&mcbsp[id])); return err; } - + init_completion(&(mcbsp[id].rx_irq_completion)); } - + return 0; } @@ -364,7 +364,7 @@ void omap_mcbsp_free(unsigned int id) mcbsp[id].free = 1; spin_unlock(&mcbsp[id].lock); - + if (mcbsp[id].io_type == OMAP_MCBSP_IRQ_IO) { /* Free IRQs */ free_irq(mcbsp[id].rx_irq, (void *) (&mcbsp[id])); diff --git a/arch/arm/plat-omap/timer32k.c b/arch/arm/plat-omap/timer32k.c index 6ef5468c31b..b2a943bf11e 100644 --- a/arch/arm/plat-omap/timer32k.c +++ b/arch/arm/plat-omap/timer32k.c @@ -272,7 +272,7 @@ static struct clk * gpt1_ick; static struct clk * gpt1_fck; static __init void omap_init_32k_timer(void) -{ +{ #ifdef CONFIG_NO_IDLE_HZ omap_timer.dyn_tick = &omap_dyn_tick_timer; #endif diff --git a/include/asm-arm/arch-omap/mux.h b/include/asm-arm/arch-omap/mux.h index 28fd67542dd..0dc24d4ba59 100644 --- a/include/asm-arm/arch-omap/mux.h +++ b/include/asm-arm/arch-omap/mux.h @@ -171,7 +171,7 @@ enum omap730_index { E4_730_KBC2, F4_730_KBC3, E3_730_KBC4, - + /* USB */ AA17_730_USB_DM, W16_730_USB_PU_EN, diff --git a/include/asm-arm/arch-omap/omap-alsa.h b/include/asm-arm/arch-omap/omap-alsa.h index b4ec45a84e6..7841ddc5e86 100644 --- a/include/asm-arm/arch-omap/omap-alsa.h +++ b/include/asm-arm/arch-omap/omap-alsa.h @@ -1,6 +1,6 @@ /* * linux/include/asm-arm/arch-omap/omap-alsa.h - * + * * Alsa Driver for AIC23 and TSC2101 codecs on OMAP platform boards. * * Copyright (C) 2006 Mika Laitio