Omap McBSP updates from linux-omap tree, v2
Subsystems (4)
Tony Lindgren
maintainercover Omap McBSP updates from linux-omap tree, v2
Hi all,
This series contains pending McBSP patches from linux-omap tree for review.
These patches are against Russell's devel branch as patches against the mainline tree would currently produce merge conflicts.
Regards,
Tony
Tony Lindgren
maintainerPATCH 1/5 Don't use __init but __devinit to define probe function. A pointer to
From: Uwe Kleine-König <[email protected]>
echo -n omap-mcbsp.1 > /sys/bus/platform/driver/omap-mcbsp/unbind echo -n omap-mcbsp.1 > /sys/bus/platform/driver/omap-mcbsp/bind
While at it move the remove function to the .devexit.text section.
--- arch/arm/plat-omap/mcbsp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/plat-omap/mcbsp.c +3 -3
@@ -804,7 +804,7 @@ EXPORT_SYMBOL(omap_mcbsp_set_spi_mode);* McBSP1 and McBSP3 are directly mapped on 1610 and 1510. * 730 has only 2 McBSP, and both of them are MPU peripherals. */ -static int __init omap_mcbsp_probe (struct platform_device *pdev) +static int __devinit omap_mcbsp_probe (struct platform_device *pdev) {struct omap_mcbsp_platform_data *pdata = pdev->dev.platform_data;int id = pdev->id -1 ;
@@ -868,7 +868,7 @@ exit:return ret; } -static int omap_mcbsp_remove (struct platform_device *pdev) +static int __devexit omap_mcbsp_remove(struct platform_device *pdev) {struct omap_mcbsp *mcbsp =platform_get_drvdata (pdev);
@@ -894,7 +894,7 @@ static int omap_mcbsp_remove(struct platform_device *pdev)static struct platform_driver omap_mcbsp_driver = { .probe = omap_mcbsp_probe, - .remove = omap_mcbsp_remove, + .remove =__devexit_p (omap_mcbsp_remove), .driver = { .name ="omap-mcbsp" , },
Signature · 6 lines
1.5.6.rc3.21.g8c6b5 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Tony Lindgren
maintainerPATCH 2/5 ARM: OMAP: Allocate McBSP devices dynamically
From: Chandra Shekhar <[email protected]>
Based on Chandra's earlier patches in linux-omap tree.
Note that omap1_mcbsp_check and omap2_mcbsp_check are no longer needed as there's now omap_mcbsp_check_valid_id() defined.
Also some functions can now be marked __init.
--- arch/arm/mach-omap1/mcbsp.c | 37 +-- arch/arm/mach-omap2/mcbsp.c | 28 +-- arch/arm/plat-omap/include/mach/mcbsp.h | 33 ++- arch/arm/plat-omap/mcbsp.c | 388 ++++++++++++++++++------------- 4 files changed, 270 insertions(+), 216 deletions(-)
arch/arm/mach-omap1/mcbsp.c +12 -25
@@ -103,30 +103,6 @@ static inline void omap_mcbsp_clk_init(struct mcbsp_internal_clk *mclk) { }#endif -static int omap1_mcbsp_check (unsigned int id) -{ -/* REVISIT: Check correctly for number of registered McBSPs */ -if (cpu_is_omap730 ()) { -if (id >OMAP_MAX_MCBSP_COUNT -2 ) { -printk (KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n" , - id +1 ); -return -ENODEV ; - } -return 0 ; - } - -if (cpu_is_omap15xx () ||cpu_is_omap16xx ()) { -if (id >OMAP_MAX_MCBSP_COUNT -1 ) { -printk (KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n" , - id +1 ); -return -ENODEV ; - } -return 0 ; - } - -return -ENODEV ; -} -static void omap1_mcbsp_request (unsigned int id) {/*
@@ -151,7 +127,6 @@ static void omap1_mcbsp_free(unsigned int id) }static struct omap_mcbsp_ops omap1_mcbsp_ops = { - .check = omap1_mcbsp_check, .request = omap1_mcbsp_request, .free = omap1_mcbsp_free, };
@@ -263,6 +238,18 @@ int __init omap1_mcbsp_init(void) }if (cpu_is_omap730 ()) + omap_mcbsp_count =OMAP730_MCBSP_PDATA_SZ ; +if (cpu_is_omap15xx ()) + omap_mcbsp_count =OMAP15XX_MCBSP_PDATA_SZ ; +if (cpu_is_omap16xx ()) + omap_mcbsp_count =OMAP16XX_MCBSP_PDATA_SZ ; + + mcbsp_ptr =kzalloc (omap_mcbsp_count *sizeof (struct omap_mcbsp *), +GFP_KERNEL ); +if (!mcbsp_ptr) +return -ENOMEM ; + +if (cpu_is_omap730 ())omap_mcbsp_register_board_cfg (omap730_mcbsp_pdata,OMAP730_MCBSP_PDATA_SZ );
arch/arm/mach-omap2/mcbsp.c +12 -16
@@ -28,7 +28,7 @@ struct mcbsp_internal_clk {int n_childs; }; -#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX ) +#if defined(CONFIG_ARCH_OMAP24XX )static void omap_mcbsp_clk_init (struct mcbsp_internal_clk *mclk) {const char *clk_names[] = {"mcbsp_ick" ,"mcbsp_fck" };
@@ -117,18 +117,8 @@ static void omap2_mcbsp_request(unsigned int id)omap2_mcbsp2_mux_setup (); } -static int omap2_mcbsp_check (unsigned int id) -{ -if (id >OMAP_MAX_MCBSP_COUNT -1 ) { -printk (KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n" , id +1 ); -return -ENODEV ; - } -return 0 ; -} -static struct omap_mcbsp_ops omap2_mcbsp_ops = { .request = omap2_mcbsp_request, - .check = omap2_mcbsp_check, };#ifdef CONFIG_ARCH_OMAP24XX
@@ -185,7 +175,7 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {#define OMAP34XX_MCBSP_PDATA_SZ 0#endif -int __init omap2_mcbsp_init (void ) +static int __init omap2_mcbsp_init (void ) {int i;
@@ -196,13 +186,19 @@ int __init omap2_mcbsp_init(void) }if (cpu_is_omap24xx ()) + omap_mcbsp_count =OMAP24XX_MCBSP_PDATA_SZ ; +if (cpu_is_omap34xx ()) + omap_mcbsp_count =OMAP34XX_MCBSP_PDATA_SZ ; + + mcbsp_ptr =kzalloc (omap_mcbsp_count *sizeof (struct omap_mcbsp *), +GFP_KERNEL ); +if (!mcbsp_ptr) +return -ENOMEM ; + +if (cpu_is_omap24xx ())omap_mcbsp_register_board_cfg (omap24xx_mcbsp_pdata,OMAP24XX_MCBSP_PDATA_SZ ); -if (cpu_is_omap34xx ()) -omap_mcbsp_register_board_cfg (omap34xx_mcbsp_pdata, -OMAP34XX_MCBSP_PDATA_SZ ); -return omap_mcbsp_init (); }arch_initcall (omap2_mcbsp_init);
arch/arm/plat-omap/include/mach/mcbsp.h +21 -12
@@ -81,9 +81,6 @@#define OMAP_MCBSP_REG_XCERG 0x3A#define OMAP_MCBSP_REG_XCERH 0x3C -#define OMAP_MAX_MCBSP_COUNT 3 -#define MAX_MCBSP_CLOCKS 3 -#define AUDIO_MCBSP_DATAWRITE (OMAP1510_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1)#define AUDIO_MCBSP_DATAREAD (OMAP1510_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1)
@@ -91,12 +88,14 @@#define AUDIO_DMA_TX OMAP_DMA_MCBSP1_TX#define AUDIO_DMA_RX OMAP_DMA_MCBSP1_RX -#elif defined(CONFIG_ARCH_OMAP24XX ) +#elif defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX )#define OMAP_MCBSP_REG_DRR2 0x00#define OMAP_MCBSP_REG_DRR1 0x04#define OMAP_MCBSP_REG_DXR2 0x08#define OMAP_MCBSP_REG_DXR1 0x0C +#define OMAP_MCBSP_REG_DRR 0x00 +#define OMAP_MCBSP_REG_DXR 0x08#define OMAP_MCBSP_REG_SPCR2 0x10#define OMAP_MCBSP_REG_SPCR1 0x14#define OMAP_MCBSP_REG_RCR2 0x18
@@ -124,9 +123,9 @@#define OMAP_MCBSP_REG_RCERH 0x70#define OMAP_MCBSP_REG_XCERG 0x74#define OMAP_MCBSP_REG_XCERH 0x78 - -#define OMAP_MAX_MCBSP_COUNT 2 -#define MAX_MCBSP_CLOCKS 2 +#define OMAP_MCBSP_REG_SYSCON 0x8C +#define OMAP_MCBSP_REG_XCCR 0xAC +#define OMAP_MCBSP_REG_RCCR 0xB0#define AUDIO_MCBSP_DATAWRITE (OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR1)#define AUDIO_MCBSP_DATAREAD (OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR1)
@@ -137,10 +136,6 @@#endif -#define OMAP_MCBSP_READ (base, reg) __raw_readw((base) + OMAP_MCBSP_REG_##reg) -#define OMAP_MCBSP_WRITE (base, reg, val) __raw_writew((val), (base) + OMAP_MCBSP_REG_##reg) - -/************************** McBSP SPCR1 bit definitions ***********************/ #define RRST 0x0001#define RRDY 0x0002
@@ -151,6 +146,7 @@#define DXENA 0x0080#define CLKSTP (value) ((value)<<11)/* bits 11:12 */ #define RJUST (value) ((value)<<13)/* bits 13:14 */ +#define ALB 0x8000#define DLB 0x8000/************************** McBSP SPCR2 bit definitions ***********************/
@@ -228,6 +224,17 @@#define XPABLK (value) ((value)<<5)/* Bits 5:6 */ #define XPBBLK (value) ((value)<<7)/* Bits 7:8 */ +/*********************** McBSP XCCR bit definitions *************************/ +#define DILB 0x0020 +#define XDMAEN 0x0008 +#define XDISABLE 0x0001 + +/********************** McBSP RCCR bit definitions *************************/ +#define RDMAEN 0x0008 +#define RDISABLE 0x0001 + +/********************** McBSP SYSCONFIG bit definitions ********************/ +#define SOFTRST 0x0002/* we don't do multichannel for now */ struct omap_mcbsp_reg_cfg {
@@ -311,7 +318,6 @@ struct omap_mcbsp_spi_cfg {struct omap_mcbsp_ops {void (*request)(unsigned int );void (*free)(unsigned int ); -int (*check)(unsigned int ); };struct omap_mcbsp_platform_data {
@@ -353,6 +359,8 @@ struct omap_mcbsp {struct omap_mcbsp_platform_data *pdata;struct clk *clk; }; +extern struct omap_mcbsp **mcbsp_ptr; +extern int omap_mcbsp_count;int omap_mcbsp_init (void ); void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
@@ -377,5 +385,6 @@ void omap_mcbsp_set_spi_mode(unsigned int id, const struct omap_mcbsp_spi_cfg */* Polled read/write functions */ int omap_mcbsp_pollread (unsigned int id,u16 * buf);int omap_mcbsp_pollwrite (unsigned int id,u16 buf); +int omap_mcbsp_set_io_type (unsigned int id,omap_mcbsp_io_type_t io_type);#endif
arch/arm/plat-omap/mcbsp.c +225 -163
741 lines not on this page · raw message
Signature · 1 line
1.5.6.rc3.21.g8c6b5
Tony Lindgren
maintainerPATCH 3/5 ARM: OMAP: Add support for McBSP devices 3 - 5 on 34xx
From: Chandra Shekhar <[email protected]>
Based on Chandra's earlier patches in linux-omap tree.
--- arch/arm/mach-omap2/mcbsp.c | 56 ++++++++++++++++++++++++++++++- arch/arm/plat-omap/include/mach/mcbsp.h | 5 +++ 2 files changed, 60 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/mcbsp.c +55 -1
@@ -28,7 +28,7 @@ struct mcbsp_internal_clk {int n_childs; }; -#if defined(CONFIG_ARCH_OMAP24XX ) +#if defined(CONFIG_ARCH_OMAP24XX ) || defined(CONFIG_ARCH_OMAP34XX )static void omap_mcbsp_clk_init (struct mcbsp_internal_clk *mclk) {const char *clk_names[] = {"mcbsp_ick" ,"mcbsp_fck" };
@@ -89,6 +89,30 @@ static struct mcbsp_internal_clk omap_mcbsp_clks[] = { .disable = omap_mcbsp_clk_disable, }, }, + { + .clk = { + .name = "mcbsp_clk", + .id = 3, + .enable = omap_mcbsp_clk_enable, + .disable = omap_mcbsp_clk_disable, + }, + }, + { + .clk = { + .name = "mcbsp_clk", + .id = 4, + .enable = omap_mcbsp_clk_enable, + .disable = omap_mcbsp_clk_disable, + }, + }, + { + .clk = { + .name = "mcbsp_clk", + .id = 5, + .enable = omap_mcbsp_clk_enable, + .disable = omap_mcbsp_clk_disable, + }, + }, };#define omap_mcbsp_clks_size ARRAY_SIZE(omap_mcbsp_clks)
@@ -168,6 +192,33 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { .ops = &omap2_mcbsp_ops, .clk_name = "mcbsp_clk", }, + { + .phys_base = OMAP34XX_MCBSP3_BASE, + .dma_rx_sync = OMAP24XX_DMA_MCBSP3_RX, + .dma_tx_sync = OMAP24XX_DMA_MCBSP3_TX, + .rx_irq = INT_24XX_MCBSP3_IRQ_RX, + .tx_irq = INT_24XX_MCBSP3_IRQ_TX, + .ops = &omap2_mcbsp_ops, + .clk_name = "mcbsp_clk", + }, + { + .phys_base = OMAP34XX_MCBSP4_BASE, + .dma_rx_sync = OMAP24XX_DMA_MCBSP4_RX, + .dma_tx_sync = OMAP24XX_DMA_MCBSP4_TX, + .rx_irq = INT_24XX_MCBSP4_IRQ_RX, + .tx_irq = INT_24XX_MCBSP4_IRQ_TX, + .ops = &omap2_mcbsp_ops, + .clk_name = "mcbsp_clk", + }, + { + .phys_base = OMAP34XX_MCBSP5_BASE, + .dma_rx_sync = OMAP24XX_DMA_MCBSP5_RX, + .dma_tx_sync = OMAP24XX_DMA_MCBSP5_TX, + .rx_irq = INT_24XX_MCBSP5_IRQ_RX, + .tx_irq = INT_24XX_MCBSP5_IRQ_TX, + .ops = &omap2_mcbsp_ops, + .clk_name = "mcbsp_clk", + }, }; #define OMAP34XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap34xx_mcbsp_pdata) #else
@@ -198,6 +249,9 @@ static int __init omap2_mcbsp_init(void)if (cpu_is_omap24xx ())omap_mcbsp_register_board_cfg (omap24xx_mcbsp_pdata,OMAP24XX_MCBSP_PDATA_SZ ); +if (cpu_is_omap34xx ()) +omap_mcbsp_register_board_cfg (omap34xx_mcbsp_pdata, +OMAP34XX_MCBSP_PDATA_SZ );return omap_mcbsp_init (); }
arch/arm/plat-omap/include/mach/mcbsp.h +5 -0
@@ -46,6 +46,9 @@#define OMAP34XX_MCBSP1_BASE 0x48074000#define OMAP34XX_MCBSP2_BASE 0x49022000 +#define OMAP34XX_MCBSP3_BASE 0x49024000 +#define OMAP34XX_MCBSP4_BASE 0x49026000 +#define OMAP34XX_MCBSP5_BASE 0x48096000#if defined(CONFIG_ARCH_OMAP15XX ) || defined(CONFIG_ARCH_OMAP16XX ) || defined(CONFIG_ARCH_OMAP730 )
@@ -267,6 +270,8 @@ typedef enum {OMAP_MCBSP1 =0 ,OMAP_MCBSP2 ,OMAP_MCBSP3 , +OMAP_MCBSP4 , + OMAP_MCBSP5 } omap_mcbsp_id;typedef int __bitwise omap_mcbsp_io_type_t ;
Signature · 1 line
1.5.6.rc3.21.g8c6b5
Tony Lindgren
maintainerPATCH 4/5 ARM: OMAP: Add support for OMAP2430 in McBSP
From: Jarkko Nikula <[email protected]>
--- arch/arm/mach-omap2/mcbsp.c | 79 +++++++++++++++++++++++++++---- arch/arm/plat-omap/include/mach/mcbsp.h | 3 + 2 files changed, 72 insertions(+), 10 deletions(-)
arch/arm/mach-omap2/mcbsp.c +69 -10
@@ -145,8 +145,8 @@ static struct omap_mcbsp_ops omap2_mcbsp_ops = { .request = omap2_mcbsp_request, }; -#ifdef CONFIG_ARCH_OMAP24XX -static struct omap_mcbsp_platform_data omap24xx_mcbsp_pdata[] = { +#ifdef CONFIG_ARCH_OMAP2420 +static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = { { .phys_base = OMAP24XX_MCBSP1_BASE, .dma_rx_sync = OMAP24XX_DMA_MCBSP1_RX,
@@ -166,10 +166,64 @@ static struct omap_mcbsp_platform_data omap24xx_mcbsp_pdata[] = { .clk_name = "mcbsp_clk", }, }; -#define OMAP24XX_MCBSP_PDATA_SZ ARRAY_SIZE(omap24xx_mcbsp_pdata) +#define OMAP2420_MCBSP_PDATA_SZ ARRAY_SIZE(omap2420_mcbsp_pdata)#else -#define omap24xx_mcbsp_pdata NULL -#define OMAP24XX_MCBSP_PDATA_SZ 0 +#define omap2420_mcbsp_pdata NULL +#define OMAP2420_MCBSP_PDATA_SZ 0 +#endif + +#ifdef CONFIG_ARCH_OMAP2430 +static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { + { + .phys_base =OMAP24XX_MCBSP1_BASE , + .dma_rx_sync =OMAP24XX_DMA_MCBSP1_RX , + .dma_tx_sync =OMAP24XX_DMA_MCBSP1_TX , + .rx_irq =INT_24XX_MCBSP1_IRQ_RX , + .tx_irq =INT_24XX_MCBSP1_IRQ_TX , + .ops = &omap2_mcbsp_ops, + .clk_name ="mcbsp_clk" , + }, + { + .phys_base =OMAP24XX_MCBSP2_BASE , + .dma_rx_sync =OMAP24XX_DMA_MCBSP2_RX , + .dma_tx_sync =OMAP24XX_DMA_MCBSP2_TX , + .rx_irq =INT_24XX_MCBSP2_IRQ_RX , + .tx_irq =INT_24XX_MCBSP2_IRQ_TX , + .ops = &omap2_mcbsp_ops, + .clk_name ="mcbsp_clk" , + }, + { + .phys_base =OMAP2430_MCBSP3_BASE , + .dma_rx_sync =OMAP24XX_DMA_MCBSP3_RX , + .dma_tx_sync =OMAP24XX_DMA_MCBSP3_TX , + .rx_irq =INT_24XX_MCBSP3_IRQ_RX , + .tx_irq =INT_24XX_MCBSP3_IRQ_TX , + .ops = &omap2_mcbsp_ops, + .clk_name ="mcbsp_clk" , + }, + { + .phys_base =OMAP2430_MCBSP4_BASE , + .dma_rx_sync =OMAP24XX_DMA_MCBSP4_RX , + .dma_tx_sync =OMAP24XX_DMA_MCBSP4_TX , + .rx_irq =INT_24XX_MCBSP4_IRQ_RX , + .tx_irq =INT_24XX_MCBSP4_IRQ_TX , + .ops = &omap2_mcbsp_ops, + .clk_name ="mcbsp_clk" , + }, + { + .phys_base =OMAP2430_MCBSP5_BASE , + .dma_rx_sync =OMAP24XX_DMA_MCBSP5_RX , + .dma_tx_sync =OMAP24XX_DMA_MCBSP5_TX , + .rx_irq =INT_24XX_MCBSP5_IRQ_RX , + .tx_irq =INT_24XX_MCBSP5_IRQ_TX , + .ops = &omap2_mcbsp_ops, + .clk_name ="mcbsp_clk" , + }, +}; +#define OMAP2430_MCBSP_PDATA_SZ ARRAY_SIZE(omap2430_mcbsp_pdata) +#else +#define omap2430_mcbsp_pdata NULL +#define OMAP2430_MCBSP_PDATA_SZ 0#endif #ifdef CONFIG_ARCH_OMAP34XX
@@ -236,8 +290,10 @@ static int __init omap2_mcbsp_init(void)clk_register (&omap_mcbsp_clks[i].clk); } -if (cpu_is_omap24xx ()) - omap_mcbsp_count =OMAP24XX_MCBSP_PDATA_SZ ; +if (cpu_is_omap2420 ()) + omap_mcbsp_count =OMAP2420_MCBSP_PDATA_SZ ; +if (cpu_is_omap2430 ()) + omap_mcbsp_count =OMAP2430_MCBSP_PDATA_SZ ;if (cpu_is_omap34xx ()) omap_mcbsp_count =OMAP34XX_MCBSP_PDATA_SZ ;
@@ -246,9 +302,12 @@ static int __init omap2_mcbsp_init(void)if (!mcbsp_ptr)return -ENOMEM ; -if (cpu_is_omap24xx ()) -omap_mcbsp_register_board_cfg (omap24xx_mcbsp_pdata, -OMAP24XX_MCBSP_PDATA_SZ ); +if (cpu_is_omap2420 ()) +omap_mcbsp_register_board_cfg (omap2420_mcbsp_pdata, +OMAP2420_MCBSP_PDATA_SZ ); +if (cpu_is_omap2430 ()) +omap_mcbsp_register_board_cfg (omap2430_mcbsp_pdata, +OMAP2430_MCBSP_PDATA_SZ );if (cpu_is_omap34xx ())omap_mcbsp_register_board_cfg (omap34xx_mcbsp_pdata,OMAP34XX_MCBSP_PDATA_SZ );
arch/arm/plat-omap/include/mach/mcbsp.h +3 -0
@@ -43,6 +43,9 @@#define OMAP24XX_MCBSP1_BASE 0x48074000#define OMAP24XX_MCBSP2_BASE 0x48076000 +#define OMAP2430_MCBSP3_BASE 0x4808c000 +#define OMAP2430_MCBSP4_BASE 0x4808e000 +#define OMAP2430_MCBSP5_BASE 0x48096000#define OMAP34XX_MCBSP1_BASE 0x48074000#define OMAP34XX_MCBSP2_BASE 0x49022000
Signature · 1 line
1.5.6.rc3.21.g8c6b5
Tony Lindgren
maintainerPATCH 5/5 ARM: OMAP: Fixes to omap_mcbsp_request function
From: Jarkko Nikula <[email protected]>
Bootloader may let McBSP logic running so make sure that block is idle before requesting IRQs. Also make sure that TX and RX waitqueues are initialized before request_irq.
--- arch/arm/plat-omap/mcbsp.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-)
arch/arm/plat-omap/mcbsp.c +9 -4
@@ -234,8 +234,16 @@ int omap_mcbsp_request(unsigned int id) mcbsp->free =0 ;spin_unlock (&mcbsp->lock); +/* +* Make sure that transmitter, receiver and sample-rate generator are +* not running before activating IRQs. +*/ +OMAP_MCBSP_WRITE (mcbsp->io_base,SPCR1 ,0 ); +OMAP_MCBSP_WRITE (mcbsp->io_base,SPCR2 ,0 ); +if (mcbsp->io_type ==OMAP_MCBSP_IRQ_IO ) {/* We need to get IRQs here */ +init_completion (&mcbsp->tx_irq_completion); err =request_irq (mcbsp->tx_irq, omap_mcbsp_tx_irq_handler,0 ,"McBSP" , (void *)mcbsp);if (err !=0 ) {
@@ -245,8 +253,7 @@ int omap_mcbsp_request(unsigned int id)return err; } -init_completion (&mcbsp->tx_irq_completion); - +init_completion (&mcbsp->rx_irq_completion); err =request_irq (mcbsp->rx_irq, omap_mcbsp_rx_irq_handler,0 ,"McBSP" , (void *)mcbsp);if (err !=0 ) {
@@ -256,8 +263,6 @@ int omap_mcbsp_request(unsigned int id)free_irq (mcbsp->tx_irq, (void *)mcbsp);return err; } - -init_completion (&mcbsp->rx_irq_completion); }return 0 ;
Signature · 1 line
1.5.6.rc3.21.g8c6b5
Re: [PATCH 5/5] ARM: OMAP: Fixes to omap_mcbsp_request function
Quoted 8 lines · Tony Lindgren
From: Jarkko Nikula <[email protected]>
Bootloader may let McBSP logic running so make sure that block is idle before requesting IRQs. Also make sure that TX and RX waitqueues are initialized before
request_irq.Signed-off-by Jarkko Nikula <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Ok.
Re: [PATCH 5/5] ARM: OMAP: Fixes to omap_mcbsp_request function
Quoted 11 lines · Russell King - ARM Linux
Quoted 8 lines · Tony Lindgren
From: Jarkko Nikula <[email protected]>
Bootloader may let McBSP logic running so make sure that block is idle before requesting IRQs. Also make sure that TX and RX waitqueues are initialized before
request_irq.Signed-off-by Jarkko Nikula <[email protected]>Signed-off-by Tony Lindgren <[email protected]>Ok.
Please note that we're into the _final_ week before the merge window opens, which means I'm beginning to close down accepting patches.
If you want to get these in, please expedite it. Thanks.
Re: [PATCH 5/5] ARM: OMAP: Fixes to omap_mcbsp_request function
In reply to Russell King - ARM LinuxQuoted 11 lines · Russell King - ARM Linux
Quoted 8 lines · Tony Lindgren
From: Jarkko Nikula <[email protected]>
Bootloader may let McBSP logic running so make sure that block is idle before requesting IRQs. Also make sure that TX and RX waitqueues are initialized before
request_irq.Signed-off-by Jarkko Nikula <[email protected]>Signed-off-by Tony Lindgren <[email protected]>Ok.
The other question to ask about these patches is: does it finally allow mainline to reach parity with your tree on the McBSP code?
If not, is it possible to have a set of patches which brings the McBSP code completely up to date in mainline?
Tony Lindgren
maintainergit-pull request for omap mcbsp changes (Re: [PATCH 5/5] ARM: OMAP: Fixes to omap_mcbsp_request function)
Quoted 8 lines · Russell King - ARM Linux
Quoted 7 lines · Russell King - ARM Linux
Quoted 6 lines · Tony Lindgren
From: Jarkko Nikula <[email protected]>
Bootloader may let McBSP logic running so make sure that block is idle before requesting IRQs. Also make sure that TX and RX waitqueues are initialized before
request_irq.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Jarkko Nikula <[email protected]>Signed-off-by Tony Lindgren <[email protected]>Ok.
The other question to ask about these patches is: does it finally allow mainline to reach parity with your tree on the McBSP code?
Yes.
Quoted 2 lines
If not, is it possible to have a set of patches which brings the McBSP code completely up to date in mainline?
There are no other McBSP patches pending right now.
Here's the pull request for you for these patches:
The following changes since commit 56f68556d7bbb51dd158c74deb09c783345bfbbd:
Russell King (1):
Merge unstable branch 'omap-rmk'
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-upstream
Chandra Shekhar (2):
ARM: OMAP: Allocate McBSP devices dynamically
ARM: OMAP: Add support for McBSP devices 3 - 5 on 34xx
Jarkko Nikula (2):
ARM: OMAP: Add support for OMAP2430 in McBSP
ARM: OMAP: Fixes to omap_mcbsp_request function
Uwe Kleine-König (1):
Fix sections for omap-mcbsp platform driver
arch/arm/mach-omap1/mcbsp.c | 37 +-- arch/arm/mach-omap2/mcbsp.c | 147 ++++++++++-- arch/arm/plat-omap/include/mach/mcbsp.h | 41 +++- arch/arm/plat-omap/mcbsp.c | 403 ++++++++++++++++++------------- 4 files changed, 404 insertions(+), 224 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: git-pull request for omap mcbsp changes (Re: [PATCH 5/5] ARM: OMAP: Fixes to omap_mcbsp_request function)
Quoted 38 lines · Tony Lindgren
Quoted 8 lines · Russell King - ARM Linux
Quoted 7 lines · Russell King - ARM Linux
Quoted 6 lines · Tony Lindgren
From: Jarkko Nikula <[email protected]>
Bootloader may let McBSP logic running so make sure that block is idle before requesting IRQs. Also make sure that TX and RX waitqueues are initialized before
request_irq.Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Jarkko Nikula <[email protected]>Signed-off-by Tony Lindgren <[email protected]>Ok.
The other question to ask about these patches is: does it finally allow mainline to reach parity with your tree on the McBSP code?
Yes.
Quoted 2 lines
If not, is it possible to have a set of patches which brings the McBSP code completely up to date in mainline?
There are no other McBSP patches pending right now.
Here's the pull request for you for these patches:
The following changes since commit
56f68556d7bbb51dd158c74deb09c783345bfbbd:
Russell King (1):
Merge unstable branch 'omap-rmk'are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.gitomap-upstreamChandra Shekhar (2):
ARM: OMAP: Allocate McBSP devices dynamically
ARM: OMAP: Add support for McBSP devices 3 - 5 on 34xx
Quoted 6 lines
Jarkko Nikula (2):
ARM: OMAP: Add support for OMAP2430 in McBSP
ARM: OMAP: Fixes toomap_mcbsp_requestfunctionUwe Kleine-König (1):
Fix sections for omap-mcbsp platform driver
Pulled.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 4/5] ARM: OMAP: Add support for OMAP2430 in McBSP
In reply to Tony LindgrenQuoted 4 lines · Tony Lindgren
From: Jarkko Nikula <[email protected]>
Signed-off-by Jarkko Nikula <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Ok.
Re: [PATCH 3/5] ARM: OMAP: Add support for McBSP devices 3 - 5 on 34xx
In reply to Tony LindgrenQuoted 6 lines · Tony Lindgren
From: Chandra Shekhar <[email protected]>
Based on Chandra's earlier patches in linux-omap tree.
Signed-off-by Chandra Shekhar <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Ok.
Re: [PATCH 2/5] ARM: OMAP: Allocate McBSP devices dynamically
In reply to Tony LindgrenQuoted 11 lines · Tony Lindgren
From: Chandra Shekhar <[email protected]>
Based on Chandra's earlier patches in linux-omap tree.
Note that
omap1_mcbsp_checkandomap2_mcbsp_checkare no longer needed as there's nowomap_mcbsp_check_valid_id()defined.Also some functions can now be marked
__init.Signed-off-by Chandra Shekhar <[email protected]>Signed-off-by Tony Lindgren <[email protected]>
Ok.
Tony Lindgren
maintainerRe: [PATCH 1/5] Fix sections for omap-mcbsp platform driver
In reply to Tony LindgrenQuoted 6 lines · Tony Lindgren
From: Uwe Kleine-König <[email protected]>
echo -n omap-mcbsp.1 >
/sys/bus/platform/driver/omap-mcbsp/unbindecho -n omap-mcbsp.1 >/sys/bus/platform/driver/omap-mcbsp/bindWhile at it move the remove function to the .devexit.text section.
Looks like I managed to trash the subject on this one, here's a fixed version.
Tony
Quoted 1 line
From
f4ca1382337bfb1bf612fa07c2bb0207b1a5da37Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Uwe=20Kleine-K=C3=B6nig?= <[email protected]>
Date: Wed, 24 Sep 2008 16:13:11 +0300
Subject: [PATCH] Fix sections for omap-mcbsp platform driver
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Don't use __init but __devinit to define probe function. A pointer to omap_mcbsp_probe is passed to the core via platform_driver_register and so the function must not disappear when the init code is freed. Using __init and having HOTPLUG=y the following probably oopses:
echo -n omap-mcbsp.1 > /sys/bus/platform/driver/omap-mcbsp/unbind echo -n omap-mcbsp.1 > /sys/bus/platform/driver/omap-mcbsp/bind
While at it move the remove function to the .devexit.text section.
arch/arm/plat-omap/mcbsp.c +3 -3
@@ -804,7 +804,7 @@ EXPORT_SYMBOL(omap_mcbsp_set_spi_mode);* McBSP1 and McBSP3 are directly mapped on 1610 and 1510. * 730 has only 2 McBSP, and both of them are MPU peripherals. */ -static int __init omap_mcbsp_probe (struct platform_device *pdev) +static int __devinit omap_mcbsp_probe (struct platform_device *pdev) {struct omap_mcbsp_platform_data *pdata = pdev->dev.platform_data;int id = pdev->id -1 ;
@@ -868,7 +868,7 @@ exit:return ret; } -static int omap_mcbsp_remove (struct platform_device *pdev) +static int __devexit omap_mcbsp_remove(struct platform_device *pdev) {struct omap_mcbsp *mcbsp =platform_get_drvdata (pdev);
@@ -894,7 +894,7 @@ static int omap_mcbsp_remove(struct platform_device *pdev)static struct platform_driver omap_mcbsp_driver = { .probe = omap_mcbsp_probe, - .remove = omap_mcbsp_remove, + .remove =__devexit_p (omap_mcbsp_remove), .driver = { .name ="omap-mcbsp" , },
Re: [PATCH 1/5] Fix sections for omap-mcbsp platform driver
Quoted 10 lines · Tony Lindgren
Quoted 6 lines · Tony Lindgren
From: Uwe Kleine-König <[email protected]>
echo -n omap-mcbsp.1 >
/sys/bus/platform/driver/omap-mcbsp/unbindecho -n omap-mcbsp.1 >/sys/bus/platform/driver/omap-mcbsp/bindWhile at it move the remove function to the .devexit.text section.
Looks like I managed to trash the subject on this one, here's a fixed version.
Ok.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html