Commit a742e30b authored by Tony Lindgren's avatar Tony Lindgren

Cleanup patch to sync with mainline kernel

parent fdd8a3fd
...@@ -286,13 +286,13 @@ static struct platform_device h2_lcd_device = { ...@@ -286,13 +286,13 @@ static struct platform_device h2_lcd_device = {
.id = -1, .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), .spcr2 = FREE | FRST | GRST | XRST | XINTM(3),
.spcr1 = RINTM(3) | RRST, .spcr1 = RINTM(3) | RRST,
.rcr2 = RPHASE | RFRLEN2(OMAP_MCBSP_WORD_8) | .rcr2 = RPHASE | RFRLEN2(OMAP_MCBSP_WORD_8) |
RWDLEN2(OMAP_MCBSP_WORD_16) | RDATDLY(1), RWDLEN2(OMAP_MCBSP_WORD_16) | RDATDLY(1),
.rcr1 = RFRLEN1(OMAP_MCBSP_WORD_8) | RWDLEN1(OMAP_MCBSP_WORD_16), .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, XWDLEN2(OMAP_MCBSP_WORD_16) | XDATDLY(1) | XFIG,
.xcr1 = XFRLEN1(OMAP_MCBSP_WORD_8) | XWDLEN1(OMAP_MCBSP_WORD_16), .xcr1 = XFRLEN1(OMAP_MCBSP_WORD_8) | XWDLEN1(OMAP_MCBSP_WORD_16),
.srgr1 = FWID(15), .srgr1 = FWID(15),
...@@ -301,7 +301,7 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = { ...@@ -301,7 +301,7 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = {
.pcr0 = CLKXM | CLKRM | FSXP | FSRP | CLKXP | CLKRP, .pcr0 = CLKXM | CLKRM | FSXP | FSRP | CLKXP | CLKRP,
//.pcr0 = CLKXP | CLKRP, /* mcbsp: slave */ //.pcr0 = CLKXP | CLKRP, /* mcbsp: slave */
}; };
static struct omap_alsa_codec_config alsa_config = { static struct omap_alsa_codec_config alsa_config = {
.name = "H2 TSC2101", .name = "H2 TSC2101",
.mcbsp_regs_alsa = &mcbsp_regs, .mcbsp_regs_alsa = &mcbsp_regs,
...@@ -311,15 +311,15 @@ static struct omap_alsa_codec_config alsa_config = { ...@@ -311,15 +311,15 @@ static struct omap_alsa_codec_config alsa_config = {
.codec_clock_on = NULL, // tsc2101_clock_on, .codec_clock_on = NULL, // tsc2101_clock_on,
.codec_clock_off = NULL, // tsc2101_clock_off, .codec_clock_off = NULL, // tsc2101_clock_off,
.get_default_samplerate = NULL, // tsc2101_get_default_samplerate, .get_default_samplerate = NULL, // tsc2101_get_default_samplerate,
}; };
static struct platform_device h2_mcbsp1_device = { static struct platform_device h2_mcbsp1_device = {
.name = "omap_alsa_mcbsp", .name = "omap_alsa_mcbsp",
.id = 1, .id = 1,
.dev = { .dev = {
.platform_data = &alsa_config, .platform_data = &alsa_config,
}, },
}; };
static struct platform_device *h2_devices[] __initdata = { static struct platform_device *h2_devices[] __initdata = {
&h2_nor_device, &h2_nor_device,
......
...@@ -167,7 +167,7 @@ void __init omap_serial_init() ...@@ -167,7 +167,7 @@ void __init omap_serial_init()
static struct platform_device serial_device = { static struct platform_device serial_device = {
.name = "serial8250", .name = "serial8250",
.id = 0, .id = PLAT8250_DEV_PLATFORM,
.dev = { .dev = {
.platform_data = serial_platform_data, .platform_data = serial_platform_data,
}, },
......
...@@ -67,7 +67,7 @@ struct clk * clk_get(struct device *dev, const char *id) ...@@ -67,7 +67,7 @@ struct clk * clk_get(struct device *dev, const char *id)
clk = p; clk = p;
break; break;
} }
} }
mutex_unlock(&clocks_mutex); mutex_unlock(&clocks_mutex);
......
...@@ -20,14 +20,10 @@ static struct omapfb_platform_data omapfb_config; ...@@ -20,14 +20,10 @@ static struct omapfb_platform_data omapfb_config;
static u64 omap_fb_dma_mask = ~(u32)0; 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 = { static struct platform_device omap_fb_device = {
.name = "omapfb", .name = "omapfb",
.id = -1, .id = -1,
.dev = { .dev = {
.release = omap_nop_release,
.dma_mask = &omap_fb_dma_mask, .dma_mask = &omap_fb_dma_mask,
.coherent_dma_mask = ~(u32)0, .coherent_dma_mask = ~(u32)0,
.platform_data = &omapfb_config, .platform_data = &omapfb_config,
......
...@@ -310,10 +310,10 @@ int omap_mcbsp_request(unsigned int id) ...@@ -310,10 +310,10 @@ int omap_mcbsp_request(unsigned int id)
mcbsp[id].tx_irq, mcbsp[id].id); mcbsp[id].tx_irq, mcbsp[id].id);
return err; return err;
} }
init_completion(&(mcbsp[id].tx_irq_completion)); init_completion(&(mcbsp[id].tx_irq_completion));
err = request_irq(mcbsp[id].rx_irq, omap_mcbsp_rx_irq_handler, 0, err = request_irq(mcbsp[id].rx_irq, omap_mcbsp_rx_irq_handler, 0,
"McBSP", "McBSP",
(void *) (&mcbsp[id])); (void *) (&mcbsp[id]));
...@@ -323,10 +323,10 @@ int omap_mcbsp_request(unsigned int id) ...@@ -323,10 +323,10 @@ int omap_mcbsp_request(unsigned int id)
free_irq(mcbsp[id].tx_irq, (void *) (&mcbsp[id])); free_irq(mcbsp[id].tx_irq, (void *) (&mcbsp[id]));
return err; return err;
} }
init_completion(&(mcbsp[id].rx_irq_completion)); init_completion(&(mcbsp[id].rx_irq_completion));
} }
return 0; return 0;
} }
...@@ -364,7 +364,7 @@ void omap_mcbsp_free(unsigned int id) ...@@ -364,7 +364,7 @@ void omap_mcbsp_free(unsigned int id)
mcbsp[id].free = 1; mcbsp[id].free = 1;
spin_unlock(&mcbsp[id].lock); spin_unlock(&mcbsp[id].lock);
if (mcbsp[id].io_type == OMAP_MCBSP_IRQ_IO) { if (mcbsp[id].io_type == OMAP_MCBSP_IRQ_IO) {
/* Free IRQs */ /* Free IRQs */
free_irq(mcbsp[id].rx_irq, (void *) (&mcbsp[id])); free_irq(mcbsp[id].rx_irq, (void *) (&mcbsp[id]));
......
...@@ -272,7 +272,7 @@ static struct clk * gpt1_ick; ...@@ -272,7 +272,7 @@ static struct clk * gpt1_ick;
static struct clk * gpt1_fck; static struct clk * gpt1_fck;
static __init void omap_init_32k_timer(void) static __init void omap_init_32k_timer(void)
{ {
#ifdef CONFIG_NO_IDLE_HZ #ifdef CONFIG_NO_IDLE_HZ
omap_timer.dyn_tick = &omap_dyn_tick_timer; omap_timer.dyn_tick = &omap_dyn_tick_timer;
#endif #endif
......
...@@ -171,7 +171,7 @@ enum omap730_index { ...@@ -171,7 +171,7 @@ enum omap730_index {
E4_730_KBC2, E4_730_KBC2,
F4_730_KBC3, F4_730_KBC3,
E3_730_KBC4, E3_730_KBC4,
/* USB */ /* USB */
AA17_730_USB_DM, AA17_730_USB_DM,
W16_730_USB_PU_EN, W16_730_USB_PU_EN,
......
/* /*
* linux/include/asm-arm/arch-omap/omap-alsa.h * linux/include/asm-arm/arch-omap/omap-alsa.h
* *
* Alsa Driver for AIC23 and TSC2101 codecs on OMAP platform boards. * Alsa Driver for AIC23 and TSC2101 codecs on OMAP platform boards.
* *
* Copyright (C) 2006 Mika Laitio <lamikr@cc.jyu.fi> * Copyright (C) 2006 Mika Laitio <lamikr@cc.jyu.fi>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment