* [PATCH 0/4] Updates on mcbsp driver (take #2)
@ 2008-05-05 21:23 Eduardo Valentin
2008-05-05 21:23 ` [PATCH 1/4] PLAT-OMAP: MCBSP: Tranform into platform driver Eduardo Valentin
` (4 more replies)
0 siblings, 5 replies; 17+ messages in thread
From: Eduardo Valentin @ 2008-05-05 21:23 UTC (permalink / raw)
To: linux-omap; +Cc: Tony Lindgren, Chandra shekhar, Eduardo Valentin
From: Eduardo Valentin <eduardo.valentin@indt.org.br>
Hi Tony,
Here is the updated version of my previous patches.
DMA and IRQ definitions were left as they are. Chandra is going
to send his work on top of this series.
This patch series updates mcbsp driver by transforming it into
a platform driver. This is a very initial implementation.
Basically it moves machine specific code to their correct place
and creates the platform driver necessary structures.
It must be working for previous boards. For omap34xx it should
work for mcbsp 1 and 2.
In order to do not break other places, I tryied to do not change
previous API. But future improvements are needed.
Clock definitions for mcbsp 1 and 2 were also modified to add
correct support for omap34xx.
Comments are wellcome.
Cheers,
Eduardo Valentin (4):
PLAT-OMAP: MCBSP: Tranform into platform driver
MACH-OMAP1: MCBSP: Add support for mcbsp on mach-omap1
Fix mcbsp clock definition on clock34xx.h
MACH-OMAP2: MCBSP: Add support for mcbsp on mach-omap2
arch/arm/mach-omap1/Makefile | 2 +
arch/arm/mach-omap1/mcbsp.c | 165 +++++++++
arch/arm/mach-omap2/Makefile | 2 +
arch/arm/mach-omap2/clock34xx.h | 30 ++-
arch/arm/mach-omap2/mcbsp.c | 105 ++++++
arch/arm/plat-omap/devices.c | 45 +++
arch/arm/plat-omap/mcbsp.c | 660 ++++++++++++++-----------------------
include/asm-arm/arch-omap/mcbsp.h | 73 ++++-
8 files changed, 661 insertions(+), 421 deletions(-)
create mode 100644 arch/arm/mach-omap1/mcbsp.c
create mode 100644 arch/arm/mach-omap2/mcbsp.c
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 1/4] PLAT-OMAP: MCBSP: Tranform into platform driver 2008-05-05 21:23 [PATCH 0/4] Updates on mcbsp driver (take #2) Eduardo Valentin @ 2008-05-05 21:23 ` Eduardo Valentin 2008-05-05 21:23 ` [PATCH 2/4] MACH-OMAP1: MCBSP: Add support for mcbsp on mach-omap1 Eduardo Valentin ` (2 more replies) 2008-05-16 15:54 ` [PATCH 0/4] Updates on mcbsp driver (take #2) Tony Lindgren ` (3 subsequent siblings) 4 siblings, 3 replies; 17+ messages in thread From: Eduardo Valentin @ 2008-05-05 21:23 UTC (permalink / raw) To: linux-omap; +Cc: Tony Lindgren, Chandra shekhar, Eduardo Valentin From: Eduardo Valentin <eduardo.valentin@indt.org.br> This patch transform mcbsp code into a very initial implementation of a platform driver. It also gets ride of ifdefs on mcbsp.c code. To do it, a platform data structure was defined. Platform devices are located in arch/arm/plat-omap/devices.c Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br> --- arch/arm/plat-omap/devices.c | 45 +++ arch/arm/plat-omap/mcbsp.c | 660 ++++++++++++++----------------------- include/asm-arm/arch-omap/mcbsp.h | 73 ++++- 3 files changed, 367 insertions(+), 411 deletions(-) diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 099182b..b3e0147 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -27,6 +27,7 @@ #include <asm/arch/gpio.h> #include <asm/arch/menelaus.h> #include <asm/arch/dsp_common.h> +#include <asm/arch/mcbsp.h> #if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE) @@ -150,6 +151,49 @@ static inline void omap_init_kp(void) {} #endif /*-------------------------------------------------------------------------*/ +#if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE) + +static struct platform_device omap_mcbsp_devices[OMAP_MAX_MCBSP_COUNT]; +static int mcbsps_configured; + +void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, + int size) +{ + int i; + + if (size > OMAP_MAX_MCBSP_COUNT) { + printk(KERN_WARNING "Registered too many McBSPs platform_data." + " Using maximum (%d) available.\n", + OMAP_MAX_MCBSP_COUNT); + size = OMAP_MAX_MCBSP_COUNT; + } + + for (i = 0; i < size; i++) { + struct platform_device *new_mcbsp = &omap_mcbsp_devices[i]; + new_mcbsp->name = "omap-mcbsp"; + new_mcbsp->id = i + 1; + new_mcbsp->dev.platform_data = &config[i]; + } + mcbsps_configured = size; +} + +static void __init omap_init_mcbsp(void) +{ + int i; + + for (i = 0; i < mcbsps_configured; i++) + platform_device_register(&omap_mcbsp_devices[i]); +} +#else +void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, + int size) +{ } + +static inline void __init omap_init_mcbsp(void) +{ } +#endif + +/*-------------------------------------------------------------------------*/ #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) \ || defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) @@ -511,6 +555,7 @@ static int __init omap_init_devices(void) */ omap_init_dsp(); omap_init_kp(); + omap_init_mcbsp(); omap_init_mmc(); omap_init_uwire(); omap_init_wdt(); diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index 053de31..5536223 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/device.h> +#include <linux/platform_device.h> #include <linux/wait.h> #include <linux/completion.h> #include <linux/interrupt.h> @@ -25,83 +26,53 @@ #include <linux/irq.h> #include <asm/arch/dma.h> -#include <asm/arch/mux.h> -#include <asm/arch/irqs.h> -#include <asm/arch/dsp_common.h> #include <asm/arch/mcbsp.h> -#ifdef CONFIG_MCBSP_DEBUG -#define DBG(x...) printk(x) -#else -#define DBG(x...) do { } while (0) -#endif - -struct omap_mcbsp { - u32 io_base; - u8 id; - u8 free; - omap_mcbsp_word_length rx_word_length; - omap_mcbsp_word_length tx_word_length; - - omap_mcbsp_io_type_t io_type; /* IRQ or poll */ - /* IRQ based TX/RX */ - int rx_irq; - int tx_irq; - - /* DMA stuff */ - u8 dma_rx_sync; - short dma_rx_lch; - u8 dma_tx_sync; - short dma_tx_lch; - - /* Completion queues */ - struct completion tx_irq_completion; - struct completion rx_irq_completion; - struct completion tx_dma_completion; - struct completion rx_dma_completion; - - /* Protect the field .free, while checking if the mcbsp is in use */ - spinlock_t lock; -}; - static struct omap_mcbsp mcbsp[OMAP_MAX_MCBSP_COUNT]; -#ifdef CONFIG_ARCH_OMAP1 -static struct clk *mcbsp_dsp_ck; -static struct clk *mcbsp_api_ck; -static struct clk *mcbsp_dspxor_ck; -#endif -#ifdef CONFIG_ARCH_OMAP2 -static struct clk *mcbsp1_ick; -static struct clk *mcbsp1_fck; -static struct clk *mcbsp2_ick; -static struct clk *mcbsp2_fck; -#endif + +#define omap_mcbsp_check_valid_id(id) (mcbsp[id].pdata && \ + mcbsp[id].pdata->ops && \ + mcbsp[id].pdata->ops->check && \ + (mcbsp[id].pdata->ops->check(id) == 0)) static void omap_mcbsp_dump_reg(u8 id) { - DBG("**** MCBSP%d regs ****\n", mcbsp[id].id); - DBG("DRR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DRR2)); - DBG("DRR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DRR1)); - DBG("DXR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DXR2)); - DBG("DXR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DXR1)); - DBG("SPCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR2)); - DBG("SPCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR1)); - DBG("RCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, RCR2)); - DBG("RCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, RCR1)); - DBG("XCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, XCR2)); - DBG("XCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, XCR1)); - DBG("SRGR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR2)); - DBG("SRGR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR1)); - DBG("PCR0: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, PCR0)); - DBG("***********************\n"); + dev_dbg(mcbsp[id].dev, "**** McBSP%d regs ****\n", mcbsp[id].id); + dev_dbg(mcbsp[id].dev, "DRR2: 0x%04x\n", + OMAP_MCBSP_READ(mcbsp[id].io_base, DRR2)); + dev_dbg(mcbsp[id].dev, "DRR1: 0x%04x\n", + OMAP_MCBSP_READ(mcbsp[id].io_base, DRR1)); + dev_dbg(mcbsp[id].dev, "DXR2: 0x%04x\n", + OMAP_MCBSP_READ(mcbsp[id].io_base, DXR2)); + dev_dbg(mcbsp[id].dev, "DXR1: 0x%04x\n", + OMAP_MCBSP_READ(mcbsp[id].io_base, DXR1)); + dev_dbg(mcbsp[id].dev, "SPCR2: 0x%04x\n", + OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR2)); + dev_dbg(mcbsp[id].dev, "SPCR1: 0x%04x\n", + OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR1)); + dev_dbg(mcbsp[id].dev, "RCR2: 0x%04x\n", + OMAP_MCBSP_READ(mcbsp[id].io_base, RCR2)); + dev_dbg(mcbsp[id].dev, "RCR1: 0x%04x\n", + OMAP_MCBSP_READ(mcbsp[id].io_base, RCR1)); + dev_dbg(mcbsp[id].dev, "XCR2: 0x%04x\n", + OMAP_MCBSP_READ(mcbsp[id].io_base, XCR2)); + dev_dbg(mcbsp[id].dev, "XCR1: 0x%04x\n", + OMAP_MCBSP_READ(mcbsp[id].io_base, XCR1)); + dev_dbg(mcbsp[id].dev, "SRGR2: 0x%04x\n", + OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR2)); + dev_dbg(mcbsp[id].dev, "SRGR1: 0x%04x\n", + OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR1)); + dev_dbg(mcbsp[id].dev, "PCR0: 0x%04x\n", + OMAP_MCBSP_READ(mcbsp[id].io_base, PCR0)); + dev_dbg(mcbsp[id].dev, "***********************\n"); } static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id) { struct omap_mcbsp *mcbsp_tx = dev_id; - DBG("TX IRQ callback : 0x%x\n", - OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2)); + dev_dbg(mcbsp_tx->dev, "TX IRQ callback : 0x%x\n", + OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2)); complete(&mcbsp_tx->tx_irq_completion); @@ -112,8 +83,8 @@ static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id) { struct omap_mcbsp *mcbsp_rx = dev_id; - DBG("RX IRQ callback : 0x%x\n", - OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2)); + dev_dbg(mcbsp_rx->dev, "RX IRQ callback : 0x%x\n", + OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2)); complete(&mcbsp_rx->rx_irq_completion); @@ -124,8 +95,8 @@ static void omap_mcbsp_tx_dma_callback(int lch, u16 ch_status, void *data) { struct omap_mcbsp *mcbsp_dma_tx = data; - DBG("TX DMA callback : 0x%x\n", - OMAP_MCBSP_READ(mcbsp_dma_tx->io_base, SPCR2)); + dev_dbg(mcbsp_dma_tx->dev, "TX DMA callback : 0x%x\n", + OMAP_MCBSP_READ(mcbsp_dma_tx->io_base, SPCR2)); /* We can free the channels */ omap_free_dma(mcbsp_dma_tx->dma_tx_lch); @@ -138,8 +109,8 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data) { struct omap_mcbsp *mcbsp_dma_rx = data; - DBG("RX DMA callback : 0x%x\n", - OMAP_MCBSP_READ(mcbsp_dma_rx->io_base, SPCR2)); + dev_dbg(mcbsp_dma_rx->dev, "RX DMA callback : 0x%x\n", + OMAP_MCBSP_READ(mcbsp_dma_rx->io_base, SPCR2)); /* We can free the channels */ omap_free_dma(mcbsp_dma_rx->dma_rx_lch); @@ -156,9 +127,16 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data) */ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) { - u32 io_base = mcbsp[id].io_base; + u32 io_base; + + if (!omap_mcbsp_check_valid_id(id)) { + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); + return; + } - DBG("OMAP-McBSP: McBSP%d io_base: 0x%8x\n", id + 1, io_base); + io_base = mcbsp[id].io_base; + dev_dbg(mcbsp[id].dev, "Configuring McBSP%d io_base: 0x%8x\n", + mcbsp[id].id, io_base); /* We write the given config */ OMAP_MCBSP_WRITE(io_base, SPCR2, config->spcr2); @@ -175,97 +153,22 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) } EXPORT_SYMBOL(omap_mcbsp_config); -static int omap_mcbsp_check(unsigned int id) -{ - if (cpu_is_omap730()) { - if (id > OMAP_MAX_MCBSP_COUNT - 1) { - printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", - id + 1); - return -1; - } - return 0; - } - - if (cpu_is_omap15xx() || cpu_is_omap16xx() || cpu_is_omap24xx()) { - if (id > OMAP_MAX_MCBSP_COUNT) { - printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", - id + 1); - return -1; - } - return 0; - } - - return -1; -} - -#ifdef CONFIG_ARCH_OMAP1 -static void omap_mcbsp_dsp_request(void) -{ - if (cpu_is_omap15xx() || cpu_is_omap16xx()) { - int ret; - - ret = omap_dsp_request_mem(); - if (ret < 0) { - printk(KERN_ERR "Could not get dsp memory: %i\n", ret); - return; - } - - clk_enable(mcbsp_dsp_ck); - clk_enable(mcbsp_api_ck); - - /* enable 12MHz clock to mcbsp 1 & 3 */ - clk_enable(mcbsp_dspxor_ck); - - /* - * DSP external peripheral reset - * FIXME: This should be moved to dsp code - */ - __raw_writew(__raw_readw(DSP_RSTCT2) | 1 | 1 << 1, - DSP_RSTCT2); - } -} - -static void omap_mcbsp_dsp_free(void) -{ - if (cpu_is_omap15xx() || cpu_is_omap16xx()) { - omap_dsp_release_mem(); - clk_disable(mcbsp_dspxor_ck); - clk_disable(mcbsp_dsp_ck); - clk_disable(mcbsp_api_ck); - } -} -#endif - -#ifdef CONFIG_ARCH_OMAP2 -static void omap2_mcbsp2_mux_setup(void) -{ - if (cpu_is_omap2420()) { - omap_cfg_reg(Y15_24XX_MCBSP2_CLKX); - omap_cfg_reg(R14_24XX_MCBSP2_FSX); - omap_cfg_reg(W15_24XX_MCBSP2_DR); - omap_cfg_reg(V15_24XX_MCBSP2_DX); - omap_cfg_reg(V14_24XX_GPIO117); - } - /* - * Need to add MUX settings for OMAP 2430 SDP - */ -} -#endif - /* * We can choose between IRQ based or polled IO. * This needs to be called before omap_mcbsp_request(). */ int omap_mcbsp_set_io_type(unsigned int id, omap_mcbsp_io_type_t io_type) { - if (omap_mcbsp_check(id) < 0) - return -EINVAL; + if (!omap_mcbsp_check_valid_id(id)) { + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); + return -ENODEV; + } spin_lock(&mcbsp[id].lock); if (!mcbsp[id].free) { - printk(KERN_ERR "OMAP-McBSP: McBSP%d is currently in use\n", - id + 1); + dev_err(mcbsp[id].dev, "McBSP%d is currently in use\n", + mcbsp[id].id); spin_unlock(&mcbsp[id].lock); return -EINVAL; } @@ -282,34 +185,20 @@ int omap_mcbsp_request(unsigned int id) { int err; - if (omap_mcbsp_check(id) < 0) - return -EINVAL; - -#ifdef CONFIG_ARCH_OMAP1 - /* - * On 1510, 1610 and 1710, McBSP1 and McBSP3 - * are DSP public peripherals. - */ - if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) - omap_mcbsp_dsp_request(); -#endif - -#ifdef CONFIG_ARCH_OMAP2 - if (cpu_is_omap24xx()) { - if (id == OMAP_MCBSP1) { - clk_enable(mcbsp1_ick); - clk_enable(mcbsp1_fck); - } else { - clk_enable(mcbsp2_ick); - clk_enable(mcbsp2_fck); - } + if (!omap_mcbsp_check_valid_id(id)) { + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); + return -ENODEV; } -#endif + + if (mcbsp[id].pdata->ops->request) + mcbsp[id].pdata->ops->request(id); + + mcbsp_clk_enable(&mcbsp[id]); spin_lock(&mcbsp[id].lock); if (!mcbsp[id].free) { - printk(KERN_ERR "OMAP-McBSP: McBSP%d is currently in use\n", - id + 1); + dev_err(mcbsp[id].dev, "McBSP%d is currently in use\n", + mcbsp[id].id); spin_unlock(&mcbsp[id].lock); return -1; } @@ -322,9 +211,9 @@ int omap_mcbsp_request(unsigned int id) err = request_irq(mcbsp[id].tx_irq, omap_mcbsp_tx_irq_handler, 0, "McBSP", (void *) (&mcbsp[id])); if (err != 0) { - printk(KERN_ERR "OMAP-McBSP: Unable to " - "request TX IRQ %d for McBSP%d\n", - mcbsp[id].tx_irq, mcbsp[id].id); + dev_err(mcbsp[id].dev, "Unable to request TX IRQ %d " + "for McBSP%d\n", mcbsp[id].tx_irq, + mcbsp[id].id); return err; } @@ -333,9 +222,9 @@ int omap_mcbsp_request(unsigned int id) err = request_irq(mcbsp[id].rx_irq, omap_mcbsp_rx_irq_handler, 0, "McBSP", (void *) (&mcbsp[id])); if (err != 0) { - printk(KERN_ERR "OMAP-McBSP: Unable to " - "request RX IRQ %d for McBSP%d\n", - mcbsp[id].rx_irq, mcbsp[id].id); + dev_err(mcbsp[id].dev, "Unable to request RX IRQ %d " + "for McBSP%d\n", mcbsp[id].rx_irq, + mcbsp[id].id); free_irq(mcbsp[id].tx_irq, (void *) (&mcbsp[id])); return err; } @@ -349,32 +238,20 @@ EXPORT_SYMBOL(omap_mcbsp_request); void omap_mcbsp_free(unsigned int id) { - if (omap_mcbsp_check(id) < 0) + if (!omap_mcbsp_check_valid_id(id)) { + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); return; - -#ifdef CONFIG_ARCH_OMAP1 - if (cpu_class_is_omap1()) { - if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) - omap_mcbsp_dsp_free(); } -#endif - -#ifdef CONFIG_ARCH_OMAP2 - if (cpu_is_omap24xx()) { - if (id == OMAP_MCBSP1) { - clk_disable(mcbsp1_ick); - clk_disable(mcbsp1_fck); - } else { - clk_disable(mcbsp2_ick); - clk_disable(mcbsp2_fck); - } - } -#endif + + if (mcbsp[id].pdata->ops->free) + mcbsp[id].pdata->ops->free(id); + + mcbsp_clk_disable(&mcbsp[id]); spin_lock(&mcbsp[id].lock); if (mcbsp[id].free) { - printk(KERN_ERR "OMAP-McBSP: McBSP%d was not reserved\n", - id + 1); + dev_err(mcbsp[id].dev, "McBSP%d was not reserved\n", + mcbsp[id].id); spin_unlock(&mcbsp[id].lock); return; } @@ -400,8 +277,10 @@ void omap_mcbsp_start(unsigned int id) u32 io_base; u16 w; - if (omap_mcbsp_check(id) < 0) + if (!omap_mcbsp_check_valid_id(id)) { + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); return; + } io_base = mcbsp[id].io_base; @@ -435,8 +314,10 @@ void omap_mcbsp_stop(unsigned int id) u32 io_base; u16 w; - if (omap_mcbsp_check(id) < 0) + if (!omap_mcbsp_check_valid_id(id)) { + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); return; + } io_base = mcbsp[id].io_base; @@ -457,7 +338,14 @@ EXPORT_SYMBOL(omap_mcbsp_stop); /* polled mcbsp i/o operations */ int omap_mcbsp_pollwrite(unsigned int id, u16 buf) { - u32 base = mcbsp[id].io_base; + u32 base; + + if (!omap_mcbsp_check_valid_id(id)) { + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); + return -ENODEV; + } + + base = mcbsp[id].io_base; writew(buf, base + OMAP_MCBSP_REG_DXR1); /* if frame sync error - clear the error */ if (readw(base + OMAP_MCBSP_REG_SPCR2) & XSYNC_ERR) { @@ -479,8 +367,8 @@ int omap_mcbsp_pollwrite(unsigned int id, u16 buf) (XRST), base + OMAP_MCBSP_REG_SPCR2); udelay(10); - printk(KERN_ERR - " Could not write to McBSP Register\n"); + dev_err(mcbsp[id].dev, "Could not write to" + " McBSP%d Register\n", mcbsp[id].id); return -2; } } @@ -492,7 +380,14 @@ EXPORT_SYMBOL(omap_mcbsp_pollwrite); int omap_mcbsp_pollread(unsigned int id, u16 *buf) { - u32 base = mcbsp[id].io_base; + u32 base; + + if (!omap_mcbsp_check_valid_id(id)) { + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); + return -ENODEV; + } + + base = mcbsp[id].io_base; /* if frame sync error - clear the error */ if (readw(base + OMAP_MCBSP_REG_SPCR1) & RSYNC_ERR) { /* clear error */ @@ -513,8 +408,8 @@ int omap_mcbsp_pollread(unsigned int id, u16 *buf) (RRST), base + OMAP_MCBSP_REG_SPCR1); udelay(10); - printk(KERN_ERR - " Could not read from McBSP Register\n"); + dev_err(mcbsp[id].dev, "Could not read from" + " McBSP%d Register\n", mcbsp[id].id); return -2; } } @@ -531,12 +426,15 @@ EXPORT_SYMBOL(omap_mcbsp_pollread); void omap_mcbsp_xmit_word(unsigned int id, u32 word) { u32 io_base; - omap_mcbsp_word_length word_length = mcbsp[id].tx_word_length; + omap_mcbsp_word_length word_length; - if (omap_mcbsp_check(id) < 0) + if (!omap_mcbsp_check_valid_id(id)) { + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); return; + } io_base = mcbsp[id].io_base; + word_length = mcbsp[id].tx_word_length; wait_for_completion(&(mcbsp[id].tx_irq_completion)); @@ -550,11 +448,14 @@ u32 omap_mcbsp_recv_word(unsigned int id) { u32 io_base; u16 word_lsb, word_msb = 0; - omap_mcbsp_word_length word_length = mcbsp[id].rx_word_length; + omap_mcbsp_word_length word_length; - if (omap_mcbsp_check(id) < 0) - return -EINVAL; + if (!omap_mcbsp_check_valid_id(id)) { + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); + return -ENODEV; + } + word_length = mcbsp[id].rx_word_length; io_base = mcbsp[id].io_base; wait_for_completion(&(mcbsp[id].rx_irq_completion)); @@ -569,11 +470,20 @@ EXPORT_SYMBOL(omap_mcbsp_recv_word); int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) { - u32 io_base = mcbsp[id].io_base; - omap_mcbsp_word_length tx_word_length = mcbsp[id].tx_word_length; - omap_mcbsp_word_length rx_word_length = mcbsp[id].rx_word_length; + u32 io_base; + omap_mcbsp_word_length tx_word_length; + omap_mcbsp_word_length rx_word_length; u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0; + if (!omap_mcbsp_check_valid_id(id)) { + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); + return -ENODEV; + } + + io_base = mcbsp[id].io_base; + tx_word_length = mcbsp[id].tx_word_length; + rx_word_length = mcbsp[id].rx_word_length; + if (tx_word_length != rx_word_length) return -EINVAL; @@ -587,7 +497,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) udelay(10); OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST); udelay(10); - printk(KERN_ERR "McBSP transmitter not ready\n"); + dev_err(mcbsp[id].dev, "McBSP%d transmitter not " + "ready\n", mcbsp[id].id); return -EAGAIN; } } @@ -607,7 +518,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) udelay(10); OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST); udelay(10); - printk(KERN_ERR "McBSP receiver not ready\n"); + dev_err(mcbsp[id].dev, "McBSP%d receiver not " + "ready\n", mcbsp[id].id); return -EAGAIN; } } @@ -623,11 +535,20 @@ EXPORT_SYMBOL(omap_mcbsp_spi_master_xmit_word_poll); int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) { - u32 io_base = mcbsp[id].io_base, clock_word = 0; - omap_mcbsp_word_length tx_word_length = mcbsp[id].tx_word_length; - omap_mcbsp_word_length rx_word_length = mcbsp[id].rx_word_length; + u32 io_base, clock_word = 0; + omap_mcbsp_word_length tx_word_length; + omap_mcbsp_word_length rx_word_length; u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0; + if (!omap_mcbsp_check_valid_id(id)) { + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); + return -ENODEV; + } + + io_base = mcbsp[id].io_base; + tx_word_length = mcbsp[id].tx_word_length; + rx_word_length = mcbsp[id].rx_word_length; + if (tx_word_length != rx_word_length) return -EINVAL; @@ -641,7 +562,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) udelay(10); OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST); udelay(10); - printk(KERN_ERR "McBSP transmitter not ready\n"); + dev_err(mcbsp[id].dev, "McBSP%d transmitter not " + "ready\n", mcbsp[id].id); return -EAGAIN; } } @@ -661,7 +583,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) udelay(10); OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST); udelay(10); - printk(KERN_ERR "McBSP receiver not ready\n"); + dev_err(mcbsp[id].dev, "McBSP%d receiver not " + "ready\n", mcbsp[id].id); return -EAGAIN; } } @@ -692,20 +615,24 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer, int dest_port = 0; int sync_dev = 0; - if (omap_mcbsp_check(id) < 0) - return -EINVAL; + if (!omap_mcbsp_check_valid_id(id)) { + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); + return -ENODEV; + } if (omap_request_dma(mcbsp[id].dma_tx_sync, "McBSP TX", omap_mcbsp_tx_dma_callback, &mcbsp[id], &dma_tx_ch)) { - printk(KERN_ERR "OMAP-McBSP: Unable to request DMA channel for" - " McBSP%d TX. Trying IRQ based TX\n", id + 1); + dev_err(mcbsp[id].dev, " Unable to request DMA channel for " + "McBSP%d TX. Trying IRQ based TX\n", + mcbsp[id].id); return -EAGAIN; } mcbsp[id].dma_tx_lch = dma_tx_ch; - DBG("TX DMA on channel %d\n", dma_tx_ch); + dev_err(mcbsp[id].dev, "McBSP%d TX DMA on channel %d\n", mcbsp[id].id, + dma_tx_ch); init_completion(&(mcbsp[id].tx_dma_completion)); @@ -713,7 +640,7 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer, src_port = OMAP_DMA_PORT_TIPB; dest_port = OMAP_DMA_PORT_EMIFF; } - if (cpu_is_omap24xx()) + if (cpu_class_is_omap2()) sync_dev = mcbsp[id].dma_tx_sync; omap_set_dma_transfer_params(mcbsp[id].dma_tx_lch, @@ -749,20 +676,24 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer, int dest_port = 0; int sync_dev = 0; - if (omap_mcbsp_check(id) < 0) - return -EINVAL; + if (!omap_mcbsp_check_valid_id(id)) { + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); + return -ENODEV; + } if (omap_request_dma(mcbsp[id].dma_rx_sync, "McBSP RX", omap_mcbsp_rx_dma_callback, &mcbsp[id], &dma_rx_ch)) { - printk(KERN_ERR "Unable to request DMA channel for McBSP%d RX." - " Trying IRQ based RX\n", id + 1); + dev_err(mcbsp[id].dev, "Unable to request DMA channel for " + "McBSP%d RX. Trying IRQ based RX\n", + mcbsp[id].id); return -EAGAIN; } mcbsp[id].dma_rx_lch = dma_rx_ch; - DBG("RX DMA on channel %d\n", dma_rx_ch); + dev_err(mcbsp[id].dev, "McBSP%d RX DMA on channel %d\n", mcbsp[id].id, + dma_rx_ch); init_completion(&(mcbsp[id].rx_dma_completion)); @@ -770,7 +701,7 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer, src_port = OMAP_DMA_PORT_TIPB; dest_port = OMAP_DMA_PORT_EMIFF; } - if (cpu_is_omap24xx()) + if (cpu_class_is_omap2()) sync_dev = mcbsp[id].dma_rx_sync; omap_set_dma_transfer_params(mcbsp[id].dma_rx_lch, @@ -809,8 +740,10 @@ void omap_mcbsp_set_spi_mode(unsigned int id, { struct omap_mcbsp_reg_cfg mcbsp_cfg; - if (omap_mcbsp_check(id) < 0) + if (!omap_mcbsp_check_valid_id(id)) { + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); return; + } memset(&mcbsp_cfg, 0, sizeof(struct omap_mcbsp_reg_cfg)); @@ -871,182 +804,91 @@ 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. */ -struct omap_mcbsp_info { - u32 virt_base; - u8 dma_rx_sync, dma_tx_sync; - u16 rx_irq, tx_irq; -}; +static int __init omap_mcbsp_probe(struct platform_device *pdev) +{ + struct omap_mcbsp_platform_data *pdata = pdev->dev.platform_data; + int id = pdev->id - 1; + int ret = 0; + int i; -#ifdef CONFIG_ARCH_OMAP730 -static const struct omap_mcbsp_info mcbsp_730[] = { - [0] = { .virt_base = io_p2v(OMAP730_MCBSP1_BASE), - .dma_rx_sync = OMAP_DMA_MCBSP1_RX, - .dma_tx_sync = OMAP_DMA_MCBSP1_TX, - .rx_irq = INT_730_McBSP1RX, - .tx_irq = INT_730_McBSP1TX }, - [1] = { .virt_base = io_p2v(OMAP730_MCBSP2_BASE), - .dma_rx_sync = OMAP_DMA_MCBSP3_RX, - .dma_tx_sync = OMAP_DMA_MCBSP3_TX, - .rx_irq = INT_730_McBSP2RX, - .tx_irq = INT_730_McBSP2TX }, -}; -#endif - -#ifdef CONFIG_ARCH_OMAP15XX -static const struct omap_mcbsp_info mcbsp_1510[] = { - [0] = { .virt_base = OMAP1510_MCBSP1_BASE, - .dma_rx_sync = OMAP_DMA_MCBSP1_RX, - .dma_tx_sync = OMAP_DMA_MCBSP1_TX, - .rx_irq = INT_McBSP1RX, - .tx_irq = INT_McBSP1TX }, - [1] = { .virt_base = io_p2v(OMAP1510_MCBSP2_BASE), - .dma_rx_sync = OMAP_DMA_MCBSP2_RX, - .dma_tx_sync = OMAP_DMA_MCBSP2_TX, - .rx_irq = INT_1510_SPI_RX, - .tx_irq = INT_1510_SPI_TX }, - [2] = { .virt_base = OMAP1510_MCBSP3_BASE, - .dma_rx_sync = OMAP_DMA_MCBSP3_RX, - .dma_tx_sync = OMAP_DMA_MCBSP3_TX, - .rx_irq = INT_McBSP3RX, - .tx_irq = INT_McBSP3TX }, -}; -#endif - -#if defined(CONFIG_ARCH_OMAP16XX) -static const struct omap_mcbsp_info mcbsp_1610[] = { - [0] = { .virt_base = OMAP1610_MCBSP1_BASE, - .dma_rx_sync = OMAP_DMA_MCBSP1_RX, - .dma_tx_sync = OMAP_DMA_MCBSP1_TX, - .rx_irq = INT_McBSP1RX, - .tx_irq = INT_McBSP1TX }, - [1] = { .virt_base = io_p2v(OMAP1610_MCBSP2_BASE), - .dma_rx_sync = OMAP_DMA_MCBSP2_RX, - .dma_tx_sync = OMAP_DMA_MCBSP2_TX, - .rx_irq = INT_1610_McBSP2_RX, - .tx_irq = INT_1610_McBSP2_TX }, - [2] = { .virt_base = OMAP1610_MCBSP3_BASE, - .dma_rx_sync = OMAP_DMA_MCBSP3_RX, - .dma_tx_sync = OMAP_DMA_MCBSP3_TX, - .rx_irq = INT_McBSP3RX, - .tx_irq = INT_McBSP3TX }, -}; -#endif - -#if defined(CONFIG_ARCH_OMAP24XX) -static const struct omap_mcbsp_info mcbsp_24xx[] = { - [0] = { .virt_base = IO_ADDRESS(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, - }, - [1] = { .virt_base = IO_ADDRESS(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, - }, -}; -#endif + if (!pdata) { + dev_err(&pdev->dev, "McBSP device initialized without" + "platform data\n"); + ret = -EINVAL; + goto exit; + } -static int __init omap_mcbsp_init(void) + dev_dbg(&pdev->dev, "Initializing OMAP McBSP (%d).\n", pdev->id); + + if (id >= OMAP_MAX_MCBSP_COUNT) { + dev_err(&pdev->dev, "Invalid McBSP device id (%d)\n", id); + ret = -EINVAL; + goto exit; + } + + spin_lock_init(&mcbsp[id].lock); + mcbsp[id].id = id + 1; + mcbsp[id].free = 1; + mcbsp[id].dma_tx_lch = -1; + mcbsp[id].dma_rx_lch = -1; + + mcbsp[id].io_base = pdata->virt_base; + /* Default I/O is IRQ based */ + mcbsp[id].io_type = OMAP_MCBSP_IRQ_IO; + mcbsp[id].tx_irq = pdata->tx_irq; + mcbsp[id].rx_irq = pdata->rx_irq; + mcbsp[id].dma_rx_sync = pdata->dma_rx_sync; + mcbsp[id].dma_tx_sync = pdata->dma_tx_sync; + + mcbsp[id].nr_clocks = ARRAY_SIZE(pdata->clocks); + for (i = 0; i < ARRAY_SIZE(pdata->clocks); i++) + mcbsp[id].clocks[i] = clk_get(&pdev->dev, pdata->clocks[i]); + + mcbsp[id].pdata = pdata; + mcbsp[id].dev = &pdev->dev; + platform_set_drvdata(pdev, &mcbsp[id]); + +exit: + return ret; +} + +static int omap_mcbsp_remove(struct platform_device *pdev) { - int mcbsp_count = 0, i; - static const struct omap_mcbsp_info *mcbsp_info; + struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); - printk(KERN_INFO "Initializing OMAP McBSP system\n"); + platform_set_drvdata(pdev, NULL); + if (mcbsp) { + int i; -#ifdef CONFIG_ARCH_OMAP1 - mcbsp_dsp_ck = clk_get(0, "dsp_ck"); - if (IS_ERR(mcbsp_dsp_ck)) { - printk(KERN_ERR "mcbsp: could not acquire dsp_ck handle.\n"); - return PTR_ERR(mcbsp_dsp_ck); - } - mcbsp_api_ck = clk_get(0, "api_ck"); - if (IS_ERR(mcbsp_api_ck)) { - printk(KERN_ERR "mcbsp: could not acquire api_ck handle.\n"); - return PTR_ERR(mcbsp_api_ck); - } - mcbsp_dspxor_ck = clk_get(0, "dspxor_ck"); - if (IS_ERR(mcbsp_dspxor_ck)) { - printk(KERN_ERR "mcbsp: could not acquire dspxor_ck handle.\n"); - return PTR_ERR(mcbsp_dspxor_ck); - } -#endif -#ifdef CONFIG_ARCH_OMAP2 - mcbsp1_ick = clk_get(0, "mcbsp1_ick"); - if (IS_ERR(mcbsp1_ick)) { - printk(KERN_ERR "mcbsp: could not acquire " - "mcbsp1_ick handle.\n"); - return PTR_ERR(mcbsp1_ick); - } - mcbsp1_fck = clk_get(0, "mcbsp1_fck"); - if (IS_ERR(mcbsp1_fck)) { - printk(KERN_ERR "mcbsp: could not acquire " - "mcbsp1_fck handle.\n"); - return PTR_ERR(mcbsp1_fck); - } - mcbsp2_ick = clk_get(0, "mcbsp2_ick"); - if (IS_ERR(mcbsp2_ick)) { - printk(KERN_ERR "mcbsp: could not acquire " - "mcbsp2_ick handle.\n"); - return PTR_ERR(mcbsp2_ick); - } - mcbsp2_fck = clk_get(0, "mcbsp2_fck"); - if (IS_ERR(mcbsp2_fck)) { - printk(KERN_ERR "mcbsp: could not acquire " - "mcbsp2_fck handle.\n"); - return PTR_ERR(mcbsp2_fck); - } -#endif + if (mcbsp->pdata && mcbsp->pdata->ops && + mcbsp->pdata->ops->free) + mcbsp->pdata->ops->free(mcbsp->id); -#ifdef CONFIG_ARCH_OMAP730 - if (cpu_is_omap730()) { - mcbsp_info = mcbsp_730; - mcbsp_count = ARRAY_SIZE(mcbsp_730); - } -#endif -#ifdef CONFIG_ARCH_OMAP15XX - if (cpu_is_omap15xx()) { - mcbsp_info = mcbsp_1510; - mcbsp_count = ARRAY_SIZE(mcbsp_1510); - } -#endif -#if defined(CONFIG_ARCH_OMAP16XX) - if (cpu_is_omap16xx()) { - mcbsp_info = mcbsp_1610; - mcbsp_count = ARRAY_SIZE(mcbsp_1610); - } -#endif -#if defined(CONFIG_ARCH_OMAP24XX) - if (cpu_is_omap24xx()) { - mcbsp_info = mcbsp_24xx; - mcbsp_count = ARRAY_SIZE(mcbsp_24xx); - omap2_mcbsp2_mux_setup(); - } -#endif - for (i = 0; i < OMAP_MAX_MCBSP_COUNT ; i++) { - if (i >= mcbsp_count) { - mcbsp[i].io_base = 0; - mcbsp[i].free = 0; - continue; - } - mcbsp[i].id = i + 1; - mcbsp[i].free = 1; - mcbsp[i].dma_tx_lch = -1; - mcbsp[i].dma_rx_lch = -1; - - mcbsp[i].io_base = mcbsp_info[i].virt_base; - /* Default I/O is IRQ based */ - mcbsp[i].io_type = OMAP_MCBSP_IRQ_IO; - mcbsp[i].tx_irq = mcbsp_info[i].tx_irq; - mcbsp[i].rx_irq = mcbsp_info[i].rx_irq; - mcbsp[i].dma_rx_sync = mcbsp_info[i].dma_rx_sync; - mcbsp[i].dma_tx_sync = mcbsp_info[i].dma_tx_sync; - spin_lock_init(&mcbsp[i].lock); + mcbsp_clk_disable(mcbsp); + mcbsp_clk_put(mcbsp); + + for (i = 0; i < mcbsp->nr_clocks; i++) + mcbsp->clocks[i] = NULL; + + mcbsp->free = 0; + mcbsp->dev = NULL; } return 0; } -arch_initcall(omap_mcbsp_init); +static struct platform_driver omap_mcbsp_driver = { + .probe = omap_mcbsp_probe, + .remove = omap_mcbsp_remove, + .driver = { + .name = "omap-mcbsp", + }, +}; + +int __init omap_mcbsp_init(void) +{ + /* Register the McBSP driver */ + return platform_driver_register(&omap_mcbsp_driver); +} + + diff --git a/include/asm-arm/arch-omap/mcbsp.h b/include/asm-arm/arch-omap/mcbsp.h index b53c3b2..aa47421 100644 --- a/include/asm-arm/arch-omap/mcbsp.h +++ b/include/asm-arm/arch-omap/mcbsp.h @@ -24,7 +24,11 @@ #ifndef __ASM_ARCH_OMAP_MCBSP_H #define __ASM_ARCH_OMAP_MCBSP_H +#include <linux/completion.h> +#include <linux/spinlock.h> + #include <asm/hardware.h> +#include <asm/arch/clock.h> #define OMAP730_MCBSP1_BASE 0xfffb1000 #define OMAP730_MCBSP2_BASE 0xfffb1800 @@ -40,6 +44,9 @@ #define OMAP24XX_MCBSP1_BASE 0x48074000 #define OMAP24XX_MCBSP2_BASE 0x48076000 +#define OMAP34XX_MCBSP1_BASE 0x48074000 +#define OMAP34XX_MCBSP2_BASE 0x49022000 + #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730) #define OMAP_MCBSP_REG_DRR2 0x00 @@ -74,7 +81,8 @@ #define OMAP_MCBSP_REG_XCERG 0x3A #define OMAP_MCBSP_REG_XCERH 0x3C -#define OMAP_MAX_MCBSP_COUNT 3 +#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) @@ -117,7 +125,8 @@ #define OMAP_MCBSP_REG_XCERG 0x74 #define OMAP_MCBSP_REG_XCERH 0x78 -#define OMAP_MAX_MCBSP_COUNT 2 +#define OMAP_MAX_MCBSP_COUNT 2 +#define MAX_MCBSP_CLOCKS 2 #define AUDIO_MCBSP_DATAWRITE (OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR1) #define AUDIO_MCBSP_DATAREAD (OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR1) @@ -298,6 +307,66 @@ struct omap_mcbsp_spi_cfg { omap_mcbsp_word_length word_length; }; +/* Platform specific configuration */ +struct omap_mcbsp_ops { + void (*request)(unsigned int); + void (*free)(unsigned int); + int (*check)(unsigned int); +}; + +struct omap_mcbsp_platform_data { + u32 virt_base; + u8 dma_rx_sync, dma_tx_sync; + u16 rx_irq, tx_irq; + struct omap_mcbsp_ops *ops; + char const *clocks[MAX_MCBSP_CLOCKS]; +}; + +struct omap_mcbsp { + struct device *dev; + u32 io_base; + u8 id; + u8 free; + omap_mcbsp_word_length rx_word_length; + omap_mcbsp_word_length tx_word_length; + + omap_mcbsp_io_type_t io_type; /* IRQ or poll */ + /* IRQ based TX/RX */ + int rx_irq; + int tx_irq; + + /* DMA stuff */ + u8 dma_rx_sync; + short dma_rx_lch; + u8 dma_tx_sync; + short dma_tx_lch; + + /* Completion queues */ + struct completion tx_irq_completion; + struct completion rx_irq_completion; + struct completion tx_dma_completion; + struct completion rx_dma_completion; + + /* Protect the field .free, while checking if the mcbsp is in use */ + spinlock_t lock; + struct omap_mcbsp_platform_data *pdata; + int nr_clocks; + struct clk *clocks[MAX_MCBSP_CLOCKS]; +}; + +#define __mcbsp_clk_op(mcbsp, op) \ + do { \ + int i; \ + for (i = 0; i < mcbsp->nr_clocks; i++) \ + clk_##op(mcbsp->clocks[i]); \ + } while (0) +#define mcbsp_clk_enable(mcbsp) __mcbsp_clk_op((mcbsp), enable) +#define mcbsp_clk_disable(mcbsp) __mcbsp_clk_op((mcbsp), disable) +#define mcbsp_clk_put(mcbsp) __mcbsp_clk_op((mcbsp), put) + +int omap_mcbsp_init(void); +void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, + int size); void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config); int omap_mcbsp_request(unsigned int id); void omap_mcbsp_free(unsigned int id); -- 1.5.5.1.67.gbdb8.dirty ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 2/4] MACH-OMAP1: MCBSP: Add support for mcbsp on mach-omap1 2008-05-05 21:23 ` [PATCH 1/4] PLAT-OMAP: MCBSP: Tranform into platform driver Eduardo Valentin @ 2008-05-05 21:23 ` Eduardo Valentin 2008-05-05 21:23 ` [PATCH 3/4] Fix mcbsp clock definition on clock34xx.h Eduardo Valentin 2008-05-08 11:23 ` [PATCH 1/4] PLAT-OMAP: MCBSP: Tranform into platform driver Trilok Soni 2008-05-20 23:44 ` Tony Lindgren 2 siblings, 1 reply; 17+ messages in thread From: Eduardo Valentin @ 2008-05-05 21:23 UTC (permalink / raw) To: linux-omap; +Cc: Tony Lindgren, Chandra shekhar, Eduardo Valentin From: Eduardo Valentin <eduardo.valentin@indt.org.br> This patch adds support for mach-omap1 based on current mcbsp platform driver. Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br> --- arch/arm/mach-omap1/Makefile | 2 + arch/arm/mach-omap1/mcbsp.c | 165 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-omap1/mcbsp.c diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index 6ebf23b..09246a7 100644 --- a/arch/arm/mach-omap1/Makefile +++ b/arch/arm/mach-omap1/Makefile @@ -5,6 +5,8 @@ # Common support obj-y := io.o id.o clock.o irq.o mux.o serial.o devices.o +obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o + obj-$(CONFIG_OMAP_MPU_TIMER) += time.o obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c new file mode 100644 index 0000000..f30624a --- /dev/null +++ b/arch/arm/mach-omap1/mcbsp.c @@ -0,0 +1,165 @@ +/* + * linux/arch/arm/mach-omap1/mcbsp.c + * + * Copyright (C) 2008 Instituto Nokia de Tecnologia + * Contact: Eduardo Valentin <eduardo.valentin@indt.org.br> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Multichannel mode not supported. + */ +#include <linux/module.h> +#include <linux/init.h> +#include <linux/clk.h> +#include <linux/err.h> +#include <linux/io.h> + +#include <asm/arch/dma.h> +#include <asm/arch/mux.h> +#include <asm/arch/cpu.h> +#include <asm/arch/mcbsp.h> +#include <asm/arch/dsp_common.h> + +#define DPS_RSTCT2_PER_EN (1 << 0) +#define DSP_RSTCT2_WD_PER_EN (1 << 1) + +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) +{ + /* + * On 1510, 1610 and 1710, McBSP1 and McBSP3 + * are DSP public peripherals. + */ + if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) { + omap_dsp_request_mem(); + /* + * DSP external peripheral reset + * FIXME: This should be moved to dsp code + */ + __raw_writew(__raw_readw(DSP_RSTCT2) | DPS_RSTCT2_PER_EN | + DSP_RSTCT2_WD_PER_EN, DSP_RSTCT2); + } +} + +static void omap1_mcbsp_free(unsigned int id) +{ + if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) + omap_dsp_release_mem(); +} + +static struct omap_mcbsp_ops omap1_mcbsp_ops = { + .check = omap1_mcbsp_check, + .request = omap1_mcbsp_request, + .free = omap1_mcbsp_free, +}; + +static struct omap_mcbsp_platform_data omap1_mcbsp_pdata[] = { +#ifdef CONFIG_ARCH_OMAP730 + { + .virt_base = io_p2v(OMAP730_MCBSP1_BASE), + .dma_rx_sync = OMAP_DMA_MCBSP1_RX, + .dma_tx_sync = OMAP_DMA_MCBSP1_TX, + .rx_irq = INT_730_McBSP1RX, + .tx_irq = INT_730_McBSP1TX, + .ops = &omap1_mcbsp_ops, + }, + { + .virt_base = io_p2v(OMAP730_MCBSP2_BASE), + .dma_rx_sync = OMAP_DMA_MCBSP3_RX, + .dma_tx_sync = OMAP_DMA_MCBSP3_TX, + .rx_irq = INT_730_McBSP2RX, + .tx_irq = INT_730_McBSP2TX + .ops = &omap1_mcbsp_ops, + }, +#endif +#ifdef CONFIG_ARCH_OMAP15XX + { + .virt_base = OMAP1510_MCBSP1_BASE, + .dma_rx_sync = OMAP_DMA_MCBSP1_RX, + .dma_tx_sync = OMAP_DMA_MCBSP1_TX, + .rx_irq = INT_McBSP1RX, + .tx_irq = INT_McBSP1TX, + .ops = &omap1_mcbsp_ops, + .clocks = { "dsp_ck", "api_ck", "dspxor_ck" }, + }, + { + .virt_base = io_p2v(OMAP1510_MCBSP2_BASE), + .dma_rx_sync = OMAP_DMA_MCBSP2_RX, + .dma_tx_sync = OMAP_DMA_MCBSP2_TX, + .rx_irq = INT_1510_SPI_RX, + .tx_irq = INT_1510_SPI_TX, + .ops = &omap1_mcbsp_ops, + }, + { + .virt_base = OMAP1510_MCBSP3_BASE, + .dma_rx_sync = OMAP_DMA_MCBSP3_RX, + .dma_tx_sync = OMAP_DMA_MCBSP3_TX, + .rx_irq = INT_McBSP3RX, + .tx_irq = INT_McBSP3TX, + .ops = &omap1_mcbsp_ops, + .clocks = { "dsp_ck", "api_ck", "dspxor_ck" }, + }, +#endif +#ifdef CONFIG_ARCH_OMAP16XX + { + .virt_base = OMAP1610_MCBSP1_BASE, + .dma_rx_sync = OMAP_DMA_MCBSP1_RX, + .dma_tx_sync = OMAP_DMA_MCBSP1_TX, + .rx_irq = INT_McBSP1RX, + .tx_irq = INT_McBSP1TX, + .ops = &omap1_mcbsp_ops, + .clocks = { "dsp_ck", "api_ck", "dspxor_ck" }, + }, + { + .virt_base = io_p2v(OMAP1610_MCBSP2_BASE), + .dma_rx_sync = OMAP_DMA_MCBSP2_RX, + .dma_tx_sync = OMAP_DMA_MCBSP2_TX, + .rx_irq = INT_1610_McBSP2_RX, + .tx_irq = INT_1610_McBSP2_TX, + .ops = &omap1_mcbsp_ops, + }, + { + .virt_base = OMAP1610_MCBSP3_BASE, + .dma_rx_sync = OMAP_DMA_MCBSP3_RX, + .dma_tx_sync = OMAP_DMA_MCBSP3_TX, + .rx_irq = INT_McBSP3RX, + .tx_irq = INT_McBSP3TX, + .ops = &omap1_mcbsp_ops, + .clocks = { "dsp_ck", "api_ck", "dspxor_ck" }, + }, +#endif +}; +#define mcbsp_count ARRAY_SIZE(omap1_mcbsp_pdata) + +int __init omap1_mcbsp_init(void) +{ + omap_mcbsp_register_board_cfg(omap1_mcbsp_pdata, mcbsp_count); + + return omap_mcbsp_init(); +} +arch_initcall(omap1_mcbsp_init); -- 1.5.5.1.67.gbdb8.dirty ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 3/4] Fix mcbsp clock definition on clock34xx.h 2008-05-05 21:23 ` [PATCH 2/4] MACH-OMAP1: MCBSP: Add support for mcbsp on mach-omap1 Eduardo Valentin @ 2008-05-05 21:23 ` Eduardo Valentin 2008-05-05 21:23 ` [PATCH 4/4] MACH-OMAP2: MCBSP: Add support for mcbsp on mach-omap2 Eduardo Valentin 0 siblings, 1 reply; 17+ messages in thread From: Eduardo Valentin @ 2008-05-05 21:23 UTC (permalink / raw) To: linux-omap; +Cc: Tony Lindgren, Chandra shekhar, Eduardo Valentin From: Eduardo Valentin <eduardo.valentin@indt.org.br> This patch fix the clock definition for mcbsps on clock34xx.h. Device identification must be done using .id field, not only name field. Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br> --- arch/arm/mach-omap2/clock34xx.h | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h index 85afe1e..3fea82e 100644 --- a/arch/arm/mach-omap2/clock34xx.h +++ b/arch/arm/mach-omap2/clock34xx.h @@ -1480,7 +1480,8 @@ static const struct clksel mcbsp_15_clksel[] = { }; static struct clk mcbsp5_fck = { - .name = "mcbsp5_fck", + .name = "mcbsp_fck", + .id = 5, .init = &omap2_init_clksel_parent, .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), .enable_bit = OMAP3430_EN_MCBSP5_SHIFT, @@ -1493,7 +1494,8 @@ static struct clk mcbsp5_fck = { }; static struct clk mcbsp1_fck = { - .name = "mcbsp1_fck", + .name = "mcbsp_fck", + .id = 1, .init = &omap2_init_clksel_parent, .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), .enable_bit = OMAP3430_EN_MCBSP1_SHIFT, @@ -1941,7 +1943,8 @@ static struct clk gpt10_ick = { }; static struct clk mcbsp5_ick = { - .name = "mcbsp5_ick", + .name = "mcbsp_ick", + .id = 5, .parent = &core_l4_ick, .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), .enable_bit = OMAP3430_EN_MCBSP5_SHIFT, @@ -1951,7 +1954,8 @@ static struct clk mcbsp5_ick = { }; static struct clk mcbsp1_ick = { - .name = "mcbsp1_ick", + .name = "mcbsp_ick", + .id = 1, .parent = &core_l4_ick, .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), .enable_bit = OMAP3430_EN_MCBSP1_SHIFT, @@ -2754,7 +2758,8 @@ static struct clk gpt2_ick = { }; static struct clk mcbsp2_ick = { - .name = "mcbsp2_ick", + .name = "mcbsp_ick", + .id = 2, .parent = &per_l4_ick, .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN), .enable_bit = OMAP3430_EN_MCBSP2_SHIFT, @@ -2764,7 +2769,8 @@ static struct clk mcbsp2_ick = { }; static struct clk mcbsp3_ick = { - .name = "mcbsp3_ick", + .name = "mcbsp_ick", + .id = 3, .parent = &per_l4_ick, .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN), .enable_bit = OMAP3430_EN_MCBSP3_SHIFT, @@ -2774,7 +2780,8 @@ static struct clk mcbsp3_ick = { }; static struct clk mcbsp4_ick = { - .name = "mcbsp4_ick", + .name = "mcbsp_ick", + .id = 4, .parent = &per_l4_ick, .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_ICLKEN), .enable_bit = OMAP3430_EN_MCBSP4_SHIFT, @@ -2790,7 +2797,8 @@ static const struct clksel mcbsp_234_clksel[] = { }; static struct clk mcbsp2_fck = { - .name = "mcbsp2_fck", + .name = "mcbsp_fck", + .id = 2, .init = &omap2_init_clksel_parent, .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN), .enable_bit = OMAP3430_EN_MCBSP2_SHIFT, @@ -2803,7 +2811,8 @@ static struct clk mcbsp2_fck = { }; static struct clk mcbsp3_fck = { - .name = "mcbsp3_fck", + .name = "mcbsp_fck", + .id = 3, .init = &omap2_init_clksel_parent, .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN), .enable_bit = OMAP3430_EN_MCBSP3_SHIFT, @@ -2816,7 +2825,8 @@ static struct clk mcbsp3_fck = { }; static struct clk mcbsp4_fck = { - .name = "mcbsp4_fck", + .name = "mcbsp_fck", + .id = 4, .init = &omap2_init_clksel_parent, .enable_reg = OMAP_CM_REGADDR(OMAP3430_PER_MOD, CM_FCLKEN), .enable_bit = OMAP3430_EN_MCBSP4_SHIFT, -- 1.5.5.1.67.gbdb8.dirty ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 4/4] MACH-OMAP2: MCBSP: Add support for mcbsp on mach-omap2 2008-05-05 21:23 ` [PATCH 3/4] Fix mcbsp clock definition on clock34xx.h Eduardo Valentin @ 2008-05-05 21:23 ` Eduardo Valentin 0 siblings, 0 replies; 17+ messages in thread From: Eduardo Valentin @ 2008-05-05 21:23 UTC (permalink / raw) To: linux-omap; +Cc: Tony Lindgren, Chandra shekhar, Eduardo Valentin From: Eduardo Valentin <eduardo.valentin@indt.org.br> This patch adds support for mach-omap2 based on current mcbsp platform driver. Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br> --- arch/arm/mach-omap2/Makefile | 2 + arch/arm/mach-omap2/mcbsp.c | 105 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-omap2/mcbsp.c diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 552664c..84fa698 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -7,6 +7,8 @@ obj-y := irq.o id.o io.o memory.o control.o prcm.o clock.o mux.o \ devices.o serial.o gpmc.o timer-gp.o powerdomain.o \ clockdomain.o +obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o + # Functions loaded to SRAM obj-$(CONFIG_ARCH_OMAP2) += sram24xx.o diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c new file mode 100644 index 0000000..e2ee8f7 --- /dev/null +++ b/arch/arm/mach-omap2/mcbsp.c @@ -0,0 +1,105 @@ +/* + * linux/arch/arm/mach-omap2/mcbsp.c + * + * Copyright (C) 2008 Instituto Nokia de Tecnologia + * Contact: Eduardo Valentin <eduardo.valentin@indt.org.br> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Multichannel mode not supported. + */ +#include <linux/module.h> +#include <linux/init.h> +#include <linux/clk.h> +#include <linux/err.h> + +#include <asm/arch/dma.h> +#include <asm/arch/mux.h> +#include <asm/arch/cpu.h> +#include <asm/arch/mcbsp.h> + +static void omap2_mcbsp2_mux_setup(void) +{ + omap_cfg_reg(Y15_24XX_MCBSP2_CLKX); + omap_cfg_reg(R14_24XX_MCBSP2_FSX); + omap_cfg_reg(W15_24XX_MCBSP2_DR); + omap_cfg_reg(V15_24XX_MCBSP2_DX); + omap_cfg_reg(V14_24XX_GPIO117); + /* + * TODO: Need to add MUX settings for OMAP 2430 SDP + */ +} + +static void omap2_mcbsp_request(unsigned int id) +{ + if (cpu_is_omap2420() && (id == OMAP_MCBSP2)) + 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, +}; + +static struct omap_mcbsp_platform_data omap2_mcbsp_pdata[] = { +#ifdef CONFIG_ARCH_OMAP24XX + { + .virt_base = IO_ADDRESS(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, + .clocks = { "mcbsp_ick", "mcbsp_fck" }, + }, + { + .virt_base = IO_ADDRESS(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, + .clocks = { "mcbsp_ick", "mcbsp_fck" }, + }, +#endif +#ifdef CONFIG_ARCH_OMAP34XX + { + .virt_base = IO_ADDRESS(OMAP34XX_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, + .clocks = { "mcbsp_ick", "mcbsp_fck" }, + }, + { + .virt_base = IO_ADDRESS(OMAP34XX_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, + .clocks = { "mcbsp_ick", "mcbsp_fck" }, + }, +#endif +}; +#define mcbsp_count ARRAY_SIZE(omap2_mcbsp_pdata) + +int __init omap2_mcbsp_init(void) +{ + omap_mcbsp_register_board_cfg(omap2_mcbsp_pdata, mcbsp_count); + + return omap_mcbsp_init(); +} +arch_initcall(omap2_mcbsp_init); -- 1.5.5.1.67.gbdb8.dirty ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 1/4] PLAT-OMAP: MCBSP: Tranform into platform driver 2008-05-05 21:23 ` [PATCH 1/4] PLAT-OMAP: MCBSP: Tranform into platform driver Eduardo Valentin 2008-05-05 21:23 ` [PATCH 2/4] MACH-OMAP1: MCBSP: Add support for mcbsp on mach-omap1 Eduardo Valentin @ 2008-05-08 11:23 ` Trilok Soni 2008-05-08 12:13 ` Eduardo Valentin 2008-05-20 23:44 ` Tony Lindgren 2 siblings, 1 reply; 17+ messages in thread From: Trilok Soni @ 2008-05-08 11:23 UTC (permalink / raw) To: Eduardo Valentin Cc: linux-omap, Tony Lindgren, Chandra shekhar, Eduardo Valentin Hi Eduardo, On Tue, May 6, 2008 at 2:53 AM, Eduardo Valentin <edubezval@gmail.com> wrote: > From: Eduardo Valentin <eduardo.valentin@indt.org.br> > > This patch transform mcbsp code into a very initial > implementation of a platform driver. > > It also gets ride of ifdefs on mcbsp.c code. > To do it, a platform data structure was defined. > > Platform devices are located in arch/arm/plat-omap/devices.c > > Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br> > --- > arch/arm/plat-omap/devices.c | 45 +++ > arch/arm/plat-omap/mcbsp.c | 660 ++++++++++++++----------------------- > include/asm-arm/arch-omap/mcbsp.h | 73 ++++- > 3 files changed, 367 insertions(+), 411 deletions(-) > > diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c > index 099182b..b3e0147 100644 > --- a/arch/arm/plat-omap/devices.c > +++ b/arch/arm/plat-omap/devices.c > @@ -27,6 +27,7 @@ > #include <asm/arch/gpio.h> > #include <asm/arch/menelaus.h> > #include <asm/arch/dsp_common.h> > +#include <asm/arch/mcbsp.h> > > #if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE) > > @@ -150,6 +151,49 @@ static inline void omap_init_kp(void) {} > #endif > > /*-------------------------------------------------------------------------*/ > +#if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE) > + > +static struct platform_device omap_mcbsp_devices[OMAP_MAX_MCBSP_COUNT]; > +static int mcbsps_configured; > + > +void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, > + int size) > +{ > + int i; > + > + if (size > OMAP_MAX_MCBSP_COUNT) { > + printk(KERN_WARNING "Registered too many McBSPs platform_data." > + " Using maximum (%d) available.\n", > + OMAP_MAX_MCBSP_COUNT); > + size = OMAP_MAX_MCBSP_COUNT; > + } > + > + for (i = 0; i < size; i++) { > + struct platform_device *new_mcbsp = &omap_mcbsp_devices[i]; > + new_mcbsp->name = "omap-mcbsp"; > + new_mcbsp->id = i + 1; > + new_mcbsp->dev.platform_data = &config[i]; > + } > + mcbsps_configured = size; > +} > + > +static void __init omap_init_mcbsp(void) > +{ > + int i; > + > + for (i = 0; i < mcbsps_configured; i++) > + platform_device_register(&omap_mcbsp_devices[i]); > +} > +#else > +void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, > + int size) > +{ } > + > +static inline void __init omap_init_mcbsp(void) > +{ } > +#endif > + > +/*-------------------------------------------------------------------------*/ > > #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) \ > || defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) > @@ -511,6 +555,7 @@ static int __init omap_init_devices(void) > */ > omap_init_dsp(); > omap_init_kp(); > + omap_init_mcbsp(); > omap_init_mmc(); > omap_init_uwire(); > omap_init_wdt(); > diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c > index 053de31..5536223 100644 > --- a/arch/arm/plat-omap/mcbsp.c > +++ b/arch/arm/plat-omap/mcbsp.c > @@ -15,6 +15,7 @@ > #include <linux/module.h> > #include <linux/init.h> > #include <linux/device.h> > +#include <linux/platform_device.h> > #include <linux/wait.h> > #include <linux/completion.h> > #include <linux/interrupt.h> > @@ -25,83 +26,53 @@ > #include <linux/irq.h> > > #include <asm/arch/dma.h> > -#include <asm/arch/mux.h> > -#include <asm/arch/irqs.h> > -#include <asm/arch/dsp_common.h> > #include <asm/arch/mcbsp.h> > > -#ifdef CONFIG_MCBSP_DEBUG > -#define DBG(x...) printk(x) > -#else > -#define DBG(x...) do { } while (0) > -#endif > - > -struct omap_mcbsp { > - u32 io_base; > - u8 id; > - u8 free; > - omap_mcbsp_word_length rx_word_length; > - omap_mcbsp_word_length tx_word_length; > - > - omap_mcbsp_io_type_t io_type; /* IRQ or poll */ > - /* IRQ based TX/RX */ > - int rx_irq; > - int tx_irq; > - > - /* DMA stuff */ > - u8 dma_rx_sync; > - short dma_rx_lch; > - u8 dma_tx_sync; > - short dma_tx_lch; > - > - /* Completion queues */ > - struct completion tx_irq_completion; > - struct completion rx_irq_completion; > - struct completion tx_dma_completion; > - struct completion rx_dma_completion; > - > - /* Protect the field .free, while checking if the mcbsp is in use */ > - spinlock_t lock; > -}; > - > static struct omap_mcbsp mcbsp[OMAP_MAX_MCBSP_COUNT]; > -#ifdef CONFIG_ARCH_OMAP1 > -static struct clk *mcbsp_dsp_ck; > -static struct clk *mcbsp_api_ck; > -static struct clk *mcbsp_dspxor_ck; > -#endif > -#ifdef CONFIG_ARCH_OMAP2 > -static struct clk *mcbsp1_ick; > -static struct clk *mcbsp1_fck; > -static struct clk *mcbsp2_ick; > -static struct clk *mcbsp2_fck; > -#endif > + > +#define omap_mcbsp_check_valid_id(id) (mcbsp[id].pdata && \ > + mcbsp[id].pdata->ops && \ > + mcbsp[id].pdata->ops->check && \ > + (mcbsp[id].pdata->ops->check(id) == 0)) > > static void omap_mcbsp_dump_reg(u8 id) > { > - DBG("**** MCBSP%d regs ****\n", mcbsp[id].id); > - DBG("DRR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DRR2)); > - DBG("DRR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DRR1)); > - DBG("DXR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DXR2)); > - DBG("DXR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DXR1)); > - DBG("SPCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR2)); > - DBG("SPCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR1)); > - DBG("RCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, RCR2)); > - DBG("RCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, RCR1)); > - DBG("XCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, XCR2)); > - DBG("XCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, XCR1)); > - DBG("SRGR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR2)); > - DBG("SRGR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR1)); > - DBG("PCR0: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, PCR0)); > - DBG("***********************\n"); > + dev_dbg(mcbsp[id].dev, "**** McBSP%d regs ****\n", mcbsp[id].id); > + dev_dbg(mcbsp[id].dev, "DRR2: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, DRR2)); > + dev_dbg(mcbsp[id].dev, "DRR1: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, DRR1)); > + dev_dbg(mcbsp[id].dev, "DXR2: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, DXR2)); > + dev_dbg(mcbsp[id].dev, "DXR1: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, DXR1)); > + dev_dbg(mcbsp[id].dev, "SPCR2: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR2)); > + dev_dbg(mcbsp[id].dev, "SPCR1: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR1)); > + dev_dbg(mcbsp[id].dev, "RCR2: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, RCR2)); > + dev_dbg(mcbsp[id].dev, "RCR1: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, RCR1)); > + dev_dbg(mcbsp[id].dev, "XCR2: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, XCR2)); > + dev_dbg(mcbsp[id].dev, "XCR1: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, XCR1)); > + dev_dbg(mcbsp[id].dev, "SRGR2: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR2)); > + dev_dbg(mcbsp[id].dev, "SRGR1: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR1)); > + dev_dbg(mcbsp[id].dev, "PCR0: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, PCR0)); > + dev_dbg(mcbsp[id].dev, "***********************\n"); > } > > static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id) > { > struct omap_mcbsp *mcbsp_tx = dev_id; > > - DBG("TX IRQ callback : 0x%x\n", > - OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2)); > + dev_dbg(mcbsp_tx->dev, "TX IRQ callback : 0x%x\n", > + OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2)); > > complete(&mcbsp_tx->tx_irq_completion); > > @@ -112,8 +83,8 @@ static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id) > { > struct omap_mcbsp *mcbsp_rx = dev_id; > > - DBG("RX IRQ callback : 0x%x\n", > - OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2)); > + dev_dbg(mcbsp_rx->dev, "RX IRQ callback : 0x%x\n", > + OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2)); > > complete(&mcbsp_rx->rx_irq_completion); > > @@ -124,8 +95,8 @@ static void omap_mcbsp_tx_dma_callback(int lch, u16 ch_status, void *data) > { > struct omap_mcbsp *mcbsp_dma_tx = data; > > - DBG("TX DMA callback : 0x%x\n", > - OMAP_MCBSP_READ(mcbsp_dma_tx->io_base, SPCR2)); > + dev_dbg(mcbsp_dma_tx->dev, "TX DMA callback : 0x%x\n", > + OMAP_MCBSP_READ(mcbsp_dma_tx->io_base, SPCR2)); > > /* We can free the channels */ > omap_free_dma(mcbsp_dma_tx->dma_tx_lch); > @@ -138,8 +109,8 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data) > { > struct omap_mcbsp *mcbsp_dma_rx = data; > > - DBG("RX DMA callback : 0x%x\n", > - OMAP_MCBSP_READ(mcbsp_dma_rx->io_base, SPCR2)); > + dev_dbg(mcbsp_dma_rx->dev, "RX DMA callback : 0x%x\n", > + OMAP_MCBSP_READ(mcbsp_dma_rx->io_base, SPCR2)); > > /* We can free the channels */ > omap_free_dma(mcbsp_dma_rx->dma_rx_lch); > @@ -156,9 +127,16 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data) > */ > void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) > { > - u32 io_base = mcbsp[id].io_base; > + u32 io_base; > + > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return; > + } > > - DBG("OMAP-McBSP: McBSP%d io_base: 0x%8x\n", id + 1, io_base); > + io_base = mcbsp[id].io_base; > + dev_dbg(mcbsp[id].dev, "Configuring McBSP%d io_base: 0x%8x\n", > + mcbsp[id].id, io_base); > > /* We write the given config */ > OMAP_MCBSP_WRITE(io_base, SPCR2, config->spcr2); > @@ -175,97 +153,22 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) > } > EXPORT_SYMBOL(omap_mcbsp_config); > > -static int omap_mcbsp_check(unsigned int id) > -{ > - if (cpu_is_omap730()) { > - if (id > OMAP_MAX_MCBSP_COUNT - 1) { > - printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", > - id + 1); > - return -1; > - } > - return 0; > - } > - > - if (cpu_is_omap15xx() || cpu_is_omap16xx() || cpu_is_omap24xx()) { > - if (id > OMAP_MAX_MCBSP_COUNT) { > - printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", > - id + 1); > - return -1; > - } > - return 0; > - } > - > - return -1; > -} > - > -#ifdef CONFIG_ARCH_OMAP1 > -static void omap_mcbsp_dsp_request(void) > -{ > - if (cpu_is_omap15xx() || cpu_is_omap16xx()) { > - int ret; > - > - ret = omap_dsp_request_mem(); > - if (ret < 0) { > - printk(KERN_ERR "Could not get dsp memory: %i\n", ret); > - return; > - } > - > - clk_enable(mcbsp_dsp_ck); > - clk_enable(mcbsp_api_ck); > - > - /* enable 12MHz clock to mcbsp 1 & 3 */ > - clk_enable(mcbsp_dspxor_ck); > - > - /* > - * DSP external peripheral reset > - * FIXME: This should be moved to dsp code > - */ > - __raw_writew(__raw_readw(DSP_RSTCT2) | 1 | 1 << 1, > - DSP_RSTCT2); > - } > -} > - > -static void omap_mcbsp_dsp_free(void) > -{ > - if (cpu_is_omap15xx() || cpu_is_omap16xx()) { > - omap_dsp_release_mem(); > - clk_disable(mcbsp_dspxor_ck); > - clk_disable(mcbsp_dsp_ck); > - clk_disable(mcbsp_api_ck); > - } > -} > -#endif > - > -#ifdef CONFIG_ARCH_OMAP2 > -static void omap2_mcbsp2_mux_setup(void) > -{ > - if (cpu_is_omap2420()) { > - omap_cfg_reg(Y15_24XX_MCBSP2_CLKX); > - omap_cfg_reg(R14_24XX_MCBSP2_FSX); > - omap_cfg_reg(W15_24XX_MCBSP2_DR); > - omap_cfg_reg(V15_24XX_MCBSP2_DX); > - omap_cfg_reg(V14_24XX_GPIO117); > - } > - /* > - * Need to add MUX settings for OMAP 2430 SDP > - */ > -} > -#endif > - > /* > * We can choose between IRQ based or polled IO. > * This needs to be called before omap_mcbsp_request(). > */ > int omap_mcbsp_set_io_type(unsigned int id, omap_mcbsp_io_type_t io_type) > { > - if (omap_mcbsp_check(id) < 0) > - return -EINVAL; > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > + } > > spin_lock(&mcbsp[id].lock); > > if (!mcbsp[id].free) { > - printk(KERN_ERR "OMAP-McBSP: McBSP%d is currently in use\n", > - id + 1); > + dev_err(mcbsp[id].dev, "McBSP%d is currently in use\n", > + mcbsp[id].id); > spin_unlock(&mcbsp[id].lock); > return -EINVAL; > } > @@ -282,34 +185,20 @@ int omap_mcbsp_request(unsigned int id) > { > int err; > > - if (omap_mcbsp_check(id) < 0) > - return -EINVAL; > - > -#ifdef CONFIG_ARCH_OMAP1 > - /* > - * On 1510, 1610 and 1710, McBSP1 and McBSP3 > - * are DSP public peripherals. > - */ > - if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) > - omap_mcbsp_dsp_request(); > -#endif > - > -#ifdef CONFIG_ARCH_OMAP2 > - if (cpu_is_omap24xx()) { > - if (id == OMAP_MCBSP1) { > - clk_enable(mcbsp1_ick); > - clk_enable(mcbsp1_fck); > - } else { > - clk_enable(mcbsp2_ick); > - clk_enable(mcbsp2_fck); > - } > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > } > -#endif > + > + if (mcbsp[id].pdata->ops->request) > + mcbsp[id].pdata->ops->request(id); > + > + mcbsp_clk_enable(&mcbsp[id]); > > spin_lock(&mcbsp[id].lock); > if (!mcbsp[id].free) { > - printk(KERN_ERR "OMAP-McBSP: McBSP%d is currently in use\n", > - id + 1); > + dev_err(mcbsp[id].dev, "McBSP%d is currently in use\n", > + mcbsp[id].id); > spin_unlock(&mcbsp[id].lock); > return -1; > } > @@ -322,9 +211,9 @@ int omap_mcbsp_request(unsigned int id) > err = request_irq(mcbsp[id].tx_irq, omap_mcbsp_tx_irq_handler, > 0, "McBSP", (void *) (&mcbsp[id])); > if (err != 0) { > - printk(KERN_ERR "OMAP-McBSP: Unable to " > - "request TX IRQ %d for McBSP%d\n", > - mcbsp[id].tx_irq, mcbsp[id].id); > + dev_err(mcbsp[id].dev, "Unable to request TX IRQ %d " > + "for McBSP%d\n", mcbsp[id].tx_irq, > + mcbsp[id].id); > return err; > } > > @@ -333,9 +222,9 @@ int omap_mcbsp_request(unsigned int id) > err = request_irq(mcbsp[id].rx_irq, omap_mcbsp_rx_irq_handler, > 0, "McBSP", (void *) (&mcbsp[id])); > if (err != 0) { > - printk(KERN_ERR "OMAP-McBSP: Unable to " > - "request RX IRQ %d for McBSP%d\n", > - mcbsp[id].rx_irq, mcbsp[id].id); > + dev_err(mcbsp[id].dev, "Unable to request RX IRQ %d " > + "for McBSP%d\n", mcbsp[id].rx_irq, > + mcbsp[id].id); > free_irq(mcbsp[id].tx_irq, (void *) (&mcbsp[id])); > return err; > } > @@ -349,32 +238,20 @@ EXPORT_SYMBOL(omap_mcbsp_request); > > void omap_mcbsp_free(unsigned int id) > { > - if (omap_mcbsp_check(id) < 0) > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > return; > - > -#ifdef CONFIG_ARCH_OMAP1 > - if (cpu_class_is_omap1()) { > - if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) > - omap_mcbsp_dsp_free(); > } > -#endif > - > -#ifdef CONFIG_ARCH_OMAP2 > - if (cpu_is_omap24xx()) { > - if (id == OMAP_MCBSP1) { > - clk_disable(mcbsp1_ick); > - clk_disable(mcbsp1_fck); > - } else { > - clk_disable(mcbsp2_ick); > - clk_disable(mcbsp2_fck); > - } > - } > -#endif > + > + if (mcbsp[id].pdata->ops->free) > + mcbsp[id].pdata->ops->free(id); > + > + mcbsp_clk_disable(&mcbsp[id]); > > spin_lock(&mcbsp[id].lock); > if (mcbsp[id].free) { > - printk(KERN_ERR "OMAP-McBSP: McBSP%d was not reserved\n", > - id + 1); > + dev_err(mcbsp[id].dev, "McBSP%d was not reserved\n", > + mcbsp[id].id); > spin_unlock(&mcbsp[id].lock); > return; > } > @@ -400,8 +277,10 @@ void omap_mcbsp_start(unsigned int id) > u32 io_base; > u16 w; > > - if (omap_mcbsp_check(id) < 0) > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > return; > + } > > io_base = mcbsp[id].io_base; > > @@ -435,8 +314,10 @@ void omap_mcbsp_stop(unsigned int id) > u32 io_base; > u16 w; > > - if (omap_mcbsp_check(id) < 0) > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > return; > + } > > io_base = mcbsp[id].io_base; > > @@ -457,7 +338,14 @@ EXPORT_SYMBOL(omap_mcbsp_stop); > /* polled mcbsp i/o operations */ > int omap_mcbsp_pollwrite(unsigned int id, u16 buf) > { > - u32 base = mcbsp[id].io_base; > + u32 base; > + > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > + } > + > + base = mcbsp[id].io_base; > writew(buf, base + OMAP_MCBSP_REG_DXR1); > /* if frame sync error - clear the error */ > if (readw(base + OMAP_MCBSP_REG_SPCR2) & XSYNC_ERR) { > @@ -479,8 +367,8 @@ int omap_mcbsp_pollwrite(unsigned int id, u16 buf) > (XRST), > base + OMAP_MCBSP_REG_SPCR2); > udelay(10); > - printk(KERN_ERR > - " Could not write to McBSP Register\n"); > + dev_err(mcbsp[id].dev, "Could not write to" > + " McBSP%d Register\n", mcbsp[id].id); > return -2; > } > } > @@ -492,7 +380,14 @@ EXPORT_SYMBOL(omap_mcbsp_pollwrite); > > int omap_mcbsp_pollread(unsigned int id, u16 *buf) > { > - u32 base = mcbsp[id].io_base; > + u32 base; > + > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > + } > + > + base = mcbsp[id].io_base; > /* if frame sync error - clear the error */ > if (readw(base + OMAP_MCBSP_REG_SPCR1) & RSYNC_ERR) { > /* clear error */ > @@ -513,8 +408,8 @@ int omap_mcbsp_pollread(unsigned int id, u16 *buf) > (RRST), > base + OMAP_MCBSP_REG_SPCR1); > udelay(10); > - printk(KERN_ERR > - " Could not read from McBSP Register\n"); > + dev_err(mcbsp[id].dev, "Could not read from" > + " McBSP%d Register\n", mcbsp[id].id); > return -2; > } > } > @@ -531,12 +426,15 @@ EXPORT_SYMBOL(omap_mcbsp_pollread); > void omap_mcbsp_xmit_word(unsigned int id, u32 word) > { > u32 io_base; > - omap_mcbsp_word_length word_length = mcbsp[id].tx_word_length; > + omap_mcbsp_word_length word_length; > > - if (omap_mcbsp_check(id) < 0) > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > return; > + } > > io_base = mcbsp[id].io_base; > + word_length = mcbsp[id].tx_word_length; > > wait_for_completion(&(mcbsp[id].tx_irq_completion)); > > @@ -550,11 +448,14 @@ u32 omap_mcbsp_recv_word(unsigned int id) > { > u32 io_base; > u16 word_lsb, word_msb = 0; > - omap_mcbsp_word_length word_length = mcbsp[id].rx_word_length; > + omap_mcbsp_word_length word_length; > > - if (omap_mcbsp_check(id) < 0) > - return -EINVAL; > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > + } > > + word_length = mcbsp[id].rx_word_length; > io_base = mcbsp[id].io_base; > > wait_for_completion(&(mcbsp[id].rx_irq_completion)); > @@ -569,11 +470,20 @@ EXPORT_SYMBOL(omap_mcbsp_recv_word); > > int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) > { > - u32 io_base = mcbsp[id].io_base; > - omap_mcbsp_word_length tx_word_length = mcbsp[id].tx_word_length; > - omap_mcbsp_word_length rx_word_length = mcbsp[id].rx_word_length; > + u32 io_base; > + omap_mcbsp_word_length tx_word_length; > + omap_mcbsp_word_length rx_word_length; > u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0; > > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > + } > + > + io_base = mcbsp[id].io_base; > + tx_word_length = mcbsp[id].tx_word_length; > + rx_word_length = mcbsp[id].rx_word_length; > + > if (tx_word_length != rx_word_length) > return -EINVAL; > > @@ -587,7 +497,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) > udelay(10); > OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST); > udelay(10); > - printk(KERN_ERR "McBSP transmitter not ready\n"); > + dev_err(mcbsp[id].dev, "McBSP%d transmitter not " > + "ready\n", mcbsp[id].id); > return -EAGAIN; > } > } > @@ -607,7 +518,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) > udelay(10); > OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST); > udelay(10); > - printk(KERN_ERR "McBSP receiver not ready\n"); > + dev_err(mcbsp[id].dev, "McBSP%d receiver not " > + "ready\n", mcbsp[id].id); > return -EAGAIN; > } > } > @@ -623,11 +535,20 @@ EXPORT_SYMBOL(omap_mcbsp_spi_master_xmit_word_poll); > > int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) > { > - u32 io_base = mcbsp[id].io_base, clock_word = 0; > - omap_mcbsp_word_length tx_word_length = mcbsp[id].tx_word_length; > - omap_mcbsp_word_length rx_word_length = mcbsp[id].rx_word_length; > + u32 io_base, clock_word = 0; > + omap_mcbsp_word_length tx_word_length; > + omap_mcbsp_word_length rx_word_length; > u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0; > > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > + } > + > + io_base = mcbsp[id].io_base; > + tx_word_length = mcbsp[id].tx_word_length; > + rx_word_length = mcbsp[id].rx_word_length; > + > if (tx_word_length != rx_word_length) > return -EINVAL; > > @@ -641,7 +562,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) > udelay(10); > OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST); > udelay(10); > - printk(KERN_ERR "McBSP transmitter not ready\n"); > + dev_err(mcbsp[id].dev, "McBSP%d transmitter not " > + "ready\n", mcbsp[id].id); > return -EAGAIN; > } > } > @@ -661,7 +583,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) > udelay(10); > OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST); > udelay(10); > - printk(KERN_ERR "McBSP receiver not ready\n"); > + dev_err(mcbsp[id].dev, "McBSP%d receiver not " > + "ready\n", mcbsp[id].id); > return -EAGAIN; > } > } > @@ -692,20 +615,24 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer, > int dest_port = 0; > int sync_dev = 0; > > - if (omap_mcbsp_check(id) < 0) > - return -EINVAL; > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > + } > > if (omap_request_dma(mcbsp[id].dma_tx_sync, "McBSP TX", > omap_mcbsp_tx_dma_callback, > &mcbsp[id], > &dma_tx_ch)) { > - printk(KERN_ERR "OMAP-McBSP: Unable to request DMA channel for" > - " McBSP%d TX. Trying IRQ based TX\n", id + 1); > + dev_err(mcbsp[id].dev, " Unable to request DMA channel for " > + "McBSP%d TX. Trying IRQ based TX\n", > + mcbsp[id].id); > return -EAGAIN; > } > mcbsp[id].dma_tx_lch = dma_tx_ch; > > - DBG("TX DMA on channel %d\n", dma_tx_ch); > + dev_err(mcbsp[id].dev, "McBSP%d TX DMA on channel %d\n", mcbsp[id].id, > + dma_tx_ch); > > init_completion(&(mcbsp[id].tx_dma_completion)); > > @@ -713,7 +640,7 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer, > src_port = OMAP_DMA_PORT_TIPB; > dest_port = OMAP_DMA_PORT_EMIFF; > } > - if (cpu_is_omap24xx()) > + if (cpu_class_is_omap2()) > sync_dev = mcbsp[id].dma_tx_sync; > > omap_set_dma_transfer_params(mcbsp[id].dma_tx_lch, > @@ -749,20 +676,24 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer, > int dest_port = 0; > int sync_dev = 0; > > - if (omap_mcbsp_check(id) < 0) > - return -EINVAL; > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > + } > > if (omap_request_dma(mcbsp[id].dma_rx_sync, "McBSP RX", > omap_mcbsp_rx_dma_callback, > &mcbsp[id], > &dma_rx_ch)) { > - printk(KERN_ERR "Unable to request DMA channel for McBSP%d RX." > - " Trying IRQ based RX\n", id + 1); > + dev_err(mcbsp[id].dev, "Unable to request DMA channel for " > + "McBSP%d RX. Trying IRQ based RX\n", > + mcbsp[id].id); > return -EAGAIN; > } > mcbsp[id].dma_rx_lch = dma_rx_ch; > > - DBG("RX DMA on channel %d\n", dma_rx_ch); > + dev_err(mcbsp[id].dev, "McBSP%d RX DMA on channel %d\n", mcbsp[id].id, > + dma_rx_ch); > > init_completion(&(mcbsp[id].rx_dma_completion)); > > @@ -770,7 +701,7 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer, > src_port = OMAP_DMA_PORT_TIPB; > dest_port = OMAP_DMA_PORT_EMIFF; > } > - if (cpu_is_omap24xx()) > + if (cpu_class_is_omap2()) > sync_dev = mcbsp[id].dma_rx_sync; > > omap_set_dma_transfer_params(mcbsp[id].dma_rx_lch, > @@ -809,8 +740,10 @@ void omap_mcbsp_set_spi_mode(unsigned int id, > { > struct omap_mcbsp_reg_cfg mcbsp_cfg; > > - if (omap_mcbsp_check(id) < 0) > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > return; > + } > > memset(&mcbsp_cfg, 0, sizeof(struct omap_mcbsp_reg_cfg)); > > @@ -871,182 +804,91 @@ 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. > */ > -struct omap_mcbsp_info { > - u32 virt_base; > - u8 dma_rx_sync, dma_tx_sync; > - u16 rx_irq, tx_irq; > -}; > +static int __init omap_mcbsp_probe(struct platform_device *pdev) > +{ > + struct omap_mcbsp_platform_data *pdata = pdev->dev.platform_data; > + int id = pdev->id - 1; > + int ret = 0; > + int i; > > -#ifdef CONFIG_ARCH_OMAP730 > -static const struct omap_mcbsp_info mcbsp_730[] = { > - [0] = { .virt_base = io_p2v(OMAP730_MCBSP1_BASE), > - .dma_rx_sync = OMAP_DMA_MCBSP1_RX, > - .dma_tx_sync = OMAP_DMA_MCBSP1_TX, > - .rx_irq = INT_730_McBSP1RX, > - .tx_irq = INT_730_McBSP1TX }, > - [1] = { .virt_base = io_p2v(OMAP730_MCBSP2_BASE), > - .dma_rx_sync = OMAP_DMA_MCBSP3_RX, > - .dma_tx_sync = OMAP_DMA_MCBSP3_TX, > - .rx_irq = INT_730_McBSP2RX, > - .tx_irq = INT_730_McBSP2TX }, > -}; > -#endif > - > -#ifdef CONFIG_ARCH_OMAP15XX > -static const struct omap_mcbsp_info mcbsp_1510[] = { > - [0] = { .virt_base = OMAP1510_MCBSP1_BASE, > - .dma_rx_sync = OMAP_DMA_MCBSP1_RX, > - .dma_tx_sync = OMAP_DMA_MCBSP1_TX, > - .rx_irq = INT_McBSP1RX, > - .tx_irq = INT_McBSP1TX }, > - [1] = { .virt_base = io_p2v(OMAP1510_MCBSP2_BASE), > - .dma_rx_sync = OMAP_DMA_MCBSP2_RX, > - .dma_tx_sync = OMAP_DMA_MCBSP2_TX, > - .rx_irq = INT_1510_SPI_RX, > - .tx_irq = INT_1510_SPI_TX }, > - [2] = { .virt_base = OMAP1510_MCBSP3_BASE, > - .dma_rx_sync = OMAP_DMA_MCBSP3_RX, > - .dma_tx_sync = OMAP_DMA_MCBSP3_TX, > - .rx_irq = INT_McBSP3RX, > - .tx_irq = INT_McBSP3TX }, > -}; > -#endif > - > -#if defined(CONFIG_ARCH_OMAP16XX) > -static const struct omap_mcbsp_info mcbsp_1610[] = { > - [0] = { .virt_base = OMAP1610_MCBSP1_BASE, > - .dma_rx_sync = OMAP_DMA_MCBSP1_RX, > - .dma_tx_sync = OMAP_DMA_MCBSP1_TX, > - .rx_irq = INT_McBSP1RX, > - .tx_irq = INT_McBSP1TX }, > - [1] = { .virt_base = io_p2v(OMAP1610_MCBSP2_BASE), > - .dma_rx_sync = OMAP_DMA_MCBSP2_RX, > - .dma_tx_sync = OMAP_DMA_MCBSP2_TX, > - .rx_irq = INT_1610_McBSP2_RX, > - .tx_irq = INT_1610_McBSP2_TX }, > - [2] = { .virt_base = OMAP1610_MCBSP3_BASE, > - .dma_rx_sync = OMAP_DMA_MCBSP3_RX, > - .dma_tx_sync = OMAP_DMA_MCBSP3_TX, > - .rx_irq = INT_McBSP3RX, > - .tx_irq = INT_McBSP3TX }, > -}; > -#endif > - > -#if defined(CONFIG_ARCH_OMAP24XX) > -static const struct omap_mcbsp_info mcbsp_24xx[] = { > - [0] = { .virt_base = IO_ADDRESS(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, > - }, > - [1] = { .virt_base = IO_ADDRESS(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, > - }, > -}; > -#endif > + if (!pdata) { > + dev_err(&pdev->dev, "McBSP device initialized without" > + "platform data\n"); > + ret = -EINVAL; > + goto exit; > + } > > -static int __init omap_mcbsp_init(void) > + dev_dbg(&pdev->dev, "Initializing OMAP McBSP (%d).\n", pdev->id); > + > + if (id >= OMAP_MAX_MCBSP_COUNT) { > + dev_err(&pdev->dev, "Invalid McBSP device id (%d)\n", id); > + ret = -EINVAL; > + goto exit; > + } > + > + spin_lock_init(&mcbsp[id].lock); > + mcbsp[id].id = id + 1; > + mcbsp[id].free = 1; > + mcbsp[id].dma_tx_lch = -1; > + mcbsp[id].dma_rx_lch = -1; > + > + mcbsp[id].io_base = pdata->virt_base; > + /* Default I/O is IRQ based */ > + mcbsp[id].io_type = OMAP_MCBSP_IRQ_IO; > + mcbsp[id].tx_irq = pdata->tx_irq; > + mcbsp[id].rx_irq = pdata->rx_irq; > + mcbsp[id].dma_rx_sync = pdata->dma_rx_sync; > + mcbsp[id].dma_tx_sync = pdata->dma_tx_sync; > + > + mcbsp[id].nr_clocks = ARRAY_SIZE(pdata->clocks); > + for (i = 0; i < ARRAY_SIZE(pdata->clocks); i++) > + mcbsp[id].clocks[i] = clk_get(&pdev->dev, pdata->clocks[i]); > + > + mcbsp[id].pdata = pdata; > + mcbsp[id].dev = &pdev->dev; > + platform_set_drvdata(pdev, &mcbsp[id]); > + > +exit: > + return ret; > +} > + > +static int omap_mcbsp_remove(struct platform_device *pdev) > { > - int mcbsp_count = 0, i; > - static const struct omap_mcbsp_info *mcbsp_info; > + struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); > > - printk(KERN_INFO "Initializing OMAP McBSP system\n"); > + platform_set_drvdata(pdev, NULL); > + if (mcbsp) { > + int i; > > -#ifdef CONFIG_ARCH_OMAP1 > - mcbsp_dsp_ck = clk_get(0, "dsp_ck"); > - if (IS_ERR(mcbsp_dsp_ck)) { > - printk(KERN_ERR "mcbsp: could not acquire dsp_ck handle.\n"); > - return PTR_ERR(mcbsp_dsp_ck); > - } > - mcbsp_api_ck = clk_get(0, "api_ck"); > - if (IS_ERR(mcbsp_api_ck)) { > - printk(KERN_ERR "mcbsp: could not acquire api_ck handle.\n"); > - return PTR_ERR(mcbsp_api_ck); > - } > - mcbsp_dspxor_ck = clk_get(0, "dspxor_ck"); > - if (IS_ERR(mcbsp_dspxor_ck)) { > - printk(KERN_ERR "mcbsp: could not acquire dspxor_ck handle.\n"); > - return PTR_ERR(mcbsp_dspxor_ck); > - } > -#endif > -#ifdef CONFIG_ARCH_OMAP2 > - mcbsp1_ick = clk_get(0, "mcbsp1_ick"); > - if (IS_ERR(mcbsp1_ick)) { > - printk(KERN_ERR "mcbsp: could not acquire " > - "mcbsp1_ick handle.\n"); > - return PTR_ERR(mcbsp1_ick); > - } > - mcbsp1_fck = clk_get(0, "mcbsp1_fck"); > - if (IS_ERR(mcbsp1_fck)) { > - printk(KERN_ERR "mcbsp: could not acquire " > - "mcbsp1_fck handle.\n"); > - return PTR_ERR(mcbsp1_fck); > - } > - mcbsp2_ick = clk_get(0, "mcbsp2_ick"); > - if (IS_ERR(mcbsp2_ick)) { > - printk(KERN_ERR "mcbsp: could not acquire " > - "mcbsp2_ick handle.\n"); > - return PTR_ERR(mcbsp2_ick); > - } > - mcbsp2_fck = clk_get(0, "mcbsp2_fck"); > - if (IS_ERR(mcbsp2_fck)) { > - printk(KERN_ERR "mcbsp: could not acquire " > - "mcbsp2_fck handle.\n"); > - return PTR_ERR(mcbsp2_fck); > - } > -#endif > + if (mcbsp->pdata && mcbsp->pdata->ops && > + mcbsp->pdata->ops->free) > + mcbsp->pdata->ops->free(mcbsp->id); > > -#ifdef CONFIG_ARCH_OMAP730 > - if (cpu_is_omap730()) { > - mcbsp_info = mcbsp_730; > - mcbsp_count = ARRAY_SIZE(mcbsp_730); > - } > -#endif > -#ifdef CONFIG_ARCH_OMAP15XX > - if (cpu_is_omap15xx()) { > - mcbsp_info = mcbsp_1510; > - mcbsp_count = ARRAY_SIZE(mcbsp_1510); > - } > -#endif > -#if defined(CONFIG_ARCH_OMAP16XX) > - if (cpu_is_omap16xx()) { > - mcbsp_info = mcbsp_1610; > - mcbsp_count = ARRAY_SIZE(mcbsp_1610); > - } > -#endif > -#if defined(CONFIG_ARCH_OMAP24XX) > - if (cpu_is_omap24xx()) { > - mcbsp_info = mcbsp_24xx; > - mcbsp_count = ARRAY_SIZE(mcbsp_24xx); > - omap2_mcbsp2_mux_setup(); > - } > -#endif > - for (i = 0; i < OMAP_MAX_MCBSP_COUNT ; i++) { > - if (i >= mcbsp_count) { > - mcbsp[i].io_base = 0; > - mcbsp[i].free = 0; > - continue; > - } > - mcbsp[i].id = i + 1; > - mcbsp[i].free = 1; > - mcbsp[i].dma_tx_lch = -1; > - mcbsp[i].dma_rx_lch = -1; > - > - mcbsp[i].io_base = mcbsp_info[i].virt_base; > - /* Default I/O is IRQ based */ > - mcbsp[i].io_type = OMAP_MCBSP_IRQ_IO; > - mcbsp[i].tx_irq = mcbsp_info[i].tx_irq; > - mcbsp[i].rx_irq = mcbsp_info[i].rx_irq; > - mcbsp[i].dma_rx_sync = mcbsp_info[i].dma_rx_sync; > - mcbsp[i].dma_tx_sync = mcbsp_info[i].dma_tx_sync; > - spin_lock_init(&mcbsp[i].lock); > + mcbsp_clk_disable(mcbsp); > + mcbsp_clk_put(mcbsp); > + > + for (i = 0; i < mcbsp->nr_clocks; i++) > + mcbsp->clocks[i] = NULL; > + > + mcbsp->free = 0; > + mcbsp->dev = NULL; > } > > return 0; > } > > -arch_initcall(omap_mcbsp_init); > +static struct platform_driver omap_mcbsp_driver = { > + .probe = omap_mcbsp_probe, > + .remove = omap_mcbsp_remove, > + .driver = { > + .name = "omap-mcbsp", > + }, > +}; > + > +int __init omap_mcbsp_init(void) > +{ > + /* Register the McBSP driver */ > + return platform_driver_register(&omap_mcbsp_driver); > +} I hope that we are targeting this to build and installed as module? In that case we need usual module_init/exit stuff. > + > + > diff --git a/include/asm-arm/arch-omap/mcbsp.h b/include/asm-arm/arch-omap/mcbsp.h > index b53c3b2..aa47421 100644 > --- a/include/asm-arm/arch-omap/mcbsp.h > +++ b/include/asm-arm/arch-omap/mcbsp.h > @@ -24,7 +24,11 @@ > #ifndef __ASM_ARCH_OMAP_MCBSP_H > #define __ASM_ARCH_OMAP_MCBSP_H > > +#include <linux/completion.h> > +#include <linux/spinlock.h> > + > #include <asm/hardware.h> > +#include <asm/arch/clock.h> > > #define OMAP730_MCBSP1_BASE 0xfffb1000 > #define OMAP730_MCBSP2_BASE 0xfffb1800 > @@ -40,6 +44,9 @@ > #define OMAP24XX_MCBSP1_BASE 0x48074000 > #define OMAP24XX_MCBSP2_BASE 0x48076000 > > +#define OMAP34XX_MCBSP1_BASE 0x48074000 > +#define OMAP34XX_MCBSP2_BASE 0x49022000 > + > #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730) > > #define OMAP_MCBSP_REG_DRR2 0x00 > @@ -74,7 +81,8 @@ > #define OMAP_MCBSP_REG_XCERG 0x3A > #define OMAP_MCBSP_REG_XCERH 0x3C > > -#define OMAP_MAX_MCBSP_COUNT 3 > +#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) > @@ -117,7 +125,8 @@ > #define OMAP_MCBSP_REG_XCERG 0x74 > #define OMAP_MCBSP_REG_XCERH 0x78 > > -#define OMAP_MAX_MCBSP_COUNT 2 > +#define OMAP_MAX_MCBSP_COUNT 2 > +#define MAX_MCBSP_CLOCKS 2 > > #define AUDIO_MCBSP_DATAWRITE (OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR1) > #define AUDIO_MCBSP_DATAREAD (OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR1) > @@ -298,6 +307,66 @@ struct omap_mcbsp_spi_cfg { > omap_mcbsp_word_length word_length; > }; > > +/* Platform specific configuration */ > +struct omap_mcbsp_ops { > + void (*request)(unsigned int); > + void (*free)(unsigned int); > + int (*check)(unsigned int); > +}; > + > +struct omap_mcbsp_platform_data { > + u32 virt_base; > + u8 dma_rx_sync, dma_tx_sync; > + u16 rx_irq, tx_irq; > + struct omap_mcbsp_ops *ops; > + char const *clocks[MAX_MCBSP_CLOCKS]; > +}; > + > +struct omap_mcbsp { > + struct device *dev; > + u32 io_base; > + u8 id; > + u8 free; > + omap_mcbsp_word_length rx_word_length; > + omap_mcbsp_word_length tx_word_length; > + > + omap_mcbsp_io_type_t io_type; /* IRQ or poll */ > + /* IRQ based TX/RX */ > + int rx_irq; > + int tx_irq; > + > + /* DMA stuff */ > + u8 dma_rx_sync; > + short dma_rx_lch; > + u8 dma_tx_sync; > + short dma_tx_lch; > + > + /* Completion queues */ > + struct completion tx_irq_completion; > + struct completion rx_irq_completion; > + struct completion tx_dma_completion; > + struct completion rx_dma_completion; > + > + /* Protect the field .free, while checking if the mcbsp is in use */ > + spinlock_t lock; > + struct omap_mcbsp_platform_data *pdata; > + int nr_clocks; > + struct clk *clocks[MAX_MCBSP_CLOCKS]; > +}; > + > +#define __mcbsp_clk_op(mcbsp, op) \ > + do { \ > + int i; \ > + for (i = 0; i < mcbsp->nr_clocks; i++) \ > + clk_##op(mcbsp->clocks[i]); \ > + } while (0) > +#define mcbsp_clk_enable(mcbsp) __mcbsp_clk_op((mcbsp), enable) > +#define mcbsp_clk_disable(mcbsp) __mcbsp_clk_op((mcbsp), disable) > +#define mcbsp_clk_put(mcbsp) __mcbsp_clk_op((mcbsp), put) > + > +int omap_mcbsp_init(void); Do we need to add omap_mcbsp_init here? > +void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, > + int size); > void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config); > int omap_mcbsp_request(unsigned int id); > void omap_mcbsp_free(unsigned int id); > -- > 1.5.5.1.67.gbdb8.dirty > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- ---Trilok Soni http://triloksoni.wordpress.com ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 1/4] PLAT-OMAP: MCBSP: Tranform into platform driver 2008-05-08 11:23 ` [PATCH 1/4] PLAT-OMAP: MCBSP: Tranform into platform driver Trilok Soni @ 2008-05-08 12:13 ` Eduardo Valentin 0 siblings, 0 replies; 17+ messages in thread From: Eduardo Valentin @ 2008-05-08 12:13 UTC (permalink / raw) To: Trilok Soni; +Cc: linux-omap, Tony Lindgren, Chandra shekhar, Eduardo Valentin Hi Trilok, Thanks for your comments, On Thu, May 8, 2008 at 2:23 PM, Trilok Soni <soni.trilok@gmail.com> wrote: > Hi Eduardo, > > > > On Tue, May 6, 2008 at 2:53 AM, Eduardo Valentin <edubezval@gmail.com> wrote: > > From: Eduardo Valentin <eduardo.valentin@indt.org.br> > > > > This patch transform mcbsp code into a very initial > > implementation of a platform driver. > > > > It also gets ride of ifdefs on mcbsp.c code. > > To do it, a platform data structure was defined. > > > > Platform devices are located in arch/arm/plat-omap/devices.c > > > > Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br> > > --- > > arch/arm/plat-omap/devices.c | 45 +++ > > arch/arm/plat-omap/mcbsp.c | 660 ++++++++++++++----------------------- > > include/asm-arm/arch-omap/mcbsp.h | 73 ++++- > > 3 files changed, 367 insertions(+), 411 deletions(-) > > > > diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c > > index 099182b..b3e0147 100644 > > --- a/arch/arm/plat-omap/devices.c > > +++ b/arch/arm/plat-omap/devices.c > > @@ -27,6 +27,7 @@ > > #include <asm/arch/gpio.h> > > #include <asm/arch/menelaus.h> > > #include <asm/arch/dsp_common.h> > > +#include <asm/arch/mcbsp.h> > > > > #if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE) > > > > @@ -150,6 +151,49 @@ static inline void omap_init_kp(void) {} > > #endif > > > > /*-------------------------------------------------------------------------*/ > > +#if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE) > > + > > +static struct platform_device omap_mcbsp_devices[OMAP_MAX_MCBSP_COUNT]; > > +static int mcbsps_configured; > > + > > +void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, > > + int size) > > +{ > > + int i; > > + > > + if (size > OMAP_MAX_MCBSP_COUNT) { > > + printk(KERN_WARNING "Registered too many McBSPs platform_data." > > + " Using maximum (%d) available.\n", > > + OMAP_MAX_MCBSP_COUNT); > > + size = OMAP_MAX_MCBSP_COUNT; > > + } > > + > > + for (i = 0; i < size; i++) { > > + struct platform_device *new_mcbsp = &omap_mcbsp_devices[i]; > > + new_mcbsp->name = "omap-mcbsp"; > > + new_mcbsp->id = i + 1; > > + new_mcbsp->dev.platform_data = &config[i]; > > + } > > + mcbsps_configured = size; > > +} > > + > > +static void __init omap_init_mcbsp(void) > > +{ > > + int i; > > + > > + for (i = 0; i < mcbsps_configured; i++) > > + platform_device_register(&omap_mcbsp_devices[i]); > > +} > > +#else > > +void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, > > + int size) > > +{ } > > + > > +static inline void __init omap_init_mcbsp(void) > > +{ } > > +#endif > > + > > +/*-------------------------------------------------------------------------*/ > > > > #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) \ > > || defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) > > @@ -511,6 +555,7 @@ static int __init omap_init_devices(void) > > */ > > omap_init_dsp(); > > omap_init_kp(); > > + omap_init_mcbsp(); > > omap_init_mmc(); > > omap_init_uwire(); > > omap_init_wdt(); > > diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c > > index 053de31..5536223 100644 > > --- a/arch/arm/plat-omap/mcbsp.c > > +++ b/arch/arm/plat-omap/mcbsp.c > > @@ -15,6 +15,7 @@ > > #include <linux/module.h> > > #include <linux/init.h> > > #include <linux/device.h> > > +#include <linux/platform_device.h> > > #include <linux/wait.h> > > #include <linux/completion.h> > > #include <linux/interrupt.h> > > @@ -25,83 +26,53 @@ > > #include <linux/irq.h> > > > > #include <asm/arch/dma.h> > > -#include <asm/arch/mux.h> > > -#include <asm/arch/irqs.h> > > -#include <asm/arch/dsp_common.h> > > #include <asm/arch/mcbsp.h> > > > > -#ifdef CONFIG_MCBSP_DEBUG > > -#define DBG(x...) printk(x) > > -#else > > -#define DBG(x...) do { } while (0) > > -#endif > > - > > -struct omap_mcbsp { > > - u32 io_base; > > - u8 id; > > - u8 free; > > - omap_mcbsp_word_length rx_word_length; > > - omap_mcbsp_word_length tx_word_length; > > - > > - omap_mcbsp_io_type_t io_type; /* IRQ or poll */ > > - /* IRQ based TX/RX */ > > - int rx_irq; > > - int tx_irq; > > - > > - /* DMA stuff */ > > - u8 dma_rx_sync; > > - short dma_rx_lch; > > - u8 dma_tx_sync; > > - short dma_tx_lch; > > - > > - /* Completion queues */ > > - struct completion tx_irq_completion; > > - struct completion rx_irq_completion; > > - struct completion tx_dma_completion; > > - struct completion rx_dma_completion; > > - > > - /* Protect the field .free, while checking if the mcbsp is in use */ > > - spinlock_t lock; > > -}; > > - > > static struct omap_mcbsp mcbsp[OMAP_MAX_MCBSP_COUNT]; > > -#ifdef CONFIG_ARCH_OMAP1 > > -static struct clk *mcbsp_dsp_ck; > > -static struct clk *mcbsp_api_ck; > > -static struct clk *mcbsp_dspxor_ck; > > -#endif > > -#ifdef CONFIG_ARCH_OMAP2 > > -static struct clk *mcbsp1_ick; > > -static struct clk *mcbsp1_fck; > > -static struct clk *mcbsp2_ick; > > -static struct clk *mcbsp2_fck; > > -#endif > > + > > +#define omap_mcbsp_check_valid_id(id) (mcbsp[id].pdata && \ > > + mcbsp[id].pdata->ops && \ > > + mcbsp[id].pdata->ops->check && \ > > + (mcbsp[id].pdata->ops->check(id) == 0)) > > > > static void omap_mcbsp_dump_reg(u8 id) > > { > > - DBG("**** MCBSP%d regs ****\n", mcbsp[id].id); > > - DBG("DRR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DRR2)); > > - DBG("DRR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DRR1)); > > - DBG("DXR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DXR2)); > > - DBG("DXR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DXR1)); > > - DBG("SPCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR2)); > > - DBG("SPCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR1)); > > - DBG("RCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, RCR2)); > > - DBG("RCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, RCR1)); > > - DBG("XCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, XCR2)); > > - DBG("XCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, XCR1)); > > - DBG("SRGR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR2)); > > - DBG("SRGR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR1)); > > - DBG("PCR0: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, PCR0)); > > - DBG("***********************\n"); > > + dev_dbg(mcbsp[id].dev, "**** McBSP%d regs ****\n", mcbsp[id].id); > > + dev_dbg(mcbsp[id].dev, "DRR2: 0x%04x\n", > > + OMAP_MCBSP_READ(mcbsp[id].io_base, DRR2)); > > + dev_dbg(mcbsp[id].dev, "DRR1: 0x%04x\n", > > + OMAP_MCBSP_READ(mcbsp[id].io_base, DRR1)); > > + dev_dbg(mcbsp[id].dev, "DXR2: 0x%04x\n", > > + OMAP_MCBSP_READ(mcbsp[id].io_base, DXR2)); > > + dev_dbg(mcbsp[id].dev, "DXR1: 0x%04x\n", > > + OMAP_MCBSP_READ(mcbsp[id].io_base, DXR1)); > > + dev_dbg(mcbsp[id].dev, "SPCR2: 0x%04x\n", > > + OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR2)); > > + dev_dbg(mcbsp[id].dev, "SPCR1: 0x%04x\n", > > + OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR1)); > > + dev_dbg(mcbsp[id].dev, "RCR2: 0x%04x\n", > > + OMAP_MCBSP_READ(mcbsp[id].io_base, RCR2)); > > + dev_dbg(mcbsp[id].dev, "RCR1: 0x%04x\n", > > + OMAP_MCBSP_READ(mcbsp[id].io_base, RCR1)); > > + dev_dbg(mcbsp[id].dev, "XCR2: 0x%04x\n", > > + OMAP_MCBSP_READ(mcbsp[id].io_base, XCR2)); > > + dev_dbg(mcbsp[id].dev, "XCR1: 0x%04x\n", > > + OMAP_MCBSP_READ(mcbsp[id].io_base, XCR1)); > > + dev_dbg(mcbsp[id].dev, "SRGR2: 0x%04x\n", > > + OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR2)); > > + dev_dbg(mcbsp[id].dev, "SRGR1: 0x%04x\n", > > + OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR1)); > > + dev_dbg(mcbsp[id].dev, "PCR0: 0x%04x\n", > > + OMAP_MCBSP_READ(mcbsp[id].io_base, PCR0)); > > + dev_dbg(mcbsp[id].dev, "***********************\n"); > > } > > > > static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id) > > { > > struct omap_mcbsp *mcbsp_tx = dev_id; > > > > - DBG("TX IRQ callback : 0x%x\n", > > - OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2)); > > + dev_dbg(mcbsp_tx->dev, "TX IRQ callback : 0x%x\n", > > + OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2)); > > > > complete(&mcbsp_tx->tx_irq_completion); > > > > @@ -112,8 +83,8 @@ static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id) > > { > > struct omap_mcbsp *mcbsp_rx = dev_id; > > > > - DBG("RX IRQ callback : 0x%x\n", > > - OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2)); > > + dev_dbg(mcbsp_rx->dev, "RX IRQ callback : 0x%x\n", > > + OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2)); > > > > complete(&mcbsp_rx->rx_irq_completion); > > > > @@ -124,8 +95,8 @@ static void omap_mcbsp_tx_dma_callback(int lch, u16 ch_status, void *data) > > { > > struct omap_mcbsp *mcbsp_dma_tx = data; > > > > - DBG("TX DMA callback : 0x%x\n", > > - OMAP_MCBSP_READ(mcbsp_dma_tx->io_base, SPCR2)); > > + dev_dbg(mcbsp_dma_tx->dev, "TX DMA callback : 0x%x\n", > > + OMAP_MCBSP_READ(mcbsp_dma_tx->io_base, SPCR2)); > > > > /* We can free the channels */ > > omap_free_dma(mcbsp_dma_tx->dma_tx_lch); > > @@ -138,8 +109,8 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data) > > { > > struct omap_mcbsp *mcbsp_dma_rx = data; > > > > - DBG("RX DMA callback : 0x%x\n", > > - OMAP_MCBSP_READ(mcbsp_dma_rx->io_base, SPCR2)); > > + dev_dbg(mcbsp_dma_rx->dev, "RX DMA callback : 0x%x\n", > > + OMAP_MCBSP_READ(mcbsp_dma_rx->io_base, SPCR2)); > > > > /* We can free the channels */ > > omap_free_dma(mcbsp_dma_rx->dma_rx_lch); > > @@ -156,9 +127,16 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data) > > */ > > void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) > > { > > - u32 io_base = mcbsp[id].io_base; > > + u32 io_base; > > + > > + if (!omap_mcbsp_check_valid_id(id)) { > > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > + return; > > + } > > > > - DBG("OMAP-McBSP: McBSP%d io_base: 0x%8x\n", id + 1, io_base); > > + io_base = mcbsp[id].io_base; > > + dev_dbg(mcbsp[id].dev, "Configuring McBSP%d io_base: 0x%8x\n", > > + mcbsp[id].id, io_base); > > > > /* We write the given config */ > > OMAP_MCBSP_WRITE(io_base, SPCR2, config->spcr2); > > @@ -175,97 +153,22 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) > > } > > EXPORT_SYMBOL(omap_mcbsp_config); > > > > -static int omap_mcbsp_check(unsigned int id) > > -{ > > - if (cpu_is_omap730()) { > > - if (id > OMAP_MAX_MCBSP_COUNT - 1) { > > - printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", > > - id + 1); > > - return -1; > > - } > > - return 0; > > - } > > - > > - if (cpu_is_omap15xx() || cpu_is_omap16xx() || cpu_is_omap24xx()) { > > - if (id > OMAP_MAX_MCBSP_COUNT) { > > - printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", > > - id + 1); > > - return -1; > > - } > > - return 0; > > - } > > - > > - return -1; > > -} > > - > > -#ifdef CONFIG_ARCH_OMAP1 > > -static void omap_mcbsp_dsp_request(void) > > -{ > > - if (cpu_is_omap15xx() || cpu_is_omap16xx()) { > > - int ret; > > - > > - ret = omap_dsp_request_mem(); > > - if (ret < 0) { > > - printk(KERN_ERR "Could not get dsp memory: %i\n", ret); > > - return; > > - } > > - > > - clk_enable(mcbsp_dsp_ck); > > - clk_enable(mcbsp_api_ck); > > - > > - /* enable 12MHz clock to mcbsp 1 & 3 */ > > - clk_enable(mcbsp_dspxor_ck); > > - > > - /* > > - * DSP external peripheral reset > > - * FIXME: This should be moved to dsp code > > - */ > > - __raw_writew(__raw_readw(DSP_RSTCT2) | 1 | 1 << 1, > > - DSP_RSTCT2); > > - } > > -} > > - > > -static void omap_mcbsp_dsp_free(void) > > -{ > > - if (cpu_is_omap15xx() || cpu_is_omap16xx()) { > > - omap_dsp_release_mem(); > > - clk_disable(mcbsp_dspxor_ck); > > - clk_disable(mcbsp_dsp_ck); > > - clk_disable(mcbsp_api_ck); > > - } > > -} > > -#endif > > - > > -#ifdef CONFIG_ARCH_OMAP2 > > -static void omap2_mcbsp2_mux_setup(void) > > -{ > > - if (cpu_is_omap2420()) { > > - omap_cfg_reg(Y15_24XX_MCBSP2_CLKX); > > - omap_cfg_reg(R14_24XX_MCBSP2_FSX); > > - omap_cfg_reg(W15_24XX_MCBSP2_DR); > > - omap_cfg_reg(V15_24XX_MCBSP2_DX); > > - omap_cfg_reg(V14_24XX_GPIO117); > > - } > > - /* > > - * Need to add MUX settings for OMAP 2430 SDP > > - */ > > -} > > -#endif > > - > > /* > > * We can choose between IRQ based or polled IO. > > * This needs to be called before omap_mcbsp_request(). > > */ > > int omap_mcbsp_set_io_type(unsigned int id, omap_mcbsp_io_type_t io_type) > > { > > - if (omap_mcbsp_check(id) < 0) > > - return -EINVAL; > > + if (!omap_mcbsp_check_valid_id(id)) { > > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > + return -ENODEV; > > + } > > > > spin_lock(&mcbsp[id].lock); > > > > if (!mcbsp[id].free) { > > - printk(KERN_ERR "OMAP-McBSP: McBSP%d is currently in use\n", > > - id + 1); > > + dev_err(mcbsp[id].dev, "McBSP%d is currently in use\n", > > + mcbsp[id].id); > > spin_unlock(&mcbsp[id].lock); > > return -EINVAL; > > } > > @@ -282,34 +185,20 @@ int omap_mcbsp_request(unsigned int id) > > { > > int err; > > > > - if (omap_mcbsp_check(id) < 0) > > - return -EINVAL; > > - > > -#ifdef CONFIG_ARCH_OMAP1 > > - /* > > - * On 1510, 1610 and 1710, McBSP1 and McBSP3 > > - * are DSP public peripherals. > > - */ > > - if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) > > - omap_mcbsp_dsp_request(); > > -#endif > > - > > -#ifdef CONFIG_ARCH_OMAP2 > > - if (cpu_is_omap24xx()) { > > - if (id == OMAP_MCBSP1) { > > - clk_enable(mcbsp1_ick); > > - clk_enable(mcbsp1_fck); > > - } else { > > - clk_enable(mcbsp2_ick); > > - clk_enable(mcbsp2_fck); > > - } > > + if (!omap_mcbsp_check_valid_id(id)) { > > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > + return -ENODEV; > > } > > -#endif > > + > > + if (mcbsp[id].pdata->ops->request) > > + mcbsp[id].pdata->ops->request(id); > > + > > + mcbsp_clk_enable(&mcbsp[id]); > > > > spin_lock(&mcbsp[id].lock); > > if (!mcbsp[id].free) { > > - printk(KERN_ERR "OMAP-McBSP: McBSP%d is currently in use\n", > > - id + 1); > > + dev_err(mcbsp[id].dev, "McBSP%d is currently in use\n", > > + mcbsp[id].id); > > spin_unlock(&mcbsp[id].lock); > > return -1; > > } > > @@ -322,9 +211,9 @@ int omap_mcbsp_request(unsigned int id) > > err = request_irq(mcbsp[id].tx_irq, omap_mcbsp_tx_irq_handler, > > 0, "McBSP", (void *) (&mcbsp[id])); > > if (err != 0) { > > - printk(KERN_ERR "OMAP-McBSP: Unable to " > > - "request TX IRQ %d for McBSP%d\n", > > - mcbsp[id].tx_irq, mcbsp[id].id); > > + dev_err(mcbsp[id].dev, "Unable to request TX IRQ %d " > > + "for McBSP%d\n", mcbsp[id].tx_irq, > > + mcbsp[id].id); > > return err; > > } > > > > @@ -333,9 +222,9 @@ int omap_mcbsp_request(unsigned int id) > > err = request_irq(mcbsp[id].rx_irq, omap_mcbsp_rx_irq_handler, > > 0, "McBSP", (void *) (&mcbsp[id])); > > if (err != 0) { > > - printk(KERN_ERR "OMAP-McBSP: Unable to " > > - "request RX IRQ %d for McBSP%d\n", > > - mcbsp[id].rx_irq, mcbsp[id].id); > > + dev_err(mcbsp[id].dev, "Unable to request RX IRQ %d " > > + "for McBSP%d\n", mcbsp[id].rx_irq, > > + mcbsp[id].id); > > free_irq(mcbsp[id].tx_irq, (void *) (&mcbsp[id])); > > return err; > > } > > @@ -349,32 +238,20 @@ EXPORT_SYMBOL(omap_mcbsp_request); > > > > void omap_mcbsp_free(unsigned int id) > > { > > - if (omap_mcbsp_check(id) < 0) > > + if (!omap_mcbsp_check_valid_id(id)) { > > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > return; > > - > > -#ifdef CONFIG_ARCH_OMAP1 > > - if (cpu_class_is_omap1()) { > > - if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) > > - omap_mcbsp_dsp_free(); > > } > > -#endif > > - > > -#ifdef CONFIG_ARCH_OMAP2 > > - if (cpu_is_omap24xx()) { > > - if (id == OMAP_MCBSP1) { > > - clk_disable(mcbsp1_ick); > > - clk_disable(mcbsp1_fck); > > - } else { > > - clk_disable(mcbsp2_ick); > > - clk_disable(mcbsp2_fck); > > - } > > - } > > -#endif > > + > > + if (mcbsp[id].pdata->ops->free) > > + mcbsp[id].pdata->ops->free(id); > > + > > + mcbsp_clk_disable(&mcbsp[id]); > > > > spin_lock(&mcbsp[id].lock); > > if (mcbsp[id].free) { > > - printk(KERN_ERR "OMAP-McBSP: McBSP%d was not reserved\n", > > - id + 1); > > + dev_err(mcbsp[id].dev, "McBSP%d was not reserved\n", > > + mcbsp[id].id); > > spin_unlock(&mcbsp[id].lock); > > return; > > } > > @@ -400,8 +277,10 @@ void omap_mcbsp_start(unsigned int id) > > u32 io_base; > > u16 w; > > > > - if (omap_mcbsp_check(id) < 0) > > + if (!omap_mcbsp_check_valid_id(id)) { > > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > return; > > + } > > > > io_base = mcbsp[id].io_base; > > > > @@ -435,8 +314,10 @@ void omap_mcbsp_stop(unsigned int id) > > u32 io_base; > > u16 w; > > > > - if (omap_mcbsp_check(id) < 0) > > + if (!omap_mcbsp_check_valid_id(id)) { > > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > return; > > + } > > > > io_base = mcbsp[id].io_base; > > > > @@ -457,7 +338,14 @@ EXPORT_SYMBOL(omap_mcbsp_stop); > > /* polled mcbsp i/o operations */ > > int omap_mcbsp_pollwrite(unsigned int id, u16 buf) > > { > > - u32 base = mcbsp[id].io_base; > > + u32 base; > > + > > + if (!omap_mcbsp_check_valid_id(id)) { > > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > + return -ENODEV; > > + } > > + > > + base = mcbsp[id].io_base; > > writew(buf, base + OMAP_MCBSP_REG_DXR1); > > /* if frame sync error - clear the error */ > > if (readw(base + OMAP_MCBSP_REG_SPCR2) & XSYNC_ERR) { > > @@ -479,8 +367,8 @@ int omap_mcbsp_pollwrite(unsigned int id, u16 buf) > > (XRST), > > base + OMAP_MCBSP_REG_SPCR2); > > udelay(10); > > - printk(KERN_ERR > > - " Could not write to McBSP Register\n"); > > + dev_err(mcbsp[id].dev, "Could not write to" > > + " McBSP%d Register\n", mcbsp[id].id); > > return -2; > > } > > } > > @@ -492,7 +380,14 @@ EXPORT_SYMBOL(omap_mcbsp_pollwrite); > > > > int omap_mcbsp_pollread(unsigned int id, u16 *buf) > > { > > - u32 base = mcbsp[id].io_base; > > + u32 base; > > + > > + if (!omap_mcbsp_check_valid_id(id)) { > > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > + return -ENODEV; > > + } > > + > > + base = mcbsp[id].io_base; > > /* if frame sync error - clear the error */ > > if (readw(base + OMAP_MCBSP_REG_SPCR1) & RSYNC_ERR) { > > /* clear error */ > > @@ -513,8 +408,8 @@ int omap_mcbsp_pollread(unsigned int id, u16 *buf) > > (RRST), > > base + OMAP_MCBSP_REG_SPCR1); > > udelay(10); > > - printk(KERN_ERR > > - " Could not read from McBSP Register\n"); > > + dev_err(mcbsp[id].dev, "Could not read from" > > + " McBSP%d Register\n", mcbsp[id].id); > > return -2; > > } > > } > > @@ -531,12 +426,15 @@ EXPORT_SYMBOL(omap_mcbsp_pollread); > > void omap_mcbsp_xmit_word(unsigned int id, u32 word) > > { > > u32 io_base; > > - omap_mcbsp_word_length word_length = mcbsp[id].tx_word_length; > > + omap_mcbsp_word_length word_length; > > > > - if (omap_mcbsp_check(id) < 0) > > + if (!omap_mcbsp_check_valid_id(id)) { > > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > return; > > + } > > > > io_base = mcbsp[id].io_base; > > + word_length = mcbsp[id].tx_word_length; > > > > wait_for_completion(&(mcbsp[id].tx_irq_completion)); > > > > @@ -550,11 +448,14 @@ u32 omap_mcbsp_recv_word(unsigned int id) > > { > > u32 io_base; > > u16 word_lsb, word_msb = 0; > > - omap_mcbsp_word_length word_length = mcbsp[id].rx_word_length; > > + omap_mcbsp_word_length word_length; > > > > - if (omap_mcbsp_check(id) < 0) > > - return -EINVAL; > > + if (!omap_mcbsp_check_valid_id(id)) { > > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > + return -ENODEV; > > + } > > > > + word_length = mcbsp[id].rx_word_length; > > io_base = mcbsp[id].io_base; > > > > wait_for_completion(&(mcbsp[id].rx_irq_completion)); > > @@ -569,11 +470,20 @@ EXPORT_SYMBOL(omap_mcbsp_recv_word); > > > > int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) > > { > > - u32 io_base = mcbsp[id].io_base; > > - omap_mcbsp_word_length tx_word_length = mcbsp[id].tx_word_length; > > - omap_mcbsp_word_length rx_word_length = mcbsp[id].rx_word_length; > > + u32 io_base; > > + omap_mcbsp_word_length tx_word_length; > > + omap_mcbsp_word_length rx_word_length; > > u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0; > > > > + if (!omap_mcbsp_check_valid_id(id)) { > > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > + return -ENODEV; > > + } > > + > > + io_base = mcbsp[id].io_base; > > + tx_word_length = mcbsp[id].tx_word_length; > > + rx_word_length = mcbsp[id].rx_word_length; > > + > > if (tx_word_length != rx_word_length) > > return -EINVAL; > > > > @@ -587,7 +497,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) > > udelay(10); > > OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST); > > udelay(10); > > - printk(KERN_ERR "McBSP transmitter not ready\n"); > > + dev_err(mcbsp[id].dev, "McBSP%d transmitter not " > > + "ready\n", mcbsp[id].id); > > return -EAGAIN; > > } > > } > > @@ -607,7 +518,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) > > udelay(10); > > OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST); > > udelay(10); > > - printk(KERN_ERR "McBSP receiver not ready\n"); > > + dev_err(mcbsp[id].dev, "McBSP%d receiver not " > > + "ready\n", mcbsp[id].id); > > return -EAGAIN; > > } > > } > > @@ -623,11 +535,20 @@ EXPORT_SYMBOL(omap_mcbsp_spi_master_xmit_word_poll); > > > > int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) > > { > > - u32 io_base = mcbsp[id].io_base, clock_word = 0; > > - omap_mcbsp_word_length tx_word_length = mcbsp[id].tx_word_length; > > - omap_mcbsp_word_length rx_word_length = mcbsp[id].rx_word_length; > > + u32 io_base, clock_word = 0; > > + omap_mcbsp_word_length tx_word_length; > > + omap_mcbsp_word_length rx_word_length; > > u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0; > > > > + if (!omap_mcbsp_check_valid_id(id)) { > > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > + return -ENODEV; > > + } > > + > > + io_base = mcbsp[id].io_base; > > + tx_word_length = mcbsp[id].tx_word_length; > > + rx_word_length = mcbsp[id].rx_word_length; > > + > > if (tx_word_length != rx_word_length) > > return -EINVAL; > > > > @@ -641,7 +562,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) > > udelay(10); > > OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST); > > udelay(10); > > - printk(KERN_ERR "McBSP transmitter not ready\n"); > > + dev_err(mcbsp[id].dev, "McBSP%d transmitter not " > > + "ready\n", mcbsp[id].id); > > return -EAGAIN; > > } > > } > > @@ -661,7 +583,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) > > udelay(10); > > OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST); > > udelay(10); > > - printk(KERN_ERR "McBSP receiver not ready\n"); > > + dev_err(mcbsp[id].dev, "McBSP%d receiver not " > > + "ready\n", mcbsp[id].id); > > return -EAGAIN; > > } > > } > > @@ -692,20 +615,24 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer, > > int dest_port = 0; > > int sync_dev = 0; > > > > - if (omap_mcbsp_check(id) < 0) > > - return -EINVAL; > > + if (!omap_mcbsp_check_valid_id(id)) { > > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > + return -ENODEV; > > + } > > > > if (omap_request_dma(mcbsp[id].dma_tx_sync, "McBSP TX", > > omap_mcbsp_tx_dma_callback, > > &mcbsp[id], > > &dma_tx_ch)) { > > - printk(KERN_ERR "OMAP-McBSP: Unable to request DMA channel for" > > - " McBSP%d TX. Trying IRQ based TX\n", id + 1); > > + dev_err(mcbsp[id].dev, " Unable to request DMA channel for " > > + "McBSP%d TX. Trying IRQ based TX\n", > > + mcbsp[id].id); > > return -EAGAIN; > > } > > mcbsp[id].dma_tx_lch = dma_tx_ch; > > > > - DBG("TX DMA on channel %d\n", dma_tx_ch); > > + dev_err(mcbsp[id].dev, "McBSP%d TX DMA on channel %d\n", mcbsp[id].id, > > + dma_tx_ch); > > > > init_completion(&(mcbsp[id].tx_dma_completion)); > > > > @@ -713,7 +640,7 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer, > > src_port = OMAP_DMA_PORT_TIPB; > > dest_port = OMAP_DMA_PORT_EMIFF; > > } > > - if (cpu_is_omap24xx()) > > + if (cpu_class_is_omap2()) > > sync_dev = mcbsp[id].dma_tx_sync; > > > > omap_set_dma_transfer_params(mcbsp[id].dma_tx_lch, > > @@ -749,20 +676,24 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer, > > int dest_port = 0; > > int sync_dev = 0; > > > > - if (omap_mcbsp_check(id) < 0) > > - return -EINVAL; > > + if (!omap_mcbsp_check_valid_id(id)) { > > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > + return -ENODEV; > > + } > > > > if (omap_request_dma(mcbsp[id].dma_rx_sync, "McBSP RX", > > omap_mcbsp_rx_dma_callback, > > &mcbsp[id], > > &dma_rx_ch)) { > > - printk(KERN_ERR "Unable to request DMA channel for McBSP%d RX." > > - " Trying IRQ based RX\n", id + 1); > > + dev_err(mcbsp[id].dev, "Unable to request DMA channel for " > > + "McBSP%d RX. Trying IRQ based RX\n", > > + mcbsp[id].id); > > return -EAGAIN; > > } > > mcbsp[id].dma_rx_lch = dma_rx_ch; > > > > - DBG("RX DMA on channel %d\n", dma_rx_ch); > > + dev_err(mcbsp[id].dev, "McBSP%d RX DMA on channel %d\n", mcbsp[id].id, > > + dma_rx_ch); > > > > init_completion(&(mcbsp[id].rx_dma_completion)); > > > > @@ -770,7 +701,7 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer, > > src_port = OMAP_DMA_PORT_TIPB; > > dest_port = OMAP_DMA_PORT_EMIFF; > > } > > - if (cpu_is_omap24xx()) > > + if (cpu_class_is_omap2()) > > sync_dev = mcbsp[id].dma_rx_sync; > > > > omap_set_dma_transfer_params(mcbsp[id].dma_rx_lch, > > @@ -809,8 +740,10 @@ void omap_mcbsp_set_spi_mode(unsigned int id, > > { > > struct omap_mcbsp_reg_cfg mcbsp_cfg; > > > > - if (omap_mcbsp_check(id) < 0) > > + if (!omap_mcbsp_check_valid_id(id)) { > > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > > return; > > + } > > > > memset(&mcbsp_cfg, 0, sizeof(struct omap_mcbsp_reg_cfg)); > > > > @@ -871,182 +804,91 @@ 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. > > */ > > -struct omap_mcbsp_info { > > - u32 virt_base; > > - u8 dma_rx_sync, dma_tx_sync; > > - u16 rx_irq, tx_irq; > > -}; > > +static int __init omap_mcbsp_probe(struct platform_device *pdev) > > +{ > > + struct omap_mcbsp_platform_data *pdata = pdev->dev.platform_data; > > + int id = pdev->id - 1; > > + int ret = 0; > > + int i; > > > > -#ifdef CONFIG_ARCH_OMAP730 > > -static const struct omap_mcbsp_info mcbsp_730[] = { > > - [0] = { .virt_base = io_p2v(OMAP730_MCBSP1_BASE), > > - .dma_rx_sync = OMAP_DMA_MCBSP1_RX, > > - .dma_tx_sync = OMAP_DMA_MCBSP1_TX, > > - .rx_irq = INT_730_McBSP1RX, > > - .tx_irq = INT_730_McBSP1TX }, > > - [1] = { .virt_base = io_p2v(OMAP730_MCBSP2_BASE), > > - .dma_rx_sync = OMAP_DMA_MCBSP3_RX, > > - .dma_tx_sync = OMAP_DMA_MCBSP3_TX, > > - .rx_irq = INT_730_McBSP2RX, > > - .tx_irq = INT_730_McBSP2TX }, > > -}; > > -#endif > > - > > -#ifdef CONFIG_ARCH_OMAP15XX > > -static const struct omap_mcbsp_info mcbsp_1510[] = { > > - [0] = { .virt_base = OMAP1510_MCBSP1_BASE, > > - .dma_rx_sync = OMAP_DMA_MCBSP1_RX, > > - .dma_tx_sync = OMAP_DMA_MCBSP1_TX, > > - .rx_irq = INT_McBSP1RX, > > - .tx_irq = INT_McBSP1TX }, > > - [1] = { .virt_base = io_p2v(OMAP1510_MCBSP2_BASE), > > - .dma_rx_sync = OMAP_DMA_MCBSP2_RX, > > - .dma_tx_sync = OMAP_DMA_MCBSP2_TX, > > - .rx_irq = INT_1510_SPI_RX, > > - .tx_irq = INT_1510_SPI_TX }, > > - [2] = { .virt_base = OMAP1510_MCBSP3_BASE, > > - .dma_rx_sync = OMAP_DMA_MCBSP3_RX, > > - .dma_tx_sync = OMAP_DMA_MCBSP3_TX, > > - .rx_irq = INT_McBSP3RX, > > - .tx_irq = INT_McBSP3TX }, > > -}; > > -#endif > > - > > -#if defined(CONFIG_ARCH_OMAP16XX) > > -static const struct omap_mcbsp_info mcbsp_1610[] = { > > - [0] = { .virt_base = OMAP1610_MCBSP1_BASE, > > - .dma_rx_sync = OMAP_DMA_MCBSP1_RX, > > - .dma_tx_sync = OMAP_DMA_MCBSP1_TX, > > - .rx_irq = INT_McBSP1RX, > > - .tx_irq = INT_McBSP1TX }, > > - [1] = { .virt_base = io_p2v(OMAP1610_MCBSP2_BASE), > > - .dma_rx_sync = OMAP_DMA_MCBSP2_RX, > > - .dma_tx_sync = OMAP_DMA_MCBSP2_TX, > > - .rx_irq = INT_1610_McBSP2_RX, > > - .tx_irq = INT_1610_McBSP2_TX }, > > - [2] = { .virt_base = OMAP1610_MCBSP3_BASE, > > - .dma_rx_sync = OMAP_DMA_MCBSP3_RX, > > - .dma_tx_sync = OMAP_DMA_MCBSP3_TX, > > - .rx_irq = INT_McBSP3RX, > > - .tx_irq = INT_McBSP3TX }, > > -}; > > -#endif > > - > > -#if defined(CONFIG_ARCH_OMAP24XX) > > -static const struct omap_mcbsp_info mcbsp_24xx[] = { > > - [0] = { .virt_base = IO_ADDRESS(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, > > - }, > > - [1] = { .virt_base = IO_ADDRESS(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, > > - }, > > -}; > > -#endif > > + if (!pdata) { > > + dev_err(&pdev->dev, "McBSP device initialized without" > > + "platform data\n"); > > + ret = -EINVAL; > > + goto exit; > > + } > > > > -static int __init omap_mcbsp_init(void) > > + dev_dbg(&pdev->dev, "Initializing OMAP McBSP (%d).\n", pdev->id); > > + > > + if (id >= OMAP_MAX_MCBSP_COUNT) { > > + dev_err(&pdev->dev, "Invalid McBSP device id (%d)\n", id); > > + ret = -EINVAL; > > + goto exit; > > + } > > + > > + spin_lock_init(&mcbsp[id].lock); > > + mcbsp[id].id = id + 1; > > + mcbsp[id].free = 1; > > + mcbsp[id].dma_tx_lch = -1; > > + mcbsp[id].dma_rx_lch = -1; > > + > > + mcbsp[id].io_base = pdata->virt_base; > > + /* Default I/O is IRQ based */ > > + mcbsp[id].io_type = OMAP_MCBSP_IRQ_IO; > > + mcbsp[id].tx_irq = pdata->tx_irq; > > + mcbsp[id].rx_irq = pdata->rx_irq; > > + mcbsp[id].dma_rx_sync = pdata->dma_rx_sync; > > + mcbsp[id].dma_tx_sync = pdata->dma_tx_sync; > > + > > + mcbsp[id].nr_clocks = ARRAY_SIZE(pdata->clocks); > > + for (i = 0; i < ARRAY_SIZE(pdata->clocks); i++) > > + mcbsp[id].clocks[i] = clk_get(&pdev->dev, pdata->clocks[i]); > > + > > + mcbsp[id].pdata = pdata; > > + mcbsp[id].dev = &pdev->dev; > > + platform_set_drvdata(pdev, &mcbsp[id]); > > + > > +exit: > > + return ret; > > +} > > + > > +static int omap_mcbsp_remove(struct platform_device *pdev) > > { > > - int mcbsp_count = 0, i; > > - static const struct omap_mcbsp_info *mcbsp_info; > > + struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); > > > > - printk(KERN_INFO "Initializing OMAP McBSP system\n"); > > + platform_set_drvdata(pdev, NULL); > > + if (mcbsp) { > > + int i; > > > > -#ifdef CONFIG_ARCH_OMAP1 > > - mcbsp_dsp_ck = clk_get(0, "dsp_ck"); > > - if (IS_ERR(mcbsp_dsp_ck)) { > > - printk(KERN_ERR "mcbsp: could not acquire dsp_ck handle.\n"); > > - return PTR_ERR(mcbsp_dsp_ck); > > - } > > - mcbsp_api_ck = clk_get(0, "api_ck"); > > - if (IS_ERR(mcbsp_api_ck)) { > > - printk(KERN_ERR "mcbsp: could not acquire api_ck handle.\n"); > > - return PTR_ERR(mcbsp_api_ck); > > - } > > - mcbsp_dspxor_ck = clk_get(0, "dspxor_ck"); > > - if (IS_ERR(mcbsp_dspxor_ck)) { > > - printk(KERN_ERR "mcbsp: could not acquire dspxor_ck handle.\n"); > > - return PTR_ERR(mcbsp_dspxor_ck); > > - } > > -#endif > > -#ifdef CONFIG_ARCH_OMAP2 > > - mcbsp1_ick = clk_get(0, "mcbsp1_ick"); > > - if (IS_ERR(mcbsp1_ick)) { > > - printk(KERN_ERR "mcbsp: could not acquire " > > - "mcbsp1_ick handle.\n"); > > - return PTR_ERR(mcbsp1_ick); > > - } > > - mcbsp1_fck = clk_get(0, "mcbsp1_fck"); > > - if (IS_ERR(mcbsp1_fck)) { > > - printk(KERN_ERR "mcbsp: could not acquire " > > - "mcbsp1_fck handle.\n"); > > - return PTR_ERR(mcbsp1_fck); > > - } > > - mcbsp2_ick = clk_get(0, "mcbsp2_ick"); > > - if (IS_ERR(mcbsp2_ick)) { > > - printk(KERN_ERR "mcbsp: could not acquire " > > - "mcbsp2_ick handle.\n"); > > - return PTR_ERR(mcbsp2_ick); > > - } > > - mcbsp2_fck = clk_get(0, "mcbsp2_fck"); > > - if (IS_ERR(mcbsp2_fck)) { > > - printk(KERN_ERR "mcbsp: could not acquire " > > - "mcbsp2_fck handle.\n"); > > - return PTR_ERR(mcbsp2_fck); > > - } > > -#endif > > + if (mcbsp->pdata && mcbsp->pdata->ops && > > + mcbsp->pdata->ops->free) > > + mcbsp->pdata->ops->free(mcbsp->id); > > > > -#ifdef CONFIG_ARCH_OMAP730 > > - if (cpu_is_omap730()) { > > - mcbsp_info = mcbsp_730; > > - mcbsp_count = ARRAY_SIZE(mcbsp_730); > > - } > > -#endif > > -#ifdef CONFIG_ARCH_OMAP15XX > > - if (cpu_is_omap15xx()) { > > - mcbsp_info = mcbsp_1510; > > - mcbsp_count = ARRAY_SIZE(mcbsp_1510); > > - } > > -#endif > > -#if defined(CONFIG_ARCH_OMAP16XX) > > - if (cpu_is_omap16xx()) { > > - mcbsp_info = mcbsp_1610; > > - mcbsp_count = ARRAY_SIZE(mcbsp_1610); > > - } > > -#endif > > -#if defined(CONFIG_ARCH_OMAP24XX) > > - if (cpu_is_omap24xx()) { > > - mcbsp_info = mcbsp_24xx; > > - mcbsp_count = ARRAY_SIZE(mcbsp_24xx); > > - omap2_mcbsp2_mux_setup(); > > - } > > -#endif > > - for (i = 0; i < OMAP_MAX_MCBSP_COUNT ; i++) { > > - if (i >= mcbsp_count) { > > - mcbsp[i].io_base = 0; > > - mcbsp[i].free = 0; > > - continue; > > - } > > - mcbsp[i].id = i + 1; > > - mcbsp[i].free = 1; > > - mcbsp[i].dma_tx_lch = -1; > > - mcbsp[i].dma_rx_lch = -1; > > - > > - mcbsp[i].io_base = mcbsp_info[i].virt_base; > > - /* Default I/O is IRQ based */ > > - mcbsp[i].io_type = OMAP_MCBSP_IRQ_IO; > > - mcbsp[i].tx_irq = mcbsp_info[i].tx_irq; > > - mcbsp[i].rx_irq = mcbsp_info[i].rx_irq; > > - mcbsp[i].dma_rx_sync = mcbsp_info[i].dma_rx_sync; > > - mcbsp[i].dma_tx_sync = mcbsp_info[i].dma_tx_sync; > > - spin_lock_init(&mcbsp[i].lock); > > + mcbsp_clk_disable(mcbsp); > > + mcbsp_clk_put(mcbsp); > > + > > + for (i = 0; i < mcbsp->nr_clocks; i++) > > + mcbsp->clocks[i] = NULL; > > + > > + mcbsp->free = 0; > > + mcbsp->dev = NULL; > > } > > > > return 0; > > } > > > > -arch_initcall(omap_mcbsp_init); > > +static struct platform_driver omap_mcbsp_driver = { > > + .probe = omap_mcbsp_probe, > > + .remove = omap_mcbsp_remove, > > + .driver = { > > + .name = "omap-mcbsp", > > + }, > > +}; > > + > > +int __init omap_mcbsp_init(void) > > +{ > > + /* Register the McBSP driver */ > > + return platform_driver_register(&omap_mcbsp_driver); > > +} > > I hope that we are targeting this to build and installed as module? In > that case we need usual module_init/exit stuff. > > > > > + > > + > > diff --git a/include/asm-arm/arch-omap/mcbsp.h b/include/asm-arm/arch-omap/mcbsp.h > > index b53c3b2..aa47421 100644 > > --- a/include/asm-arm/arch-omap/mcbsp.h > > +++ b/include/asm-arm/arch-omap/mcbsp.h > > @@ -24,7 +24,11 @@ > > #ifndef __ASM_ARCH_OMAP_MCBSP_H > > #define __ASM_ARCH_OMAP_MCBSP_H > > > > +#include <linux/completion.h> > > +#include <linux/spinlock.h> > > + > > #include <asm/hardware.h> > > +#include <asm/arch/clock.h> > > > > #define OMAP730_MCBSP1_BASE 0xfffb1000 > > #define OMAP730_MCBSP2_BASE 0xfffb1800 > > @@ -40,6 +44,9 @@ > > #define OMAP24XX_MCBSP1_BASE 0x48074000 > > #define OMAP24XX_MCBSP2_BASE 0x48076000 > > > > +#define OMAP34XX_MCBSP1_BASE 0x48074000 > > +#define OMAP34XX_MCBSP2_BASE 0x49022000 > > + > > #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730) > > > > #define OMAP_MCBSP_REG_DRR2 0x00 > > @@ -74,7 +81,8 @@ > > #define OMAP_MCBSP_REG_XCERG 0x3A > > #define OMAP_MCBSP_REG_XCERH 0x3C > > > > -#define OMAP_MAX_MCBSP_COUNT 3 > > +#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) > > @@ -117,7 +125,8 @@ > > #define OMAP_MCBSP_REG_XCERG 0x74 > > #define OMAP_MCBSP_REG_XCERH 0x78 > > > > -#define OMAP_MAX_MCBSP_COUNT 2 > > +#define OMAP_MAX_MCBSP_COUNT 2 > > +#define MAX_MCBSP_CLOCKS 2 > > > > #define AUDIO_MCBSP_DATAWRITE (OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR1) > > #define AUDIO_MCBSP_DATAREAD (OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR1) > > @@ -298,6 +307,66 @@ struct omap_mcbsp_spi_cfg { > > omap_mcbsp_word_length word_length; > > }; > > > > +/* Platform specific configuration */ > > +struct omap_mcbsp_ops { > > + void (*request)(unsigned int); > > + void (*free)(unsigned int); > > + int (*check)(unsigned int); > > +}; > > + > > +struct omap_mcbsp_platform_data { > > + u32 virt_base; > > + u8 dma_rx_sync, dma_tx_sync; > > + u16 rx_irq, tx_irq; > > + struct omap_mcbsp_ops *ops; > > + char const *clocks[MAX_MCBSP_CLOCKS]; > > +}; > > + > > +struct omap_mcbsp { > > + struct device *dev; > > + u32 io_base; > > + u8 id; > > + u8 free; > > + omap_mcbsp_word_length rx_word_length; > > + omap_mcbsp_word_length tx_word_length; > > + > > + omap_mcbsp_io_type_t io_type; /* IRQ or poll */ > > + /* IRQ based TX/RX */ > > + int rx_irq; > > + int tx_irq; > > + > > + /* DMA stuff */ > > + u8 dma_rx_sync; > > + short dma_rx_lch; > > + u8 dma_tx_sync; > > + short dma_tx_lch; > > + > > + /* Completion queues */ > > + struct completion tx_irq_completion; > > + struct completion rx_irq_completion; > > + struct completion tx_dma_completion; > > + struct completion rx_dma_completion; > > + > > + /* Protect the field .free, while checking if the mcbsp is in use */ > > + spinlock_t lock; > > + struct omap_mcbsp_platform_data *pdata; > > + int nr_clocks; > > + struct clk *clocks[MAX_MCBSP_CLOCKS]; > > +}; > > + > > +#define __mcbsp_clk_op(mcbsp, op) \ > > + do { \ > > + int i; \ > > + for (i = 0; i < mcbsp->nr_clocks; i++) \ > > + clk_##op(mcbsp->clocks[i]); \ > > + } while (0) > > +#define mcbsp_clk_enable(mcbsp) __mcbsp_clk_op((mcbsp), enable) > > +#define mcbsp_clk_disable(mcbsp) __mcbsp_clk_op((mcbsp), disable) > > +#define mcbsp_clk_put(mcbsp) __mcbsp_clk_op((mcbsp), put) > > + > > +int omap_mcbsp_init(void); > > > Do we need to add omap_mcbsp_init here? > This is also into header file because the initialization starts into mach-omap specific part. So, from there it can be called. > > > > > +void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, > > + int size); > > void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config); > > int omap_mcbsp_request(unsigned int id); > > void omap_mcbsp_free(unsigned int id); > > -- > > 1.5.5.1.67.gbdb8.dirty > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > > > > > -- > ---Trilok Soni > http://triloksoni.wordpress.com > -- Eduardo Bezerra Valentin ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 1/4] PLAT-OMAP: MCBSP: Tranform into platform driver 2008-05-05 21:23 ` [PATCH 1/4] PLAT-OMAP: MCBSP: Tranform into platform driver Eduardo Valentin 2008-05-05 21:23 ` [PATCH 2/4] MACH-OMAP1: MCBSP: Add support for mcbsp on mach-omap1 Eduardo Valentin 2008-05-08 11:23 ` [PATCH 1/4] PLAT-OMAP: MCBSP: Tranform into platform driver Trilok Soni @ 2008-05-20 23:44 ` Tony Lindgren 2008-05-29 15:30 ` Eduardo Valentin 2 siblings, 1 reply; 17+ messages in thread From: Tony Lindgren @ 2008-05-20 23:44 UTC (permalink / raw) To: Eduardo Valentin; +Cc: linux-omap, Chandra shekhar, Eduardo Valentin [-- Attachment #1: Type: text/plain, Size: 37473 bytes --] Hi, Some comments below. * Eduardo Valentin <edubezval@gmail.com> [080505 14:24]: > From: Eduardo Valentin <eduardo.valentin@indt.org.br> > > This patch transform mcbsp code into a very initial > implementation of a platform driver. > > It also gets ride of ifdefs on mcbsp.c code. > To do it, a platform data structure was defined. > > Platform devices are located in arch/arm/plat-omap/devices.c > > Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br> > --- > arch/arm/plat-omap/devices.c | 45 +++ > arch/arm/plat-omap/mcbsp.c | 660 ++++++++++++++----------------------- > include/asm-arm/arch-omap/mcbsp.h | 73 ++++- > 3 files changed, 367 insertions(+), 411 deletions(-) > > diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c > index 099182b..b3e0147 100644 > --- a/arch/arm/plat-omap/devices.c > +++ b/arch/arm/plat-omap/devices.c > @@ -27,6 +27,7 @@ > #include <asm/arch/gpio.h> > #include <asm/arch/menelaus.h> > #include <asm/arch/dsp_common.h> > +#include <asm/arch/mcbsp.h> > > #if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE) > > @@ -150,6 +151,49 @@ static inline void omap_init_kp(void) {} > #endif > > /*-------------------------------------------------------------------------*/ > +#if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE) > + > +static struct platform_device omap_mcbsp_devices[OMAP_MAX_MCBSP_COUNT]; > +static int mcbsps_configured; > + > +void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, > + int size) > +{ > + int i; > + > + if (size > OMAP_MAX_MCBSP_COUNT) { > + printk(KERN_WARNING "Registered too many McBSPs platform_data." > + " Using maximum (%d) available.\n", > + OMAP_MAX_MCBSP_COUNT); > + size = OMAP_MAX_MCBSP_COUNT; > + } > + > + for (i = 0; i < size; i++) { > + struct platform_device *new_mcbsp = &omap_mcbsp_devices[i]; > + new_mcbsp->name = "omap-mcbsp"; > + new_mcbsp->id = i + 1; > + new_mcbsp->dev.platform_data = &config[i]; > + } > + mcbsps_configured = size; > +} > + > +static void __init omap_init_mcbsp(void) > +{ > + int i; > + > + for (i = 0; i < mcbsps_configured; i++) > + platform_device_register(&omap_mcbsp_devices[i]); > +} > +#else > +void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, > + int size) > +{ } > + > +static inline void __init omap_init_mcbsp(void) > +{ } > +#endif > + > +/*-------------------------------------------------------------------------*/ > > #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) \ > || defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) > @@ -511,6 +555,7 @@ static int __init omap_init_devices(void) > */ > omap_init_dsp(); > omap_init_kp(); > + omap_init_mcbsp(); > omap_init_mmc(); > omap_init_uwire(); > omap_init_wdt(); > diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c > index 053de31..5536223 100644 > --- a/arch/arm/plat-omap/mcbsp.c > +++ b/arch/arm/plat-omap/mcbsp.c > @@ -15,6 +15,7 @@ > #include <linux/module.h> > #include <linux/init.h> > #include <linux/device.h> > +#include <linux/platform_device.h> > #include <linux/wait.h> > #include <linux/completion.h> > #include <linux/interrupt.h> > @@ -25,83 +26,53 @@ > #include <linux/irq.h> > > #include <asm/arch/dma.h> > -#include <asm/arch/mux.h> > -#include <asm/arch/irqs.h> > -#include <asm/arch/dsp_common.h> > #include <asm/arch/mcbsp.h> > > -#ifdef CONFIG_MCBSP_DEBUG > -#define DBG(x...) printk(x) > -#else > -#define DBG(x...) do { } while (0) > -#endif > - > -struct omap_mcbsp { > - u32 io_base; > - u8 id; > - u8 free; > - omap_mcbsp_word_length rx_word_length; > - omap_mcbsp_word_length tx_word_length; > - > - omap_mcbsp_io_type_t io_type; /* IRQ or poll */ > - /* IRQ based TX/RX */ > - int rx_irq; > - int tx_irq; > - > - /* DMA stuff */ > - u8 dma_rx_sync; > - short dma_rx_lch; > - u8 dma_tx_sync; > - short dma_tx_lch; > - > - /* Completion queues */ > - struct completion tx_irq_completion; > - struct completion rx_irq_completion; > - struct completion tx_dma_completion; > - struct completion rx_dma_completion; > - > - /* Protect the field .free, while checking if the mcbsp is in use */ > - spinlock_t lock; > -}; > - > static struct omap_mcbsp mcbsp[OMAP_MAX_MCBSP_COUNT]; > -#ifdef CONFIG_ARCH_OMAP1 > -static struct clk *mcbsp_dsp_ck; > -static struct clk *mcbsp_api_ck; > -static struct clk *mcbsp_dspxor_ck; > -#endif > -#ifdef CONFIG_ARCH_OMAP2 > -static struct clk *mcbsp1_ick; > -static struct clk *mcbsp1_fck; > -static struct clk *mcbsp2_ick; > -static struct clk *mcbsp2_fck; > -#endif > + > +#define omap_mcbsp_check_valid_id(id) (mcbsp[id].pdata && \ > + mcbsp[id].pdata->ops && \ > + mcbsp[id].pdata->ops->check && \ > + (mcbsp[id].pdata->ops->check(id) == 0)) > > static void omap_mcbsp_dump_reg(u8 id) > { > - DBG("**** MCBSP%d regs ****\n", mcbsp[id].id); > - DBG("DRR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DRR2)); > - DBG("DRR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DRR1)); > - DBG("DXR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DXR2)); > - DBG("DXR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, DXR1)); > - DBG("SPCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR2)); > - DBG("SPCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR1)); > - DBG("RCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, RCR2)); > - DBG("RCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, RCR1)); > - DBG("XCR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, XCR2)); > - DBG("XCR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, XCR1)); > - DBG("SRGR2: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR2)); > - DBG("SRGR1: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR1)); > - DBG("PCR0: 0x%04x\n", OMAP_MCBSP_READ(mcbsp[id].io_base, PCR0)); > - DBG("***********************\n"); > + dev_dbg(mcbsp[id].dev, "**** McBSP%d regs ****\n", mcbsp[id].id); > + dev_dbg(mcbsp[id].dev, "DRR2: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, DRR2)); > + dev_dbg(mcbsp[id].dev, "DRR1: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, DRR1)); > + dev_dbg(mcbsp[id].dev, "DXR2: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, DXR2)); > + dev_dbg(mcbsp[id].dev, "DXR1: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, DXR1)); > + dev_dbg(mcbsp[id].dev, "SPCR2: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR2)); > + dev_dbg(mcbsp[id].dev, "SPCR1: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, SPCR1)); > + dev_dbg(mcbsp[id].dev, "RCR2: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, RCR2)); > + dev_dbg(mcbsp[id].dev, "RCR1: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, RCR1)); > + dev_dbg(mcbsp[id].dev, "XCR2: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, XCR2)); > + dev_dbg(mcbsp[id].dev, "XCR1: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, XCR1)); > + dev_dbg(mcbsp[id].dev, "SRGR2: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR2)); > + dev_dbg(mcbsp[id].dev, "SRGR1: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, SRGR1)); > + dev_dbg(mcbsp[id].dev, "PCR0: 0x%04x\n", > + OMAP_MCBSP_READ(mcbsp[id].io_base, PCR0)); > + dev_dbg(mcbsp[id].dev, "***********************\n"); > } > > static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id) > { > struct omap_mcbsp *mcbsp_tx = dev_id; > > - DBG("TX IRQ callback : 0x%x\n", > - OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2)); > + dev_dbg(mcbsp_tx->dev, "TX IRQ callback : 0x%x\n", > + OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2)); > > complete(&mcbsp_tx->tx_irq_completion); > > @@ -112,8 +83,8 @@ static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id) > { > struct omap_mcbsp *mcbsp_rx = dev_id; > > - DBG("RX IRQ callback : 0x%x\n", > - OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2)); > + dev_dbg(mcbsp_rx->dev, "RX IRQ callback : 0x%x\n", > + OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR2)); > > complete(&mcbsp_rx->rx_irq_completion); > > @@ -124,8 +95,8 @@ static void omap_mcbsp_tx_dma_callback(int lch, u16 ch_status, void *data) > { > struct omap_mcbsp *mcbsp_dma_tx = data; > > - DBG("TX DMA callback : 0x%x\n", > - OMAP_MCBSP_READ(mcbsp_dma_tx->io_base, SPCR2)); > + dev_dbg(mcbsp_dma_tx->dev, "TX DMA callback : 0x%x\n", > + OMAP_MCBSP_READ(mcbsp_dma_tx->io_base, SPCR2)); > > /* We can free the channels */ > omap_free_dma(mcbsp_dma_tx->dma_tx_lch); > @@ -138,8 +109,8 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data) > { > struct omap_mcbsp *mcbsp_dma_rx = data; > > - DBG("RX DMA callback : 0x%x\n", > - OMAP_MCBSP_READ(mcbsp_dma_rx->io_base, SPCR2)); > + dev_dbg(mcbsp_dma_rx->dev, "RX DMA callback : 0x%x\n", > + OMAP_MCBSP_READ(mcbsp_dma_rx->io_base, SPCR2)); > > /* We can free the channels */ > omap_free_dma(mcbsp_dma_rx->dma_rx_lch); > @@ -156,9 +127,16 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data) > */ > void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) > { > - u32 io_base = mcbsp[id].io_base; > + u32 io_base; > + > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return; > + } > > - DBG("OMAP-McBSP: McBSP%d io_base: 0x%8x\n", id + 1, io_base); > + io_base = mcbsp[id].io_base; > + dev_dbg(mcbsp[id].dev, "Configuring McBSP%d io_base: 0x%8x\n", > + mcbsp[id].id, io_base); > > /* We write the given config */ > OMAP_MCBSP_WRITE(io_base, SPCR2, config->spcr2); > @@ -175,97 +153,22 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) > } > EXPORT_SYMBOL(omap_mcbsp_config); > > -static int omap_mcbsp_check(unsigned int id) > -{ > - if (cpu_is_omap730()) { > - if (id > OMAP_MAX_MCBSP_COUNT - 1) { > - printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", > - id + 1); > - return -1; > - } > - return 0; > - } > - > - if (cpu_is_omap15xx() || cpu_is_omap16xx() || cpu_is_omap24xx()) { > - if (id > OMAP_MAX_MCBSP_COUNT) { > - printk(KERN_ERR "OMAP-McBSP: McBSP%d doesn't exist\n", > - id + 1); > - return -1; > - } > - return 0; > - } > - > - return -1; > -} > - > -#ifdef CONFIG_ARCH_OMAP1 > -static void omap_mcbsp_dsp_request(void) > -{ > - if (cpu_is_omap15xx() || cpu_is_omap16xx()) { > - int ret; > - > - ret = omap_dsp_request_mem(); > - if (ret < 0) { > - printk(KERN_ERR "Could not get dsp memory: %i\n", ret); > - return; > - } > - > - clk_enable(mcbsp_dsp_ck); > - clk_enable(mcbsp_api_ck); > - > - /* enable 12MHz clock to mcbsp 1 & 3 */ > - clk_enable(mcbsp_dspxor_ck); > - > - /* > - * DSP external peripheral reset > - * FIXME: This should be moved to dsp code > - */ > - __raw_writew(__raw_readw(DSP_RSTCT2) | 1 | 1 << 1, > - DSP_RSTCT2); > - } > -} > - > -static void omap_mcbsp_dsp_free(void) > -{ > - if (cpu_is_omap15xx() || cpu_is_omap16xx()) { > - omap_dsp_release_mem(); > - clk_disable(mcbsp_dspxor_ck); > - clk_disable(mcbsp_dsp_ck); > - clk_disable(mcbsp_api_ck); > - } > -} > -#endif > - > -#ifdef CONFIG_ARCH_OMAP2 > -static void omap2_mcbsp2_mux_setup(void) > -{ > - if (cpu_is_omap2420()) { > - omap_cfg_reg(Y15_24XX_MCBSP2_CLKX); > - omap_cfg_reg(R14_24XX_MCBSP2_FSX); > - omap_cfg_reg(W15_24XX_MCBSP2_DR); > - omap_cfg_reg(V15_24XX_MCBSP2_DX); > - omap_cfg_reg(V14_24XX_GPIO117); > - } > - /* > - * Need to add MUX settings for OMAP 2430 SDP > - */ > -} > -#endif > - > /* > * We can choose between IRQ based or polled IO. > * This needs to be called before omap_mcbsp_request(). > */ > int omap_mcbsp_set_io_type(unsigned int id, omap_mcbsp_io_type_t io_type) > { > - if (omap_mcbsp_check(id) < 0) > - return -EINVAL; > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > + } > > spin_lock(&mcbsp[id].lock); > > if (!mcbsp[id].free) { > - printk(KERN_ERR "OMAP-McBSP: McBSP%d is currently in use\n", > - id + 1); > + dev_err(mcbsp[id].dev, "McBSP%d is currently in use\n", > + mcbsp[id].id); > spin_unlock(&mcbsp[id].lock); > return -EINVAL; > } > @@ -282,34 +185,20 @@ int omap_mcbsp_request(unsigned int id) > { > int err; > > - if (omap_mcbsp_check(id) < 0) > - return -EINVAL; > - > -#ifdef CONFIG_ARCH_OMAP1 > - /* > - * On 1510, 1610 and 1710, McBSP1 and McBSP3 > - * are DSP public peripherals. > - */ > - if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) > - omap_mcbsp_dsp_request(); > -#endif > - > -#ifdef CONFIG_ARCH_OMAP2 > - if (cpu_is_omap24xx()) { > - if (id == OMAP_MCBSP1) { > - clk_enable(mcbsp1_ick); > - clk_enable(mcbsp1_fck); > - } else { > - clk_enable(mcbsp2_ick); > - clk_enable(mcbsp2_fck); > - } > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > } > -#endif > + > + if (mcbsp[id].pdata->ops->request) > + mcbsp[id].pdata->ops->request(id); > + > + mcbsp_clk_enable(&mcbsp[id]); > > spin_lock(&mcbsp[id].lock); > if (!mcbsp[id].free) { > - printk(KERN_ERR "OMAP-McBSP: McBSP%d is currently in use\n", > - id + 1); > + dev_err(mcbsp[id].dev, "McBSP%d is currently in use\n", > + mcbsp[id].id); > spin_unlock(&mcbsp[id].lock); > return -1; > } > @@ -322,9 +211,9 @@ int omap_mcbsp_request(unsigned int id) > err = request_irq(mcbsp[id].tx_irq, omap_mcbsp_tx_irq_handler, > 0, "McBSP", (void *) (&mcbsp[id])); > if (err != 0) { > - printk(KERN_ERR "OMAP-McBSP: Unable to " > - "request TX IRQ %d for McBSP%d\n", > - mcbsp[id].tx_irq, mcbsp[id].id); > + dev_err(mcbsp[id].dev, "Unable to request TX IRQ %d " > + "for McBSP%d\n", mcbsp[id].tx_irq, > + mcbsp[id].id); > return err; > } > > @@ -333,9 +222,9 @@ int omap_mcbsp_request(unsigned int id) > err = request_irq(mcbsp[id].rx_irq, omap_mcbsp_rx_irq_handler, > 0, "McBSP", (void *) (&mcbsp[id])); > if (err != 0) { > - printk(KERN_ERR "OMAP-McBSP: Unable to " > - "request RX IRQ %d for McBSP%d\n", > - mcbsp[id].rx_irq, mcbsp[id].id); > + dev_err(mcbsp[id].dev, "Unable to request RX IRQ %d " > + "for McBSP%d\n", mcbsp[id].rx_irq, > + mcbsp[id].id); > free_irq(mcbsp[id].tx_irq, (void *) (&mcbsp[id])); > return err; > } > @@ -349,32 +238,20 @@ EXPORT_SYMBOL(omap_mcbsp_request); > > void omap_mcbsp_free(unsigned int id) > { > - if (omap_mcbsp_check(id) < 0) > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > return; > - > -#ifdef CONFIG_ARCH_OMAP1 > - if (cpu_class_is_omap1()) { > - if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) > - omap_mcbsp_dsp_free(); > } > -#endif > - > -#ifdef CONFIG_ARCH_OMAP2 > - if (cpu_is_omap24xx()) { > - if (id == OMAP_MCBSP1) { > - clk_disable(mcbsp1_ick); > - clk_disable(mcbsp1_fck); > - } else { > - clk_disable(mcbsp2_ick); > - clk_disable(mcbsp2_fck); > - } > - } > -#endif > + > + if (mcbsp[id].pdata->ops->free) > + mcbsp[id].pdata->ops->free(id); > + > + mcbsp_clk_disable(&mcbsp[id]); > > spin_lock(&mcbsp[id].lock); > if (mcbsp[id].free) { > - printk(KERN_ERR "OMAP-McBSP: McBSP%d was not reserved\n", > - id + 1); > + dev_err(mcbsp[id].dev, "McBSP%d was not reserved\n", > + mcbsp[id].id); > spin_unlock(&mcbsp[id].lock); > return; > } > @@ -400,8 +277,10 @@ void omap_mcbsp_start(unsigned int id) > u32 io_base; > u16 w; > > - if (omap_mcbsp_check(id) < 0) > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > return; > + } > > io_base = mcbsp[id].io_base; > > @@ -435,8 +314,10 @@ void omap_mcbsp_stop(unsigned int id) > u32 io_base; > u16 w; > > - if (omap_mcbsp_check(id) < 0) > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > return; > + } > > io_base = mcbsp[id].io_base; > > @@ -457,7 +338,14 @@ EXPORT_SYMBOL(omap_mcbsp_stop); > /* polled mcbsp i/o operations */ > int omap_mcbsp_pollwrite(unsigned int id, u16 buf) > { > - u32 base = mcbsp[id].io_base; > + u32 base; > + > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > + } > + > + base = mcbsp[id].io_base; > writew(buf, base + OMAP_MCBSP_REG_DXR1); > /* if frame sync error - clear the error */ > if (readw(base + OMAP_MCBSP_REG_SPCR2) & XSYNC_ERR) { > @@ -479,8 +367,8 @@ int omap_mcbsp_pollwrite(unsigned int id, u16 buf) > (XRST), > base + OMAP_MCBSP_REG_SPCR2); > udelay(10); > - printk(KERN_ERR > - " Could not write to McBSP Register\n"); > + dev_err(mcbsp[id].dev, "Could not write to" > + " McBSP%d Register\n", mcbsp[id].id); > return -2; > } > } > @@ -492,7 +380,14 @@ EXPORT_SYMBOL(omap_mcbsp_pollwrite); > > int omap_mcbsp_pollread(unsigned int id, u16 *buf) > { > - u32 base = mcbsp[id].io_base; > + u32 base; > + > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > + } > + > + base = mcbsp[id].io_base; > /* if frame sync error - clear the error */ > if (readw(base + OMAP_MCBSP_REG_SPCR1) & RSYNC_ERR) { > /* clear error */ > @@ -513,8 +408,8 @@ int omap_mcbsp_pollread(unsigned int id, u16 *buf) > (RRST), > base + OMAP_MCBSP_REG_SPCR1); > udelay(10); > - printk(KERN_ERR > - " Could not read from McBSP Register\n"); > + dev_err(mcbsp[id].dev, "Could not read from" > + " McBSP%d Register\n", mcbsp[id].id); > return -2; > } > } > @@ -531,12 +426,15 @@ EXPORT_SYMBOL(omap_mcbsp_pollread); > void omap_mcbsp_xmit_word(unsigned int id, u32 word) > { > u32 io_base; > - omap_mcbsp_word_length word_length = mcbsp[id].tx_word_length; > + omap_mcbsp_word_length word_length; > > - if (omap_mcbsp_check(id) < 0) > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > return; > + } > > io_base = mcbsp[id].io_base; > + word_length = mcbsp[id].tx_word_length; > > wait_for_completion(&(mcbsp[id].tx_irq_completion)); > > @@ -550,11 +448,14 @@ u32 omap_mcbsp_recv_word(unsigned int id) > { > u32 io_base; > u16 word_lsb, word_msb = 0; > - omap_mcbsp_word_length word_length = mcbsp[id].rx_word_length; > + omap_mcbsp_word_length word_length; > > - if (omap_mcbsp_check(id) < 0) > - return -EINVAL; > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > + } > > + word_length = mcbsp[id].rx_word_length; > io_base = mcbsp[id].io_base; > > wait_for_completion(&(mcbsp[id].rx_irq_completion)); > @@ -569,11 +470,20 @@ EXPORT_SYMBOL(omap_mcbsp_recv_word); > > int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) > { > - u32 io_base = mcbsp[id].io_base; > - omap_mcbsp_word_length tx_word_length = mcbsp[id].tx_word_length; > - omap_mcbsp_word_length rx_word_length = mcbsp[id].rx_word_length; > + u32 io_base; > + omap_mcbsp_word_length tx_word_length; > + omap_mcbsp_word_length rx_word_length; > u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0; > > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > + } > + > + io_base = mcbsp[id].io_base; > + tx_word_length = mcbsp[id].tx_word_length; > + rx_word_length = mcbsp[id].rx_word_length; > + > if (tx_word_length != rx_word_length) > return -EINVAL; > > @@ -587,7 +497,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) > udelay(10); > OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST); > udelay(10); > - printk(KERN_ERR "McBSP transmitter not ready\n"); > + dev_err(mcbsp[id].dev, "McBSP%d transmitter not " > + "ready\n", mcbsp[id].id); > return -EAGAIN; > } > } > @@ -607,7 +518,8 @@ int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) > udelay(10); > OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST); > udelay(10); > - printk(KERN_ERR "McBSP receiver not ready\n"); > + dev_err(mcbsp[id].dev, "McBSP%d receiver not " > + "ready\n", mcbsp[id].id); > return -EAGAIN; > } > } > @@ -623,11 +535,20 @@ EXPORT_SYMBOL(omap_mcbsp_spi_master_xmit_word_poll); > > int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) > { > - u32 io_base = mcbsp[id].io_base, clock_word = 0; > - omap_mcbsp_word_length tx_word_length = mcbsp[id].tx_word_length; > - omap_mcbsp_word_length rx_word_length = mcbsp[id].rx_word_length; > + u32 io_base, clock_word = 0; > + omap_mcbsp_word_length tx_word_length; > + omap_mcbsp_word_length rx_word_length; > u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0; > > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > + } > + > + io_base = mcbsp[id].io_base; > + tx_word_length = mcbsp[id].tx_word_length; > + rx_word_length = mcbsp[id].rx_word_length; > + > if (tx_word_length != rx_word_length) > return -EINVAL; > > @@ -641,7 +562,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) > udelay(10); > OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST); > udelay(10); > - printk(KERN_ERR "McBSP transmitter not ready\n"); > + dev_err(mcbsp[id].dev, "McBSP%d transmitter not " > + "ready\n", mcbsp[id].id); > return -EAGAIN; > } > } > @@ -661,7 +583,8 @@ int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) > udelay(10); > OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST); > udelay(10); > - printk(KERN_ERR "McBSP receiver not ready\n"); > + dev_err(mcbsp[id].dev, "McBSP%d receiver not " > + "ready\n", mcbsp[id].id); > return -EAGAIN; > } > } > @@ -692,20 +615,24 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer, > int dest_port = 0; > int sync_dev = 0; > > - if (omap_mcbsp_check(id) < 0) > - return -EINVAL; > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > + } > > if (omap_request_dma(mcbsp[id].dma_tx_sync, "McBSP TX", > omap_mcbsp_tx_dma_callback, > &mcbsp[id], > &dma_tx_ch)) { > - printk(KERN_ERR "OMAP-McBSP: Unable to request DMA channel for" > - " McBSP%d TX. Trying IRQ based TX\n", id + 1); > + dev_err(mcbsp[id].dev, " Unable to request DMA channel for " > + "McBSP%d TX. Trying IRQ based TX\n", > + mcbsp[id].id); > return -EAGAIN; > } > mcbsp[id].dma_tx_lch = dma_tx_ch; > > - DBG("TX DMA on channel %d\n", dma_tx_ch); > + dev_err(mcbsp[id].dev, "McBSP%d TX DMA on channel %d\n", mcbsp[id].id, > + dma_tx_ch); > > init_completion(&(mcbsp[id].tx_dma_completion)); > > @@ -713,7 +640,7 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer, > src_port = OMAP_DMA_PORT_TIPB; > dest_port = OMAP_DMA_PORT_EMIFF; > } > - if (cpu_is_omap24xx()) > + if (cpu_class_is_omap2()) > sync_dev = mcbsp[id].dma_tx_sync; > > omap_set_dma_transfer_params(mcbsp[id].dma_tx_lch, > @@ -749,20 +676,24 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer, > int dest_port = 0; > int sync_dev = 0; > > - if (omap_mcbsp_check(id) < 0) > - return -EINVAL; > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > + return -ENODEV; > + } > > if (omap_request_dma(mcbsp[id].dma_rx_sync, "McBSP RX", > omap_mcbsp_rx_dma_callback, > &mcbsp[id], > &dma_rx_ch)) { > - printk(KERN_ERR "Unable to request DMA channel for McBSP%d RX." > - " Trying IRQ based RX\n", id + 1); > + dev_err(mcbsp[id].dev, "Unable to request DMA channel for " > + "McBSP%d RX. Trying IRQ based RX\n", > + mcbsp[id].id); > return -EAGAIN; > } > mcbsp[id].dma_rx_lch = dma_rx_ch; > > - DBG("RX DMA on channel %d\n", dma_rx_ch); > + dev_err(mcbsp[id].dev, "McBSP%d RX DMA on channel %d\n", mcbsp[id].id, > + dma_rx_ch); > > init_completion(&(mcbsp[id].rx_dma_completion)); > > @@ -770,7 +701,7 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer, > src_port = OMAP_DMA_PORT_TIPB; > dest_port = OMAP_DMA_PORT_EMIFF; > } > - if (cpu_is_omap24xx()) > + if (cpu_class_is_omap2()) > sync_dev = mcbsp[id].dma_rx_sync; > > omap_set_dma_transfer_params(mcbsp[id].dma_rx_lch, > @@ -809,8 +740,10 @@ void omap_mcbsp_set_spi_mode(unsigned int id, > { > struct omap_mcbsp_reg_cfg mcbsp_cfg; > > - if (omap_mcbsp_check(id) < 0) > + if (!omap_mcbsp_check_valid_id(id)) { > + printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); > return; > + } > > memset(&mcbsp_cfg, 0, sizeof(struct omap_mcbsp_reg_cfg)); > > @@ -871,182 +804,91 @@ 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. > */ > -struct omap_mcbsp_info { > - u32 virt_base; > - u8 dma_rx_sync, dma_tx_sync; > - u16 rx_irq, tx_irq; > -}; > +static int __init omap_mcbsp_probe(struct platform_device *pdev) > +{ > + struct omap_mcbsp_platform_data *pdata = pdev->dev.platform_data; > + int id = pdev->id - 1; > + int ret = 0; > + int i; > > -#ifdef CONFIG_ARCH_OMAP730 > -static const struct omap_mcbsp_info mcbsp_730[] = { > - [0] = { .virt_base = io_p2v(OMAP730_MCBSP1_BASE), > - .dma_rx_sync = OMAP_DMA_MCBSP1_RX, > - .dma_tx_sync = OMAP_DMA_MCBSP1_TX, > - .rx_irq = INT_730_McBSP1RX, > - .tx_irq = INT_730_McBSP1TX }, > - [1] = { .virt_base = io_p2v(OMAP730_MCBSP2_BASE), > - .dma_rx_sync = OMAP_DMA_MCBSP3_RX, > - .dma_tx_sync = OMAP_DMA_MCBSP3_TX, > - .rx_irq = INT_730_McBSP2RX, > - .tx_irq = INT_730_McBSP2TX }, > -}; > -#endif > - > -#ifdef CONFIG_ARCH_OMAP15XX > -static const struct omap_mcbsp_info mcbsp_1510[] = { > - [0] = { .virt_base = OMAP1510_MCBSP1_BASE, > - .dma_rx_sync = OMAP_DMA_MCBSP1_RX, > - .dma_tx_sync = OMAP_DMA_MCBSP1_TX, > - .rx_irq = INT_McBSP1RX, > - .tx_irq = INT_McBSP1TX }, > - [1] = { .virt_base = io_p2v(OMAP1510_MCBSP2_BASE), > - .dma_rx_sync = OMAP_DMA_MCBSP2_RX, > - .dma_tx_sync = OMAP_DMA_MCBSP2_TX, > - .rx_irq = INT_1510_SPI_RX, > - .tx_irq = INT_1510_SPI_TX }, > - [2] = { .virt_base = OMAP1510_MCBSP3_BASE, > - .dma_rx_sync = OMAP_DMA_MCBSP3_RX, > - .dma_tx_sync = OMAP_DMA_MCBSP3_TX, > - .rx_irq = INT_McBSP3RX, > - .tx_irq = INT_McBSP3TX }, > -}; > -#endif > - > -#if defined(CONFIG_ARCH_OMAP16XX) > -static const struct omap_mcbsp_info mcbsp_1610[] = { > - [0] = { .virt_base = OMAP1610_MCBSP1_BASE, > - .dma_rx_sync = OMAP_DMA_MCBSP1_RX, > - .dma_tx_sync = OMAP_DMA_MCBSP1_TX, > - .rx_irq = INT_McBSP1RX, > - .tx_irq = INT_McBSP1TX }, > - [1] = { .virt_base = io_p2v(OMAP1610_MCBSP2_BASE), > - .dma_rx_sync = OMAP_DMA_MCBSP2_RX, > - .dma_tx_sync = OMAP_DMA_MCBSP2_TX, > - .rx_irq = INT_1610_McBSP2_RX, > - .tx_irq = INT_1610_McBSP2_TX }, > - [2] = { .virt_base = OMAP1610_MCBSP3_BASE, > - .dma_rx_sync = OMAP_DMA_MCBSP3_RX, > - .dma_tx_sync = OMAP_DMA_MCBSP3_TX, > - .rx_irq = INT_McBSP3RX, > - .tx_irq = INT_McBSP3TX }, > -}; > -#endif > - > -#if defined(CONFIG_ARCH_OMAP24XX) > -static const struct omap_mcbsp_info mcbsp_24xx[] = { > - [0] = { .virt_base = IO_ADDRESS(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, > - }, > - [1] = { .virt_base = IO_ADDRESS(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, > - }, > -}; > -#endif > + if (!pdata) { > + dev_err(&pdev->dev, "McBSP device initialized without" > + "platform data\n"); > + ret = -EINVAL; > + goto exit; > + } > > -static int __init omap_mcbsp_init(void) > + dev_dbg(&pdev->dev, "Initializing OMAP McBSP (%d).\n", pdev->id); > + > + if (id >= OMAP_MAX_MCBSP_COUNT) { > + dev_err(&pdev->dev, "Invalid McBSP device id (%d)\n", id); > + ret = -EINVAL; > + goto exit; > + } > + > + spin_lock_init(&mcbsp[id].lock); > + mcbsp[id].id = id + 1; > + mcbsp[id].free = 1; > + mcbsp[id].dma_tx_lch = -1; > + mcbsp[id].dma_rx_lch = -1; > + > + mcbsp[id].io_base = pdata->virt_base; > + /* Default I/O is IRQ based */ > + mcbsp[id].io_type = OMAP_MCBSP_IRQ_IO; > + mcbsp[id].tx_irq = pdata->tx_irq; > + mcbsp[id].rx_irq = pdata->rx_irq; > + mcbsp[id].dma_rx_sync = pdata->dma_rx_sync; > + mcbsp[id].dma_tx_sync = pdata->dma_tx_sync; > + > + mcbsp[id].nr_clocks = ARRAY_SIZE(pdata->clocks); > + for (i = 0; i < ARRAY_SIZE(pdata->clocks); i++) > + mcbsp[id].clocks[i] = clk_get(&pdev->dev, pdata->clocks[i]); > + You need to check for the errors with clk_get here. Also, I needed the attached patch to keep asoc working on 24xx. In general, how about create a custom clock for each mcbsp that handles all the other clocks? That way you can have just one struct clk * for each mcbsp and you can use standard clk_enable/disable calls instead of the hard to read macros. You can add the custom clocks to clock fwk with clk_register() during the omap specific mcbsp init depending on which mcbsp's are in use from board-*.c files. Then the custom clock defines it's own enable/disable function that just calls the clk_enable/disable on the right mcbsp clocks. > + mcbsp[id].pdata = pdata; > + mcbsp[id].dev = &pdev->dev; > + platform_set_drvdata(pdev, &mcbsp[id]); > + > +exit: > + return ret; > +} > + > +static int omap_mcbsp_remove(struct platform_device *pdev) > { > - int mcbsp_count = 0, i; > - static const struct omap_mcbsp_info *mcbsp_info; > + struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); > > - printk(KERN_INFO "Initializing OMAP McBSP system\n"); > + platform_set_drvdata(pdev, NULL); > + if (mcbsp) { > + int i; > > -#ifdef CONFIG_ARCH_OMAP1 > - mcbsp_dsp_ck = clk_get(0, "dsp_ck"); > - if (IS_ERR(mcbsp_dsp_ck)) { > - printk(KERN_ERR "mcbsp: could not acquire dsp_ck handle.\n"); > - return PTR_ERR(mcbsp_dsp_ck); > - } > - mcbsp_api_ck = clk_get(0, "api_ck"); > - if (IS_ERR(mcbsp_api_ck)) { > - printk(KERN_ERR "mcbsp: could not acquire api_ck handle.\n"); > - return PTR_ERR(mcbsp_api_ck); > - } > - mcbsp_dspxor_ck = clk_get(0, "dspxor_ck"); > - if (IS_ERR(mcbsp_dspxor_ck)) { > - printk(KERN_ERR "mcbsp: could not acquire dspxor_ck handle.\n"); > - return PTR_ERR(mcbsp_dspxor_ck); > - } > -#endif > -#ifdef CONFIG_ARCH_OMAP2 > - mcbsp1_ick = clk_get(0, "mcbsp1_ick"); > - if (IS_ERR(mcbsp1_ick)) { > - printk(KERN_ERR "mcbsp: could not acquire " > - "mcbsp1_ick handle.\n"); > - return PTR_ERR(mcbsp1_ick); > - } > - mcbsp1_fck = clk_get(0, "mcbsp1_fck"); > - if (IS_ERR(mcbsp1_fck)) { > - printk(KERN_ERR "mcbsp: could not acquire " > - "mcbsp1_fck handle.\n"); > - return PTR_ERR(mcbsp1_fck); > - } > - mcbsp2_ick = clk_get(0, "mcbsp2_ick"); > - if (IS_ERR(mcbsp2_ick)) { > - printk(KERN_ERR "mcbsp: could not acquire " > - "mcbsp2_ick handle.\n"); > - return PTR_ERR(mcbsp2_ick); > - } > - mcbsp2_fck = clk_get(0, "mcbsp2_fck"); > - if (IS_ERR(mcbsp2_fck)) { > - printk(KERN_ERR "mcbsp: could not acquire " > - "mcbsp2_fck handle.\n"); > - return PTR_ERR(mcbsp2_fck); > - } > -#endif > + if (mcbsp->pdata && mcbsp->pdata->ops && > + mcbsp->pdata->ops->free) > + mcbsp->pdata->ops->free(mcbsp->id); > > -#ifdef CONFIG_ARCH_OMAP730 > - if (cpu_is_omap730()) { > - mcbsp_info = mcbsp_730; > - mcbsp_count = ARRAY_SIZE(mcbsp_730); > - } > -#endif > -#ifdef CONFIG_ARCH_OMAP15XX > - if (cpu_is_omap15xx()) { > - mcbsp_info = mcbsp_1510; > - mcbsp_count = ARRAY_SIZE(mcbsp_1510); > - } > -#endif > -#if defined(CONFIG_ARCH_OMAP16XX) > - if (cpu_is_omap16xx()) { > - mcbsp_info = mcbsp_1610; > - mcbsp_count = ARRAY_SIZE(mcbsp_1610); > - } > -#endif > -#if defined(CONFIG_ARCH_OMAP24XX) > - if (cpu_is_omap24xx()) { > - mcbsp_info = mcbsp_24xx; > - mcbsp_count = ARRAY_SIZE(mcbsp_24xx); > - omap2_mcbsp2_mux_setup(); > - } > -#endif > - for (i = 0; i < OMAP_MAX_MCBSP_COUNT ; i++) { > - if (i >= mcbsp_count) { > - mcbsp[i].io_base = 0; > - mcbsp[i].free = 0; > - continue; > - } > - mcbsp[i].id = i + 1; > - mcbsp[i].free = 1; > - mcbsp[i].dma_tx_lch = -1; > - mcbsp[i].dma_rx_lch = -1; > - > - mcbsp[i].io_base = mcbsp_info[i].virt_base; > - /* Default I/O is IRQ based */ > - mcbsp[i].io_type = OMAP_MCBSP_IRQ_IO; > - mcbsp[i].tx_irq = mcbsp_info[i].tx_irq; > - mcbsp[i].rx_irq = mcbsp_info[i].rx_irq; > - mcbsp[i].dma_rx_sync = mcbsp_info[i].dma_rx_sync; > - mcbsp[i].dma_tx_sync = mcbsp_info[i].dma_tx_sync; > - spin_lock_init(&mcbsp[i].lock); > + mcbsp_clk_disable(mcbsp); > + mcbsp_clk_put(mcbsp); > + > + for (i = 0; i < mcbsp->nr_clocks; i++) > + mcbsp->clocks[i] = NULL; > + > + mcbsp->free = 0; > + mcbsp->dev = NULL; > } > > return 0; > } > > -arch_initcall(omap_mcbsp_init); > +static struct platform_driver omap_mcbsp_driver = { > + .probe = omap_mcbsp_probe, > + .remove = omap_mcbsp_remove, > + .driver = { > + .name = "omap-mcbsp", > + }, > +}; > + > +int __init omap_mcbsp_init(void) > +{ > + /* Register the McBSP driver */ > + return platform_driver_register(&omap_mcbsp_driver); > +} > + > + > diff --git a/include/asm-arm/arch-omap/mcbsp.h b/include/asm-arm/arch-omap/mcbsp.h > index b53c3b2..aa47421 100644 > --- a/include/asm-arm/arch-omap/mcbsp.h > +++ b/include/asm-arm/arch-omap/mcbsp.h > @@ -24,7 +24,11 @@ > #ifndef __ASM_ARCH_OMAP_MCBSP_H > #define __ASM_ARCH_OMAP_MCBSP_H > > +#include <linux/completion.h> > +#include <linux/spinlock.h> > + > #include <asm/hardware.h> > +#include <asm/arch/clock.h> > > #define OMAP730_MCBSP1_BASE 0xfffb1000 > #define OMAP730_MCBSP2_BASE 0xfffb1800 > @@ -40,6 +44,9 @@ > #define OMAP24XX_MCBSP1_BASE 0x48074000 > #define OMAP24XX_MCBSP2_BASE 0x48076000 > > +#define OMAP34XX_MCBSP1_BASE 0x48074000 > +#define OMAP34XX_MCBSP2_BASE 0x49022000 > + > #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730) > > #define OMAP_MCBSP_REG_DRR2 0x00 > @@ -74,7 +81,8 @@ > #define OMAP_MCBSP_REG_XCERG 0x3A > #define OMAP_MCBSP_REG_XCERH 0x3C > > -#define OMAP_MAX_MCBSP_COUNT 3 > +#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) > @@ -117,7 +125,8 @@ > #define OMAP_MCBSP_REG_XCERG 0x74 > #define OMAP_MCBSP_REG_XCERH 0x78 > > -#define OMAP_MAX_MCBSP_COUNT 2 > +#define OMAP_MAX_MCBSP_COUNT 2 > +#define MAX_MCBSP_CLOCKS 2 > > #define AUDIO_MCBSP_DATAWRITE (OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR1) > #define AUDIO_MCBSP_DATAREAD (OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR1) > @@ -298,6 +307,66 @@ struct omap_mcbsp_spi_cfg { > omap_mcbsp_word_length word_length; > }; > > +/* Platform specific configuration */ > +struct omap_mcbsp_ops { > + void (*request)(unsigned int); > + void (*free)(unsigned int); > + int (*check)(unsigned int); > +}; > + > +struct omap_mcbsp_platform_data { > + u32 virt_base; > + u8 dma_rx_sync, dma_tx_sync; > + u16 rx_irq, tx_irq; > + struct omap_mcbsp_ops *ops; > + char const *clocks[MAX_MCBSP_CLOCKS]; > +}; > + > +struct omap_mcbsp { > + struct device *dev; > + u32 io_base; > + u8 id; > + u8 free; > + omap_mcbsp_word_length rx_word_length; > + omap_mcbsp_word_length tx_word_length; > + > + omap_mcbsp_io_type_t io_type; /* IRQ or poll */ > + /* IRQ based TX/RX */ > + int rx_irq; > + int tx_irq; > + > + /* DMA stuff */ > + u8 dma_rx_sync; > + short dma_rx_lch; > + u8 dma_tx_sync; > + short dma_tx_lch; > + > + /* Completion queues */ > + struct completion tx_irq_completion; > + struct completion rx_irq_completion; > + struct completion tx_dma_completion; > + struct completion rx_dma_completion; > + > + /* Protect the field .free, while checking if the mcbsp is in use */ > + spinlock_t lock; > + struct omap_mcbsp_platform_data *pdata; > + int nr_clocks; > + struct clk *clocks[MAX_MCBSP_CLOCKS]; > +}; > + > +#define __mcbsp_clk_op(mcbsp, op) \ > + do { \ > + int i; \ > + for (i = 0; i < mcbsp->nr_clocks; i++) \ > + clk_##op(mcbsp->clocks[i]); \ > + } while (0) > +#define mcbsp_clk_enable(mcbsp) __mcbsp_clk_op((mcbsp), enable) > +#define mcbsp_clk_disable(mcbsp) __mcbsp_clk_op((mcbsp), disable) > +#define mcbsp_clk_put(mcbsp) __mcbsp_clk_op((mcbsp), put) > + These macros make things hard to read.. It would be best to have things set up in a way so you can just call clk_enable/disable in mcbsp.c. Tony > +int omap_mcbsp_init(void); > +void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, > + int size); > void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config); > int omap_mcbsp_request(unsigned int id); > void omap_mcbsp_free(unsigned int id); > -- > 1.5.5.1.67.gbdb8.dirty > [-- Attachment #2: 24xx-mcbsp-clocks.patch --] [-- Type: text/x-diff, Size: 3223 bytes --] >From d73a8241df49e45e57f96a807c11487b88f18c45 Mon Sep 17 00:00:00 2001 From: Tony Lindgren <tony@atomide.com> Date: Tue, 20 May 2008 16:32:49 -0700 Subject: [PATCH] ARM: OMAP: Fix 24xx mcbsp clocks Fix 24xx mcbsp clocks Signed-off-by: Tony Lindgren <tony@atomide.com> diff --git a/arch/arm/mach-omap2/clock24xx.h b/arch/arm/mach-omap2/clock24xx.h index c439be8..be4e255 100644 --- a/arch/arm/mach-omap2/clock24xx.h +++ b/arch/arm/mach-omap2/clock24xx.h @@ -1754,7 +1754,8 @@ static struct clk gpt12_fck = { }; static struct clk mcbsp1_ick = { - .name = "mcbsp1_ick", + .name = "mcbsp_ick", + .id = 1, .parent = &l4_ck, .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), @@ -1763,7 +1764,8 @@ static struct clk mcbsp1_ick = { }; static struct clk mcbsp1_fck = { - .name = "mcbsp1_fck", + .name = "mcbsp_fck", + .id = 1, .parent = &func_96m_ck, .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), @@ -1772,7 +1774,8 @@ static struct clk mcbsp1_fck = { }; static struct clk mcbsp2_ick = { - .name = "mcbsp2_ick", + .name = "mcbsp_ick", + .id = 2, .parent = &l4_ck, .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), @@ -1781,7 +1784,8 @@ static struct clk mcbsp2_ick = { }; static struct clk mcbsp2_fck = { - .name = "mcbsp2_fck", + .name = "mcbsp_fck", + .id = 2, .parent = &func_96m_ck, .flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X, .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), @@ -1790,7 +1794,8 @@ static struct clk mcbsp2_fck = { }; static struct clk mcbsp3_ick = { - .name = "mcbsp3_ick", + .name = "mcbsp_ick", + .id = 3, .parent = &l4_ck, .flags = CLOCK_IN_OMAP243X, .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2), @@ -1799,7 +1804,8 @@ static struct clk mcbsp3_ick = { }; static struct clk mcbsp3_fck = { - .name = "mcbsp3_fck", + .name = "mcbsp_fck", + .id = 3, .parent = &func_96m_ck, .flags = CLOCK_IN_OMAP243X, .enable_reg = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2), @@ -1808,7 +1814,8 @@ static struct clk mcbsp3_fck = { }; static struct clk mcbsp4_ick = { - .name = "mcbsp4_ick", + .name = "mcbsp_ick", + .id = 4, .parent = &l4_ck, .flags = CLOCK_IN_OMAP243X, .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2), @@ -1817,7 +1824,8 @@ static struct clk mcbsp4_ick = { }; static struct clk mcbsp4_fck = { - .name = "mcbsp4_fck", + .name = "mcbsp_fck", + .id = 4, .parent = &func_96m_ck, .flags = CLOCK_IN_OMAP243X, .enable_reg = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2), @@ -1826,7 +1834,8 @@ static struct clk mcbsp4_fck = { }; static struct clk mcbsp5_ick = { - .name = "mcbsp5_ick", + .name = "mcbsp_ick", + .id = 5, .parent = &l4_ck, .flags = CLOCK_IN_OMAP243X, .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2), @@ -1835,7 +1844,8 @@ static struct clk mcbsp5_ick = { }; static struct clk mcbsp5_fck = { - .name = "mcbsp5_fck", + .name = "mcbsp_fck", + .id = 5, .parent = &func_96m_ck, .flags = CLOCK_IN_OMAP243X, .enable_reg = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2), ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 1/4] PLAT-OMAP: MCBSP: Tranform into platform driver 2008-05-20 23:44 ` Tony Lindgren @ 2008-05-29 15:30 ` Eduardo Valentin 0 siblings, 0 replies; 17+ messages in thread From: Eduardo Valentin @ 2008-05-29 15:30 UTC (permalink / raw) To: Tony Lindgren; +Cc: linux-omap, Chandra shekhar, Eduardo Valentin Hi Tony and Trilok, I was out of office this last week due to some trainings and brazilian holidays, so that's why this message is delayed. I'm sending a version of this series including your patch and your comments. Please review them as usual. I think that Chandra can still put his work on top of this as the change is not that big. On Tue, May 20, 2008 at 7:44 PM, Tony Lindgren <tony@atomide.com> wrote: > Hi, > > Some comments below. <snip> > > You need to check for the errors with clk_get here. Also, I needed the > attached patch to keep asoc working on 24xx. Ok. Including your patch to the series. Forgot to change this to 24xx clocks. > > In general, how about create a custom clock for each mcbsp that handles > all the other clocks? That way you can have just one struct clk * for > each mcbsp and you can use standard clk_enable/disable calls instead > of the hard to read macros. > > You can add the custom clocks to clock fwk with clk_register() during > the omap specific mcbsp init depending on which mcbsp's are in use > from board-*.c files. Then the custom clock defines it's own > enable/disable function that just calls the clk_enable/disable on the > right mcbsp clocks. > > <snip> > These macros make things hard to read.. It would be best to have > things set up in a way so you can just call clk_enable/disable in > mcbsp.c. I thought to do it as you describe above but I made it different to avoid duplicated code into mach-omap1 and mach-omap2. However, as you said the code became too hard to understand, I believe it is better to make it simple. I'm going to send a new version of this series including: 1. your patch to 24xx 2. clock changes for mach-omap1 and mach-omap2 3. module release for mach-omap1 and mach-omap2 as recommended by Trilok > > Tony > > >> +int omap_mcbsp_init(void); >> +void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, >> + int size); >> void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config); >> int omap_mcbsp_request(unsigned int id); >> void omap_mcbsp_free(unsigned int id); >> -- >> 1.5.5.1.67.gbdb8.dirty >> > -- Eduardo Bezerra Valentin ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 0/4] Updates on mcbsp driver (take #2) 2008-05-05 21:23 [PATCH 0/4] Updates on mcbsp driver (take #2) Eduardo Valentin 2008-05-05 21:23 ` [PATCH 1/4] PLAT-OMAP: MCBSP: Tranform into platform driver Eduardo Valentin @ 2008-05-16 15:54 ` Tony Lindgren 2008-05-19 14:26 ` Steve Sakoman ` (2 subsequent siblings) 4 siblings, 0 replies; 17+ messages in thread From: Tony Lindgren @ 2008-05-16 15:54 UTC (permalink / raw) To: Eduardo Valentin, Chandra shekhar; +Cc: linux-omap Hi, * Eduardo Valentin <edubezval@gmail.com> [080505 14:24]: > From: Eduardo Valentin <eduardo.valentin@indt.org.br> > > Hi Tony, > > Here is the updated version of my previous patches. > DMA and IRQ definitions were left as they are. Chandra is going > to send his work on top of this series. > > This patch series updates mcbsp driver by transforming it into > a platform driver. This is a very initial implementation. > Basically it moves machine specific code to their correct place > and creates the platform driver necessary structures. > > It must be working for previous boards. For omap34xx it should > work for mcbsp 1 and 2. > > In order to do not break other places, I tryied to do not change > previous API. But future improvements are needed. > > Clock definitions for mcbsp 1 and 2 were also modified to add > correct support for omap34xx. > > Comments are wellcome. Chandra, do these patches look OK to you from your patches point of view? Tony > > Cheers, > > > Eduardo Valentin (4): > PLAT-OMAP: MCBSP: Tranform into platform driver > MACH-OMAP1: MCBSP: Add support for mcbsp on mach-omap1 > Fix mcbsp clock definition on clock34xx.h > MACH-OMAP2: MCBSP: Add support for mcbsp on mach-omap2 > > arch/arm/mach-omap1/Makefile | 2 + > arch/arm/mach-omap1/mcbsp.c | 165 +++++++++ > arch/arm/mach-omap2/Makefile | 2 + > arch/arm/mach-omap2/clock34xx.h | 30 ++- > arch/arm/mach-omap2/mcbsp.c | 105 ++++++ > arch/arm/plat-omap/devices.c | 45 +++ > arch/arm/plat-omap/mcbsp.c | 660 ++++++++++++++----------------------- > include/asm-arm/arch-omap/mcbsp.h | 73 ++++- > 8 files changed, 661 insertions(+), 421 deletions(-) > create mode 100644 arch/arm/mach-omap1/mcbsp.c > create mode 100644 arch/arm/mach-omap2/mcbsp.c > ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 0/4] Updates on mcbsp driver (take #2) 2008-05-05 21:23 [PATCH 0/4] Updates on mcbsp driver (take #2) Eduardo Valentin 2008-05-05 21:23 ` [PATCH 1/4] PLAT-OMAP: MCBSP: Tranform into platform driver Eduardo Valentin 2008-05-16 15:54 ` [PATCH 0/4] Updates on mcbsp driver (take #2) Tony Lindgren @ 2008-05-19 14:26 ` Steve Sakoman 2008-05-19 15:09 ` Eduardo Valentin 2008-05-20 6:47 ` Chandra shekhar 2008-05-20 18:27 ` Koen Kooi 4 siblings, 1 reply; 17+ messages in thread From: Steve Sakoman @ 2008-05-19 14:26 UTC (permalink / raw) To: Eduardo Valentin Cc: linux-omap, Tony Lindgren, Chandra shekhar, Eduardo Valentin What's the current status of this patch series? Haven't seen too much discussion. I've started work on a SoC driver for the OMAP3 EVM and want to make sure I'm using the latest. Regards, Steve On Mon, May 5, 2008 at 2:23 PM, Eduardo Valentin <edubezval@gmail.com> wrote: > From: Eduardo Valentin <eduardo.valentin@indt.org.br> > > Hi Tony, > > Here is the updated version of my previous patches. > DMA and IRQ definitions were left as they are. Chandra is going > to send his work on top of this series. > > This patch series updates mcbsp driver by transforming it into > a platform driver. This is a very initial implementation. > Basically it moves machine specific code to their correct place > and creates the platform driver necessary structures. > > It must be working for previous boards. For omap34xx it should > work for mcbsp 1 and 2. > > In order to do not break other places, I tryied to do not change > previous API. But future improvements are needed. > > Clock definitions for mcbsp 1 and 2 were also modified to add > correct support for omap34xx. > > Comments are wellcome. > > Cheers, > > > Eduardo Valentin (4): > PLAT-OMAP: MCBSP: Tranform into platform driver > MACH-OMAP1: MCBSP: Add support for mcbsp on mach-omap1 > Fix mcbsp clock definition on clock34xx.h > MACH-OMAP2: MCBSP: Add support for mcbsp on mach-omap2 > > arch/arm/mach-omap1/Makefile | 2 + > arch/arm/mach-omap1/mcbsp.c | 165 +++++++++ > arch/arm/mach-omap2/Makefile | 2 + > arch/arm/mach-omap2/clock34xx.h | 30 ++- > arch/arm/mach-omap2/mcbsp.c | 105 ++++++ > arch/arm/plat-omap/devices.c | 45 +++ > arch/arm/plat-omap/mcbsp.c | 660 ++++++++++++++----------------------- > include/asm-arm/arch-omap/mcbsp.h | 73 ++++- > 8 files changed, 661 insertions(+), 421 deletions(-) > create mode 100644 arch/arm/mach-omap1/mcbsp.c > create mode 100644 arch/arm/mach-omap2/mcbsp.c > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 0/4] Updates on mcbsp driver (take #2) 2008-05-19 14:26 ` Steve Sakoman @ 2008-05-19 15:09 ` Eduardo Valentin 2008-05-20 11:21 ` Jarkko Nikula 0 siblings, 1 reply; 17+ messages in thread From: Eduardo Valentin @ 2008-05-19 15:09 UTC (permalink / raw) To: Steve Sakoman Cc: linux-omap, Tony Lindgren, Chandra shekhar, Eduardo Valentin Hi Steve, This series is basically a simple transformation of currect mcbsp code to a platform driver and a separation of machine specific code. It should work for omap1 and omap2 (what is currently supported). But it should add basic support for omap3 mcbps 1 and 2. Chandra will send his patches on top of this series to add more features for omap3. On Mon, May 19, 2008 at 10:26 AM, Steve Sakoman <sakoman@gmail.com> wrote: > What's the current status of this patch series? Haven't seen too much > discussion. > > I've started work on a SoC driver for the OMAP3 EVM and want to make > sure I'm using the latest. > > Regards, > > Steve > > On Mon, May 5, 2008 at 2:23 PM, Eduardo Valentin <edubezval@gmail.com> wrote: >> From: Eduardo Valentin <eduardo.valentin@indt.org.br> >> >> Hi Tony, >> >> Here is the updated version of my previous patches. >> DMA and IRQ definitions were left as they are. Chandra is going >> to send his work on top of this series. >> >> This patch series updates mcbsp driver by transforming it into >> a platform driver. This is a very initial implementation. >> Basically it moves machine specific code to their correct place >> and creates the platform driver necessary structures. >> >> It must be working for previous boards. For omap34xx it should >> work for mcbsp 1 and 2. >> >> In order to do not break other places, I tryied to do not change >> previous API. But future improvements are needed. >> >> Clock definitions for mcbsp 1 and 2 were also modified to add >> correct support for omap34xx. >> >> Comments are wellcome. >> >> Cheers, >> >> >> Eduardo Valentin (4): >> PLAT-OMAP: MCBSP: Tranform into platform driver >> MACH-OMAP1: MCBSP: Add support for mcbsp on mach-omap1 >> Fix mcbsp clock definition on clock34xx.h >> MACH-OMAP2: MCBSP: Add support for mcbsp on mach-omap2 >> >> arch/arm/mach-omap1/Makefile | 2 + >> arch/arm/mach-omap1/mcbsp.c | 165 +++++++++ >> arch/arm/mach-omap2/Makefile | 2 + >> arch/arm/mach-omap2/clock34xx.h | 30 ++- >> arch/arm/mach-omap2/mcbsp.c | 105 ++++++ >> arch/arm/plat-omap/devices.c | 45 +++ >> arch/arm/plat-omap/mcbsp.c | 660 ++++++++++++++----------------------- >> include/asm-arm/arch-omap/mcbsp.h | 73 ++++- >> 8 files changed, 661 insertions(+), 421 deletions(-) >> create mode 100644 arch/arm/mach-omap1/mcbsp.c >> create mode 100644 arch/arm/mach-omap2/mcbsp.c >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-omap" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> > -- Eduardo Bezerra Valentin ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 0/4] Updates on mcbsp driver (take #2) 2008-05-19 15:09 ` Eduardo Valentin @ 2008-05-20 11:21 ` Jarkko Nikula 2008-06-12 19:14 ` Steve Sakoman 0 siblings, 1 reply; 17+ messages in thread From: Jarkko Nikula @ 2008-05-20 11:21 UTC (permalink / raw) To: ext Eduardo Valentin Cc: Steve Sakoman, linux-omap, Tony Lindgren, Chandra shekhar, Eduardo Valentin [-- Attachment #1: Type: text/plain, Size: 753 bytes --] On Mon, 19 May 2008 11:09:43 -0400 "ext Eduardo Valentin" <edubezval@gmail.com> wrote: > Hi Steve, > > This series is basically a simple transformation of currect mcbsp code > to a platform > driver and a separation of machine specific code. > > It should work for omap1 and omap2 (what is currently supported). But > it should add basic support for omap3 > mcbps 1 and 2. Chandra will send his patches on top of this series to > add more features for omap3. > For those who are keen to try ASoC on OMAP3 might want to try attached patch on top of Eduardo's set. I'll prepare better one when there are more ports defined. E.g. there is no need to separe omap34xx_dma_regs table since request numbers are the same between OMAP2 and OMAP3. Jarkko [-- Attachment #2: 0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch --] [-- Type: text/x-diff, Size: 1985 bytes --] >From a1dbb6dd28e9815a307b87b8d96dcf371d6cfd58 Mon Sep 17 00:00:00 2001 From: Jarkko Nikula <jarkko.nikula@nokia.com> Date: Mon, 19 May 2008 13:24:41 +0300 Subject: [PATCH] ASoC: OMAP: Add basic support for OMAP34xx in McBSP DAI driver This adds support for OMAP34xx McBSP port 1 and 2. Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> --- sound/soc/omap/omap-mcbsp.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 40d87e6..8e6ec9d 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -99,6 +99,21 @@ static const unsigned long omap2420_mcbsp_port[][2] = { static const int omap2420_dma_reqs[][2] = {}; static const unsigned long omap2420_mcbsp_port[][2] = {}; #endif +#if defined(CONFIG_ARCH_OMAP34XX) +static const int omap34xx_dma_reqs[][2] = { + { OMAP24XX_DMA_MCBSP1_TX, OMAP24XX_DMA_MCBSP1_RX }, + { OMAP24XX_DMA_MCBSP2_TX, OMAP24XX_DMA_MCBSP2_RX }, +}; +static const unsigned long omap34xx_mcbsp_port[][2] = { + { OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR2, + OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR2 }, + { OMAP34XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR2, + OMAP34XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR2 }, +}; +#else +static const int omap34xx_dma_reqs[][2] = {}; +static const unsigned long omap34xx_mcbsp_port[][2] = {}; +#endif static int omap_mcbsp_dai_startup(struct snd_pcm_substream *substream) { @@ -169,9 +184,12 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, } else if (cpu_is_omap2420()) { dma = omap2420_dma_reqs[bus_id][substream->stream]; port = omap2420_mcbsp_port[bus_id][substream->stream]; + } else if (cpu_is_omap343x()) { + dma = omap34xx_dma_reqs[bus_id][substream->stream]; + port = omap34xx_mcbsp_port[bus_id][substream->stream]; } else { /* - * TODO: Add support for 2430 and 3430 + * TODO: Add support for 2430 */ return -ENODEV; } -- 1.5.5.1 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 0/4] Updates on mcbsp driver (take #2) 2008-05-20 11:21 ` Jarkko Nikula @ 2008-06-12 19:14 ` Steve Sakoman 2008-06-13 6:31 ` Jarkko Nikula 0 siblings, 1 reply; 17+ messages in thread From: Steve Sakoman @ 2008-06-12 19:14 UTC (permalink / raw) To: Jarkko Nikula Cc: ext Eduardo Valentin, linux-omap, Tony Lindgren, Chandra shekhar, Eduardo Valentin Jarkko, I've been using this patch with good results while developing an alsa soc driver for the 35XX EVM and beagleboard. Do you have plans to to officially submit this patch (or a more recent version of it)? Steve On Tue, May 20, 2008 at 4:21 AM, Jarkko Nikula <jarkko.nikula@nokia.com> wrote: > On Mon, 19 May 2008 11:09:43 -0400 > "ext Eduardo Valentin" <edubezval@gmail.com> wrote: > >> Hi Steve, >> >> This series is basically a simple transformation of currect mcbsp code >> to a platform >> driver and a separation of machine specific code. >> >> It should work for omap1 and omap2 (what is currently supported). But >> it should add basic support for omap3 >> mcbps 1 and 2. Chandra will send his patches on top of this series to >> add more features for omap3. >> > For those who are keen to try ASoC on OMAP3 might want to try attached > patch on top of Eduardo's set. > > I'll prepare better one when there are more ports defined. E.g. > there is no need to separe omap34xx_dma_regs table since request > numbers are the same between OMAP2 and OMAP3. > > > Jarkko > ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 0/4] Updates on mcbsp driver (take #2) 2008-06-12 19:14 ` Steve Sakoman @ 2008-06-13 6:31 ` Jarkko Nikula 0 siblings, 0 replies; 17+ messages in thread From: Jarkko Nikula @ 2008-06-13 6:31 UTC (permalink / raw) To: ext Steve Sakoman Cc: ext Eduardo Valentin, linux-omap, Tony Lindgren, Chandra shekhar, Eduardo Valentin On Thu, 12 Jun 2008 12:14:08 -0700 "ext Steve Sakoman" <sakoman@gmail.com> wrote: > Jarkko, > > I've been using this patch with good results while developing an alsa > soc driver for the 35XX EVM and beagleboard. > > Do you have plans to to officially submit this patch (or a more recent > version of it)? > This is nice to hear :-) Definitely it will be submitted. Currently not possible since McBSP changes are not in mainstream yet but I'll do early patch releases when needed so people can do their development. Eduardo, any news adding support for additional ports in McBSP? It would be nice to add those five 2430 & 3430 ports at once to omap-mcbsp.c. Jarkko ^ permalink raw reply [flat|nested] 17+ messages in thread
* RE: [PATCH 0/4] Updates on mcbsp driver (take #2) 2008-05-05 21:23 [PATCH 0/4] Updates on mcbsp driver (take #2) Eduardo Valentin ` (2 preceding siblings ...) 2008-05-19 14:26 ` Steve Sakoman @ 2008-05-20 6:47 ` Chandra shekhar 2008-05-20 18:27 ` Koen Kooi 4 siblings, 0 replies; 17+ messages in thread From: Chandra shekhar @ 2008-05-20 6:47 UTC (permalink / raw) To: 'Eduardo Valentin', linux-omap Cc: 'Tony Lindgren', 'Eduardo Valentin' Acking mcbsp patch which transforms cureent mcbsp into a platform driver. Regards, Chandra > -----Original Message----- > From: Eduardo Valentin [mailto:edubezval@gmail.com] > Sent: Tuesday, May 06, 2008 2:53 AM > To: linux-omap@vger.kernel.org > Cc: Tony Lindgren; Chandra shekhar; Eduardo Valentin > Subject: [PATCH 0/4] Updates on mcbsp driver (take #2) > > From: Eduardo Valentin <eduardo.valentin@indt.org.br> > > Hi Tony, > > Here is the updated version of my previous patches. > DMA and IRQ definitions were left as they are. Chandra is > going to send his work on top of this series. > > This patch series updates mcbsp driver by transforming it > into a platform driver. This is a very initial implementation. > Basically it moves machine specific code to their correct > place and creates the platform driver necessary structures. > > It must be working for previous boards. For omap34xx it > should work for mcbsp 1 and 2. > > In order to do not break other places, I tryied to do not > change previous API. But future improvements are needed. > > Clock definitions for mcbsp 1 and 2 were also modified to > add correct support for omap34xx. > > Comments are wellcome. > > Cheers, > > > Eduardo Valentin (4): > PLAT-OMAP: MCBSP: Tranform into platform driver > MACH-OMAP1: MCBSP: Add support for mcbsp on mach-omap1 > Fix mcbsp clock definition on clock34xx.h > MACH-OMAP2: MCBSP: Add support for mcbsp on mach-omap2 > > arch/arm/mach-omap1/Makefile | 2 + > arch/arm/mach-omap1/mcbsp.c | 165 +++++++++ > arch/arm/mach-omap2/Makefile | 2 + > arch/arm/mach-omap2/clock34xx.h | 30 ++- > arch/arm/mach-omap2/mcbsp.c | 105 ++++++ > arch/arm/plat-omap/devices.c | 45 +++ > arch/arm/plat-omap/mcbsp.c | 660 > ++++++++++++++----------------------- > include/asm-arm/arch-omap/mcbsp.h | 73 ++++- > 8 files changed, 661 insertions(+), 421 deletions(-) create > mode 100644 arch/arm/mach-omap1/mcbsp.c create mode 100644 > arch/arm/mach-omap2/mcbsp.c > > ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 0/4] Updates on mcbsp driver (take #2) 2008-05-05 21:23 [PATCH 0/4] Updates on mcbsp driver (take #2) Eduardo Valentin ` (3 preceding siblings ...) 2008-05-20 6:47 ` Chandra shekhar @ 2008-05-20 18:27 ` Koen Kooi 4 siblings, 0 replies; 17+ messages in thread From: Koen Kooi @ 2008-05-20 18:27 UTC (permalink / raw) To: linux-omap; +Cc: Chandra shekhar, Eduardo Valentin -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Op 5 mei 2008, om 23:23 heeft Eduardo Valentin het volgende geschreven: > From: Eduardo Valentin <eduardo.valentin@indt.org.br> > > Hi Tony, > > Here is the updated version of my previous patches. > DMA and IRQ definitions were left as they are. Chandra is going > to send his work on top of this series. > > This patch series updates mcbsp driver by transforming it into > a platform driver. This is a very initial implementation. > Basically it moves machine specific code to their correct place > and creates the platform driver necessary structures. > > It must be working for previous boards. For omap34xx it should > work for mcbsp 1 and 2. > > In order to do not break other places, I tryied to do not change > previous API. But future improvements are needed. > > Clock definitions for mcbsp 1 and 2 were also modified to add > correct support for omap34xx. > > Comments are wellcome. These patches seem to be working fine on my OMAP3 beagleboard with 2.6.26rc3 from linux-omap git. regards, Koen -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Darwin) iD8DBQFIMxgxMkyGM64RGpERAriKAKCQdklfDCnr4JGDkS4crbsaqpigSgCdGcn8 7PPzc3KzWyXXV0sMOU6/Bnk= =3tNi -----END PGP SIGNATURE----- ^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2008-06-13 6:31 UTC | newest] Thread overview: 17+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-05-05 21:23 [PATCH 0/4] Updates on mcbsp driver (take #2) Eduardo Valentin 2008-05-05 21:23 ` [PATCH 1/4] PLAT-OMAP: MCBSP: Tranform into platform driver Eduardo Valentin 2008-05-05 21:23 ` [PATCH 2/4] MACH-OMAP1: MCBSP: Add support for mcbsp on mach-omap1 Eduardo Valentin 2008-05-05 21:23 ` [PATCH 3/4] Fix mcbsp clock definition on clock34xx.h Eduardo Valentin 2008-05-05 21:23 ` [PATCH 4/4] MACH-OMAP2: MCBSP: Add support for mcbsp on mach-omap2 Eduardo Valentin 2008-05-08 11:23 ` [PATCH 1/4] PLAT-OMAP: MCBSP: Tranform into platform driver Trilok Soni 2008-05-08 12:13 ` Eduardo Valentin 2008-05-20 23:44 ` Tony Lindgren 2008-05-29 15:30 ` Eduardo Valentin 2008-05-16 15:54 ` [PATCH 0/4] Updates on mcbsp driver (take #2) Tony Lindgren 2008-05-19 14:26 ` Steve Sakoman 2008-05-19 15:09 ` Eduardo Valentin 2008-05-20 11:21 ` Jarkko Nikula 2008-06-12 19:14 ` Steve Sakoman 2008-06-13 6:31 ` Jarkko Nikula 2008-05-20 6:47 ` Chandra shekhar 2008-05-20 18:27 ` Koen Kooi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox