ASoC: dwc-i2s: Update to modern clocking terminology

[linux-2.6-microblaze.git] / sound / soc / dwc / dwc-i2s.c

diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c
index 33ce257..5cb5892 100644 (file)
--- a/sound/soc/dwc/dwc-i2s.c
+++ b/sound/soc/dwc/dwc-i2s.c
@@ -356,25 +356,25 @@ static int dw_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
        struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(cpu_dai);
        int ret = 0;
 
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBM_CFM:
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBP_CFP:
                if (dev->capability & DW_I2S_SLAVE)
                        ret = 0;
                else
                        ret = -EINVAL;
                break;
-       case SND_SOC_DAIFMT_CBS_CFS:
+       case SND_SOC_DAIFMT_CBC_CFC:
                if (dev->capability & DW_I2S_MASTER)
                        ret = 0;
                else
                        ret = -EINVAL;
                break;
-       case SND_SOC_DAIFMT_CBM_CFS:
-       case SND_SOC_DAIFMT_CBS_CFM:
+       case SND_SOC_DAIFMT_CBP_CFC:
+       case SND_SOC_DAIFMT_CBC_CFP:
                ret = -EINVAL;
                break;
        default:
-               dev_dbg(dev->dev, "dwc : Invalid master/slave format\n");
+               dev_dbg(dev->dev, "dwc : Invalid clock provider format\n");
                ret = -EINVAL;
                break;
        }