Omap McBSP updates from linux-omap tree
Subsystems (4)
Tony Lindgren
maintainercover Omap McBSP updates from linux-omap tree
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/3 ARM: OMAP: Allocate McBSP devices dynamically, add 34xx support
From: Chandra Shekhar <[email protected]>
Based on Chandra's earlier patches in linux-omap tree.
--- arch/arm/mach-omap1/mcbsp.c | 37 +-- arch/arm/mach-omap2/mcbsp.c | 74 +++++- arch/arm/plat-omap/include/mach/irqs.h | 6 + arch/arm/plat-omap/include/mach/mcbsp.h | 38 ++- arch/arm/plat-omap/mcbsp.c | 388 ++++++++++++++++++------------- 5 files changed, 331 insertions(+), 212 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 +62 -12
108 lines not on this page · raw message
arch/arm/plat-omap/include/mach/irqs.h +6 -0
@@ -263,6 +263,8 @@#define INT_24XX_GPTIMER10 46#define INT_24XX_GPTIMER11 47#define INT_24XX_GPTIMER12 48 +#define INT_24XX_MCBSP4_IRQ_TX 54 +#define INT_24XX_MCBSP4_IRQ_RX 55#define INT_24XX_I2C1_IRQ 56#define INT_24XX_I2C2_IRQ 57#define INT_24XX_MCBSP1_IRQ_TX 59
@@ -278,7 +280,11 @@#define INT_24XX_USB_IRQ_HGEN 78#define INT_24XX_USB_IRQ_HSOF 79#define INT_24XX_USB_IRQ_OTG 80 +#define INT_24XX_MCBSP5_IRQ_TX 81 +#define INT_24XX_MCBSP5_IRQ_RX 82#define INT_24XX_MMC_IRQ 83 +#define INT_24XX_MCBSP3_IRQ_TX 89 +#define INT_24XX_MCBSP3_IRQ_RX 90#define INT_34XX_BENCH_MPU_EMUL 3
arch/arm/plat-omap/include/mach/mcbsp.h +26 -12
@@ -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 )
@@ -81,9 +84,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 +91,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 +126,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 +139,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 +149,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 +227,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 {
@@ -260,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 ;
@@ -311,7 +323,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 +364,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 +390,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 2/3 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 3/3 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 1/3] ARM: OMAP: Allocate McBSP devices dynamically, add 34xx support
In reply to Tony LindgrenHello,
I wonder if this patch should be further split.
To my taste this should be at least:
- Allocate McBSP devices dynamically,
- add 34xx support
maybe more, see below.
Quoted 36 lines
arch/arm/mach-omap1/mcbsp.c +0
-24@@ -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) {/*
arch/arm/mach-omap1/mcbsp.c static void omap1_mcbsp_free(unsigned int id) · line 154
Quoted 4 lines
arch/arm/mach-omap1/mcbsp.c +0
-1@@ -151,7 +127,6 @@ static void omap1_mcbsp_free(unsigned int id) }static struct omap_mcbsp_ops omap1_mcbsp_ops = { - .check = omap1_mcbsp_check,
Why can this function go away? IMHO it should either go away in a separate commit or be extended to be more general to apply for the 34xx case, too. (Same for omap2_mcbsp_check.)
arch/arm/mach-omap1/mcbsp.c static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { · line 232
Quoted 9 lines
arch/arm/mach-omap1/mcbsp.c +1
-1@@ -185,7 +226,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;
OK, this is trivial, but if you ask me, at least note it in the commit message.
Quoted 10 lines
arch/arm/mach-omap1/mcbsp.c +6
-0@@ -196,9 +237,18 @@ 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 );
arch/arm/mach-omap1/mcbsp.c int __init omap2_mcbsp_init(void) · line 254
Quoted 10 lines
arch/arm/mach-omap1/mcbsp.c +4
-1+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 );
Hhm, it looks there is already some 34xx support in the file. Should the commit log be more detailed?
(Note, I didn't check the rest of the patch.)
Best regards
Uwe
Tony Lindgren
maintainerRe: [PATCH 1/3] ARM: OMAP: Allocate McBSP devices dynamically, add 34xx support
Quoted 8 lines · Uwe Kleine-König
Hello,
I wonder if this patch should be further split.
To my taste this should be at least:
- Allocate McBSP devices dynamically,
- add 34xx support
Sure, I think it's a bit hard to read too. Will repost split.
Quoted 40 lines
maybe more, see below.
Quoted 38 lines
arch/arm/mach-omap1/mcbsp.c +0
-24@@ -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) }
Quoted 5 lines
arch/arm/mach-omap1/mcbsp.c static void omap1_mcbsp_free(unsigned int id) · line 154
Quoted 2 lines
arch/arm/mach-omap1/mcbsp.c +0
-1static struct omap_mcbsp_ops omap1_mcbsp_ops = { - .check = omap1_mcbsp_check,Why can this function go away? IMHO it should either go away in a separate commit or be extended to be more general to apply for the 34xx case, too. (Same for
omap2_mcbsp_check.)
It also removes omap2_mcbsp_check. There's now:
#define omap_mcbsp_check_valid_id() (id < omap_mcbsp_count)
Quoted 11 lines
arch/arm/mach-omap1/mcbsp.c static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { · line 232
Quoted 9 lines
arch/arm/mach-omap1/mcbsp.c +1
-1@@ -185,7 +226,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;OK, this is trivial, but if you ask me, at least note it in the commit message.
Will add.
Quoted 14 lines
Quoted 14 lines
arch/arm/mach-omap1/mcbsp.c +10
-0@@ -196,9 +237,18 @@ 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 ())
Quoted 8 lines
arch/arm/mach-omap1/mcbsp.c int __init omap2_mcbsp_init(void) · line 254
Quoted 6 lines
arch/arm/mach-omap1/mcbsp.c +0
-1omap_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 );Hhm, it looks there is already some 34xx support in the file. Should the commit log be more detailed?
Will split into a separate patch.
Quoted 1 line
(Note, I didn't check the rest of the patch.)
Thanks for looking!
Tony
--
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
maintainerRe: [PATCH 1/3] ARM: OMAP: Allocate McBSP devices dynamically, add 34xx support
Quoted 1 line · Tony Lindgren
* Uwe Kleine-König <[email protected]> [080924 14:58]:
<snip>
Quoted 4 lines
Quoted 2 lines
Hhm, it looks there is already some 34xx support in the file. Should the commit log be more detailed?
Will split into a separate patch.
I'll change it to say add support for instances 3 - 5 on 34xx.
Tony
--
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
Hello Tony,
Quoted 2 lines
This series contains pending McBSP patches from linux-omap tree for review.
what about adding the patch I sent some time ago[1] to your series?
Best regards
Uwe
[1] Message-Id: <[email protected]>
http://mid.gmane.org/[email protected]
Tony Lindgren
maintainerQuoted 11 lines · Uwe Kleine-König
Hello Tony,
Quoted 2 lines
This series contains pending McBSP patches from linux-omap tree for review.
what about adding the patch I sent some time ago[1] to your series?
Best regards
Uwe[1] Message-Id: <[email protected]>
http://mid.gmane.org/[email protected]
Oops, sorry I forgot that one. Will add.
Tony
--
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