Commit 45656b44 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Liam Girdwood
Browse files

ASoC: omap-mcbsp: Create a single driver for McBSP 



The OMAP McBSP driver stack used to contain two different
drivers. One of them was used as kind low-level access to
the IP, while the other driver was the ASoC DAI driver.
There were global, shared structures, in different places,
the McBSP instances are reffered with id numbers (sometimes
0 based, in other cases 1 based id numbers).

Create one single driver for OMAP McBSP with name: omap-mcbsp.
Convert the old omap-mcbsp driver initially to be a library
for the omap-mcbsp DAI driver. With this change we can get rid
of all global variables, structures.

Further cleanup is coming...

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: default avatarGrazvydas Ignotas <notasas@gmail.com>
Tested-by: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: default avatarLiam Girdwood <lrg@ti.com>
parent 219f4316

arch/arm/mach-omap1/mcbsp.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -419,18 +419,6 @@ static int __init omap1_mcbsp_init(void) 
	if (!cpu_class_is_omap1())

	if (!cpu_class_is_omap1())

		return -ENODEV;

		return -ENODEV;





	if (cpu_is_omap7xx())

		omap_mcbsp_count = OMAP7XX_MCBSP_COUNT;

	else if (cpu_is_omap15xx())

		omap_mcbsp_count = OMAP15XX_MCBSP_COUNT;

	else if (cpu_is_omap16xx())

		omap_mcbsp_count = OMAP16XX_MCBSP_COUNT;



	mcbsp_ptr = kzalloc(omap_mcbsp_count * sizeof(struct omap_mcbsp *),

								GFP_KERNEL);

	if (!mcbsp_ptr)

		return -ENOMEM;



	if (cpu_is_omap7xx())

	if (cpu_is_omap7xx())

		omap_mcbsp_register_board_cfg(omap7xx_mcbsp_res_0,

		omap_mcbsp_register_board_cfg(omap7xx_mcbsp_res_0,

					OMAP7XX_MCBSP_RES_SZ,

					OMAP7XX_MCBSP_RES_SZ,

arch/arm/mach-omap2/mcbsp.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -180,7 +180,6 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused) 
					name, oh->name);

					name, oh->name);

		return PTR_ERR(pdev);

		return PTR_ERR(pdev);

	}

	}

	omap_mcbsp_count++;

	return 0;

	return 0;

}

}
@@ -188,11 +187,6 @@ static int __init omap2_mcbsp_init(void) 
{

{

	omap_hwmod_for_each_by_class("mcbsp", omap_init_mcbsp, NULL);

	omap_hwmod_for_each_by_class("mcbsp", omap_init_mcbsp, NULL);





	mcbsp_ptr = kzalloc(omap_mcbsp_count * sizeof(struct omap_mcbsp *),

								GFP_KERNEL);

	if (!mcbsp_ptr)

		return -ENOMEM;



	return 0;

	return 0;

}

}

arch_initcall(omap2_mcbsp_init);
 
arch_initcall(omap2_mcbsp_init);

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

+0 −40
Original line number Original line Diff line number Diff line
@@ -70,43 +70,6 @@ struct omap_mcbsp_platform_data { 
	int (*mux_signal)(struct device *dev, const char *signal, const char *src);

	int (*mux_signal)(struct device *dev, const char *signal, const char *src);

};

};





struct omap_mcbsp_st_data {

	void __iomem *io_base_st;

	bool running;

	bool enabled;

	s16 taps[128];	/* Sidetone filter coefficients */

	int nr_taps;	/* Number of filter coefficients in use */

	s16 ch0gain;

	s16 ch1gain;

};



struct omap_mcbsp {

	struct device *dev;

	unsigned long phys_base;

	unsigned long phys_dma_base;

	void __iomem *io_base;

	u8 id;

	u8 free;



	int rx_irq;

	int tx_irq;



	/* DMA stuff */

	u8 dma_rx_sync;

	u8 dma_tx_sync;



	/* Protect the field .free, while checking if the mcbsp is in use */

	spinlock_t lock;

	struct omap_mcbsp_platform_data *pdata;

	struct clk *fclk;

	struct omap_mcbsp_st_data *st_data;

	int dma_op_mode;

	u16 max_tx_thres;

	u16 max_rx_thres;

	void *reg_cache;

	int reg_cache_size;

};



/**

/**

 * omap_mcbsp_dev_attr - OMAP McBSP device attributes for omap_hwmod

 * omap_mcbsp_dev_attr - OMAP McBSP device attributes for omap_hwmod

 * @sidetone: name of the sidetone device

 * @sidetone: name of the sidetone device
@@ -115,7 +78,4 @@ struct omap_mcbsp_dev_attr { 
	const char *sidetone;

	const char *sidetone;

};

};





extern struct omap_mcbsp **mcbsp_ptr;

extern int omap_mcbsp_count;



#endif
 
#endif

sound/soc/omap/am3517evm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -95,7 +95,7 @@ static const struct snd_soc_dapm_route audio_map[] = { 
static struct snd_soc_dai_link am3517evm_dai = {

static struct snd_soc_dai_link am3517evm_dai = {

	.name = "TLV320AIC23",

	.name = "TLV320AIC23",

	.stream_name = "AIC23",

	.stream_name = "AIC23",

	.cpu_dai_name ="omap-mcbsp-dai.0",

	.cpu_dai_name = "omap-mcbsp.1",

	.codec_dai_name = "tlv320aic23-hifi",

	.codec_dai_name = "tlv320aic23-hifi",

	.platform_name = "omap-pcm-audio",

	.platform_name = "omap-pcm-audio",

	.codec_name = "tlv320aic23-codec.2-001a",

	.codec_name = "tlv320aic23-codec.2-001a",

sound/soc/omap/ams-delta.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -584,7 +584,7 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd) 
static struct snd_soc_dai_link ams_delta_dai_link = {

static struct snd_soc_dai_link ams_delta_dai_link = {

	.name = "CX20442",

	.name = "CX20442",

	.stream_name = "CX20442",

	.stream_name = "CX20442",

	.cpu_dai_name ="omap-mcbsp-dai.0",

	.cpu_dai_name = "omap-mcbsp.1",

	.codec_dai_name = "cx20442-voice",

	.codec_dai_name = "cx20442-voice",

	.init = ams_delta_cx20442_init,

	.init = ams_delta_cx20442_init,

	.platform_name = "omap-pcm-audio",

	.platform_name = "omap-pcm-audio",

CRA Git | Maintained and supported by SUSTech CRA and CCSE