Skip to content

Commit

Permalink
Merge branch 'asoc-5.15' into asoc-5.16
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Oct 21, 2021
2 parents 4304150 + 5ba8ecf commit 324081a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 60 deletions.
5 changes: 2 additions & 3 deletions sound/soc/rockchip/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
# ROCKCHIP Platform Support
snd-soc-rockchip-i2s-objs := rockchip_i2s.o
snd-soc-rockchip-i2s-tdm-objs := rockchip_i2s_tdm.o
snd-soc-rockchip-pcm-objs := rockchip_pcm.o
snd-soc-rockchip-pdm-objs := rockchip_pdm.o
snd-soc-rockchip-spdif-objs := rockchip_spdif.o

obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-rockchip-i2s.o snd-soc-rockchip-pcm.o
obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S_TDM) += snd-soc-rockchip-i2s-tdm.o
obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-rockchip-i2s.o
obj-$(CONFIG_SND_SOC_ROCKCHIP_PDM) += snd-soc-rockchip-pdm.o
obj-$(CONFIG_SND_SOC_ROCKCHIP_SPDIF) += snd-soc-rockchip-spdif.o
obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S_TDM) += snd-soc-rockchip-i2s-tdm.o

snd-soc-rockchip-max98090-objs := rockchip_max98090.o
snd-soc-rockchip-rt5645-objs := rockchip_rt5645.o
Expand Down
3 changes: 1 addition & 2 deletions sound/soc/rockchip/rockchip_i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include <sound/dmaengine_pcm.h>

#include "rockchip_i2s.h"
#include "rockchip_pcm.h"

#define DRV_NAME "rockchip-i2s"

Expand Down Expand Up @@ -756,7 +755,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
goto err_suspend;
}

ret = rockchip_pcm_platform_register(&pdev->dev);
ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
if (ret) {
dev_err(&pdev->dev, "Could not register PCM\n");
goto err_suspend;
Expand Down
44 changes: 0 additions & 44 deletions sound/soc/rockchip/rockchip_pcm.c

This file was deleted.

11 changes: 0 additions & 11 deletions sound/soc/rockchip/rockchip_pcm.h

This file was deleted.

0 comments on commit 324081a

Please sign in to comment.