ASoC: kirkwood: merge struct kirkwood_dma_priv with struct kirkwood_dma_data (a7d09429) · Commits · e / devices / android_kernel_teracube_emerald

sound/soc/kirkwood/kirkwood-dma.c

+22 −54

Original line number	Original line	Diff line number	Diff line
	@@ -33,11 +33,11 @@
	SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE \| \		SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE \| \
	SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_BE)		SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_BE)

	struct kirkwood_dma_priv {		static struct kirkwood_dma_data kirkwood_priv(struct snd_pcm_substream subs)
	struct snd_pcm_substream *play_stream;		{
	struct snd_pcm_substream *rec_stream;		struct snd_soc_pcm_runtime *soc_runtime = subs->private_data;
	struct kirkwood_dma_data *data;		return snd_soc_dai_get_drvdata(soc_runtime->cpu_dai);
	};		}

	static struct snd_pcm_hardware kirkwood_dma_snd_hw = {		static struct snd_pcm_hardware kirkwood_dma_snd_hw = {
	.info = (SNDRV_PCM_INFO_INTERLEAVED \|		.info = (SNDRV_PCM_INFO_INTERLEAVED \|
	@@ -63,8 +63,7 @@ static u64 kirkwood_dma_dmamask = DMA_BIT_MASK(32);

	static irqreturn_t kirkwood_dma_irq(int irq, void *dev_id)		static irqreturn_t kirkwood_dma_irq(int irq, void *dev_id)
	{		{
	struct kirkwood_dma_priv *prdata = dev_id;		struct kirkwood_dma_data *priv = dev_id;
	struct kirkwood_dma_data *priv = prdata->data;
	unsigned long mask, status, cause;		unsigned long mask, status, cause;

	mask = readl(priv->io + KIRKWOOD_INT_MASK);		mask = readl(priv->io + KIRKWOOD_INT_MASK);
	@@ -89,10 +88,10 @@ static irqreturn_t kirkwood_dma_irq(int irq, void *dev_id)
	writel(status, priv->io + KIRKWOOD_INT_CAUSE);		writel(status, priv->io + KIRKWOOD_INT_CAUSE);

	if (status & KIRKWOOD_INT_CAUSE_PLAY_BYTES)		if (status & KIRKWOOD_INT_CAUSE_PLAY_BYTES)
	snd_pcm_period_elapsed(prdata->play_stream);		snd_pcm_period_elapsed(priv->substream_play);

	if (status & KIRKWOOD_INT_CAUSE_REC_BYTES)		if (status & KIRKWOOD_INT_CAUSE_REC_BYTES)
	snd_pcm_period_elapsed(prdata->rec_stream);		snd_pcm_period_elapsed(priv->substream_rec);

	return IRQ_HANDLED;		return IRQ_HANDLED;
	}		}
	@@ -126,15 +125,10 @@ static int kirkwood_dma_open(struct snd_pcm_substream *substream)
	{		{
	int err;		int err;
	struct snd_pcm_runtime *runtime = substream->runtime;		struct snd_pcm_runtime *runtime = substream->runtime;
	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;		struct kirkwood_dma_data *priv = kirkwood_priv(substream);
	struct snd_soc_platform *platform = soc_runtime->platform;
	struct snd_soc_dai *cpu_dai = soc_runtime->cpu_dai;
	struct kirkwood_dma_data *priv;
	struct kirkwood_dma_priv *prdata = snd_soc_platform_get_drvdata(platform);
	const struct mbus_dram_target_info *dram;		const struct mbus_dram_target_info *dram;
	unsigned long addr;		unsigned long addr;

	priv = snd_soc_dai_get_dma_data(cpu_dai, substream);
	snd_soc_set_runtime_hwparams(substream, &kirkwood_dma_snd_hw);		snd_soc_set_runtime_hwparams(substream, &kirkwood_dma_snd_hw);

	/* Ensure that all constraints linked to dma burst are fulfilled */		/* Ensure that all constraints linked to dma burst are fulfilled */
	@@ -157,21 +151,11 @@ static int kirkwood_dma_open(struct snd_pcm_substream *substream)
	if (err < 0)		if (err < 0)
	return err;		return err;

	if (prdata == NULL) {		if (!priv->substream_play && !priv->substream_rec) {
	prdata = kzalloc(sizeof(struct kirkwood_dma_priv), GFP_KERNEL);
	if (prdata == NULL)
	return -ENOMEM;

	prdata->data = priv;

	err = request_irq(priv->irq, kirkwood_dma_irq, IRQF_SHARED,		err = request_irq(priv->irq, kirkwood_dma_irq, IRQF_SHARED,
	"kirkwood-i2s", prdata);		"kirkwood-i2s", priv);
	if (err) {		if (err)
	kfree(prdata);
	return -EBUSY;		return -EBUSY;
	}

	snd_soc_platform_set_drvdata(platform, prdata);

	/*		/*
	* Enable Error interrupts. We're only ack'ing them but		* Enable Error interrupts. We're only ack'ing them but
	@@ -183,11 +167,11 @@ static int kirkwood_dma_open(struct snd_pcm_substream *substream)
	dram = mv_mbus_dram_info();		dram = mv_mbus_dram_info();
	addr = substream->dma_buffer.addr;		addr = substream->dma_buffer.addr;
	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
	prdata->play_stream = substream;		priv->substream_play = substream;
	kirkwood_dma_conf_mbus_windows(priv->io,		kirkwood_dma_conf_mbus_windows(priv->io,
	KIRKWOOD_PLAYBACK_WIN, addr, dram);		KIRKWOOD_PLAYBACK_WIN, addr, dram);
	} else {		} else {
	prdata->rec_stream = substream;		priv->substream_rec = substream;
	kirkwood_dma_conf_mbus_windows(priv->io,		kirkwood_dma_conf_mbus_windows(priv->io,
	KIRKWOOD_RECORD_WIN, addr, dram);		KIRKWOOD_RECORD_WIN, addr, dram);
	}		}
	@@ -197,27 +181,19 @@ static int kirkwood_dma_open(struct snd_pcm_substream *substream)

	static int kirkwood_dma_close(struct snd_pcm_substream *substream)		static int kirkwood_dma_close(struct snd_pcm_substream *substream)
	{		{
	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;		struct kirkwood_dma_data *priv = kirkwood_priv(substream);
	struct snd_soc_dai *cpu_dai = soc_runtime->cpu_dai;
	struct snd_soc_platform *platform = soc_runtime->platform;
	struct kirkwood_dma_priv *prdata = snd_soc_platform_get_drvdata(platform);
	struct kirkwood_dma_data *priv;

	priv = snd_soc_dai_get_dma_data(cpu_dai, substream);

	if (!prdata \|\| !priv)		if (!priv)
	return 0;		return 0;

	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
	prdata->play_stream = NULL;		priv->substream_play = NULL;
	else		else
	prdata->rec_stream = NULL;		priv->substream_rec = NULL;

	if (!prdata->play_stream && !prdata->rec_stream) {		if (!priv->substream_play && !priv->substream_rec) {
	writel(0, priv->io + KIRKWOOD_ERR_MASK);		writel(0, priv->io + KIRKWOOD_ERR_MASK);
	free_irq(priv->irq, prdata);		free_irq(priv->irq, priv);
	kfree(prdata);
	snd_soc_platform_set_drvdata(platform, NULL);
	}		}

	return 0;		return 0;
	@@ -243,13 +219,9 @@ static int kirkwood_dma_hw_free(struct snd_pcm_substream *substream)
	static int kirkwood_dma_prepare(struct snd_pcm_substream *substream)		static int kirkwood_dma_prepare(struct snd_pcm_substream *substream)
	{		{
	struct snd_pcm_runtime *runtime = substream->runtime;		struct snd_pcm_runtime *runtime = substream->runtime;
	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;		struct kirkwood_dma_data *priv = kirkwood_priv(substream);
	struct snd_soc_dai *cpu_dai = soc_runtime->cpu_dai;
	struct kirkwood_dma_data *priv;
	unsigned long size, count;		unsigned long size, count;

	priv = snd_soc_dai_get_dma_data(cpu_dai, substream);

	/* compute buffer size in term of "words" as requested in specs */		/* compute buffer size in term of "words" as requested in specs */
	size = frames_to_bytes(runtime, runtime->buffer_size);		size = frames_to_bytes(runtime, runtime->buffer_size);
	size = (size>>2)-1;		size = (size>>2)-1;
	@@ -272,13 +244,9 @@ static int kirkwood_dma_prepare(struct snd_pcm_substream *substream)
	static snd_pcm_uframes_t kirkwood_dma_pointer(struct snd_pcm_substream		static snd_pcm_uframes_t kirkwood_dma_pointer(struct snd_pcm_substream
	*substream)		*substream)
	{		{
	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;		struct kirkwood_dma_data *priv = kirkwood_priv(substream);
	struct snd_soc_dai *cpu_dai = soc_runtime->cpu_dai;
	struct kirkwood_dma_data *priv;
	snd_pcm_uframes_t count;		snd_pcm_uframes_t count;

	priv = snd_soc_dai_get_dma_data(cpu_dai, substream);

	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
	count = bytes_to_frames(substream->runtime,		count = bytes_to_frames(substream->runtime,
	readl(priv->io + KIRKWOOD_PLAY_BYTE_COUNT));		readl(priv->io + KIRKWOOD_PLAY_BYTE_COUNT));

sound/soc/kirkwood/kirkwood.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -129,6 +129,8 @@ struct kirkwood_dma_data {
	struct clk *extclk;		struct clk *extclk;
	uint32_t ctl_play;		uint32_t ctl_play;
	uint32_t ctl_rec;		uint32_t ctl_rec;
			struct snd_pcm_substream *substream_play;
			struct snd_pcm_substream *substream_rec;
	int irq;		int irq;
	int burst;		int burst;
	};		};