Skip to content

Commit

Permalink
Revert "bcm2835-i2s: Register PCM device"
Browse files Browse the repository at this point in the history
This reverts commit 37fee13.
  • Loading branch information
Phil Elwell authored and popcornmix committed May 16, 2016
1 parent 003fcda commit 5f713f1
Showing 1 changed file with 1 addition and 22 deletions.
23 changes: 1 addition & 22 deletions sound/soc/bcm/bcm2835-i2s.c
Expand Up @@ -789,25 +789,6 @@ static const struct snd_soc_component_driver bcm2835_i2s_component = {
.name = "bcm2835-i2s-comp",
};

static const struct snd_pcm_hardware bcm2835_pcm_hardware = {
.info = SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_JOINT_DUPLEX,
.formats = SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S24_LE |
SNDRV_PCM_FMTBIT_S32_LE,
.period_bytes_min = 32,
.period_bytes_max = 64 * PAGE_SIZE,
.periods_min = 2,
.periods_max = 255,
.buffer_bytes_max = 128 * PAGE_SIZE,
};

static const struct snd_dmaengine_pcm_config bcm2835_dmaengine_pcm_config = {
.prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config,
.pcm_hardware = &bcm2835_pcm_hardware,
.prealloc_buffer_size = 256 * PAGE_SIZE,
};

static int bcm2835_i2s_probe(struct platform_device *pdev)
{
struct bcm2835_i2s_dev *dev;
Expand Down Expand Up @@ -872,9 +853,7 @@ static int bcm2835_i2s_probe(struct platform_device *pdev)
return ret;
}

ret = devm_snd_dmaengine_pcm_register(&pdev->dev,
&bcm2835_dmaengine_pcm_config,
SND_DMAENGINE_PCM_FLAG_COMPAT);
ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
if (ret) {
dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
return ret;
Expand Down

0 comments on commit 5f713f1

Please sign in to comment.