Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc5d0c89 authored by Eduardo Valentin's avatar Eduardo Valentin Committed by Tony Lindgren
Browse files

ARM: OMAP: McBSP: Prepare for splitting into omap1 and omap2 code 



This patch transform mcbsp code to use platform data
from arch/arm/plat-omap/devices.c

It also gets ride of ifdefs on mcbsp.c code.
To do it, a platform data structure was defined.

Signed-off-by: default avatarEduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent fb78d808

arch/arm/plat-omap/devices.c

+48 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/arch/mux.h>

#include <asm/arch/gpio.h>

#include <asm/arch/menelaus.h>

#include <asm/arch/mcbsp.h>



#if	defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
@@ -144,6 +145,53 @@ static void omap_init_kp(void) 
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;



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;

	}



	omap_mcbsp_devices = kzalloc(size * sizeof(struct platform_device *),

				     GFP_KERNEL);

	if (!omap_mcbsp_devices) {

		printk(KERN_ERR "Could not register McBSP devices\n");

		return;

	}



	for (i = 0; i < size; i++) {

		struct platform_device *new_mcbsp;

		int ret;



		new_mcbsp = platform_device_alloc("omap-mcbsp", i + 1);

		if (!new_mcbsp)

			continue;

		new_mcbsp->dev.platform_data = &config[i];

		ret = platform_device_add(new_mcbsp);

		if (ret) {

			platform_device_put(new_mcbsp);

			continue;

		}

		omap_mcbsp_devices[i] = new_mcbsp;

	}

}



#else

void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,

					int size)

{  }

#endif



/*-------------------------------------------------------------------------*/



#if	defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)

arch/arm/plat-omap/mcbsp.c

+253 −409

File changed.

Preview size limit exceeded, changes collapsed.

include/asm-arm/arch-omap/mcbsp.h

+60 −2
Original line number Diff line number Diff line
@@ -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
@@ -75,6 +82,7 @@ 
#define OMAP_MCBSP_REG_XCERH	0x3C



#define OMAP_MAX_MCBSP_COUNT	3

#define MAX_MCBSP_CLOCKS	3



#define AUDIO_MCBSP_DATAWRITE	(OMAP1510_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1)

#define AUDIO_MCBSP_DATAREAD	(OMAP1510_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1)
@@ -118,6 +126,7 @@ 
#define OMAP_MCBSP_REG_XCERH	0x78



#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,55 @@ 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 *clk_name;

};



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;

	struct clk *clk;

};



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);