summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/rk817_codec.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/rk817_codec.c')
-rw-r--r--sound/soc/codecs/rk817_codec.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/rk817_codec.c b/sound/soc/codecs/rk817_codec.c
index d4da98469f8b..3c9957b00881 100644
--- a/sound/soc/codecs/rk817_codec.c
+++ b/sound/soc/codecs/rk817_codec.c
@@ -10,7 +10,6 @@
#include <linux/mfd/rk808.h>
#include <linux/module.h>
#include <linux/of.h>
-#include <linux/of_gpio.h>
#include <linux/platform_device.h>
#include <linux/regmap.h>
#include <sound/core.h>
@@ -304,10 +303,10 @@ static int rk817_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int i2s_mst = 0;
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
- case SND_SOC_DAIFMT_CBS_CFS:
+ case SND_SOC_DAIFMT_CBC_CFC:
i2s_mst |= RK817_I2S_MODE_SLV;
break;
- case SND_SOC_DAIFMT_CBM_CFM:
+ case SND_SOC_DAIFMT_CBP_CFP:
i2s_mst |= RK817_I2S_MODE_MST;
break;
default:
@@ -530,7 +529,7 @@ static struct platform_driver rk817_codec_driver = {
.name = "rk817-codec",
},
.probe = rk817_platform_probe,
- .remove_new = rk817_platform_remove,
+ .remove = rk817_platform_remove,
};
module_platform_driver(rk817_codec_driver);