Merge tag 'sound-fix-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[~andy/linux] / sound / soc / fsl / fsl_ssi.c

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 6404e1ef20d076bc693e198aab3afb3dde9bf08d..5428a1fda2603850349fa2fb11680df9b63386eb 100644 (file)
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1278,18 +1278,13 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                return -EINVAL;
        hw_type = (enum fsl_ssi_type) of_id->data;
 
-       /* We only support the SSI in "I2S Slave" mode */
        sprop = of_get_property(np, "fsl,mode", NULL);
        if (!sprop) {
                dev_err(&pdev->dev, "fsl,mode property is necessary\n");
                return -EINVAL;
        }
-       if (!strcmp(sprop, "ac97-slave")) {
+       if (!strcmp(sprop, "ac97-slave"))
                ac97 = true;
-       } else if (strcmp(sprop, "i2s-slave")) {
-               dev_notice(&pdev->dev, "mode %s is unsupported\n", sprop);
-               return -ENODEV;
-       }
 
        /* The DAI name is the last part of the full name of the node. */
        p = strrchr(np->full_name, '/') + 1;
@@ -1407,7 +1402,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                 */
                ssi_private->baudclk = devm_clk_get(&pdev->dev, "baud");
                if (IS_ERR(ssi_private->baudclk))
-                       dev_warn(&pdev->dev, "could not get baud clock: %ld\n",
+                       dev_dbg(&pdev->dev, "could not get baud clock: %ld\n",
                                 PTR_ERR(ssi_private->baudclk));
                else
                        clk_prepare_enable(ssi_private->baudclk);