1 files changed, 74 insertions, 4 deletions

diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index e260f1f899db..ab17381cc981 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -73,8 +73,11 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
         if (!buf)
                 return -ENOMEM;
 
-        if (audmux_clk)
-                clk_prepare_enable(audmux_clk);
+        if (audmux_clk) {
+                ret = clk_prepare_enable(audmux_clk);
+                if (ret)
+                        return ret;
+        }
 
         ptcr = readl(audmux_base + IMX_AUDMUX_V2_PTCR(port));
         pdcr = readl(audmux_base + IMX_AUDMUX_V2_PDCR(port));
@@ -224,14 +227,19 @@ EXPORT_SYMBOL_GPL(imx_audmux_v1_configure_port);
 int imx_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
                 unsigned int pdcr)
 {
+        int ret;
+
         if (audmux_type != IMX31_AUDMUX)
                 return -EINVAL;
 
         if (!audmux_base)
                 return -ENOSYS;
 
-        if (audmux_clk)
-                clk_prepare_enable(audmux_clk);
+        if (audmux_clk) {
+                ret = clk_prepare_enable(audmux_clk);
+                if (ret)
+                        return ret;
+        }
 
         writel(ptcr, audmux_base + IMX_AUDMUX_V2_PTCR(port));
         writel(pdcr, audmux_base + IMX_AUDMUX_V2_PDCR(port));
@@ -243,6 +251,66 @@ int imx_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
 }
 EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port);
 
+static int imx_audmux_parse_dt_defaults(struct platform_device *pdev,
+                struct device_node *of_node)
+{
+        struct device_node *child;
+
+        for_each_available_child_of_node(of_node, child) {
+                unsigned int port;
+                unsigned int ptcr = 0;
+                unsigned int pdcr = 0;
+                unsigned int pcr = 0;
+                unsigned int val;
+                int ret;
+                int i = 0;
+
+                ret = of_property_read_u32(child, "fsl,audmux-port", &port);
+                if (ret) {
+                        dev_warn(&pdev->dev, "Failed to get fsl,audmux-port of child node \"%s\"\n",
+                                        child->full_name);
+                        continue;
+                }
+                if (!of_property_read_bool(child, "fsl,port-config")) {
+                        dev_warn(&pdev->dev, "child node \"%s\" does not have property fsl,port-config\n",
+                                        child->full_name);
+                        continue;
+                }
+
+                for (i = 0; (ret = of_property_read_u32_index(child,
+                                        "fsl,port-config", i, &val)) == 0;
+                                ++i) {
+                        if (audmux_type == IMX31_AUDMUX) {
+                                if (i % 2)
+                                        pdcr |= val;
+                                else
+                                        ptcr |= val;
+                        } else {
+                                pcr |= val;
+                        }
+                }
+
+                if (ret != -EOVERFLOW) {
+                        dev_err(&pdev->dev, "Failed to read u32 at index %d of child %s\n",
+                                        i, child->full_name);
+                        continue;
+                }
+
+                if (audmux_type == IMX31_AUDMUX) {
+                        if (i % 2) {
+                                dev_err(&pdev->dev, "One pdcr value is missing in child node %s\n",
+                                                child->full_name);
+                                continue;
+                        }
+                        imx_audmux_v2_configure_port(port, ptcr, pdcr);
+                } else {
+                        imx_audmux_v1_configure_port(port, pcr);
+                }
+        }
+
+        return 0;
+}
+
 static int imx_audmux_probe(struct platform_device *pdev)
 {
         struct resource *res;
@@ -267,6 +335,8 @@ static int imx_audmux_probe(struct platform_device *pdev)
         if (audmux_type == IMX31_AUDMUX)
                 audmux_debugfs_init();
 
+        imx_audmux_parse_dt_defaults(pdev, pdev->dev.of_node);
+
         return 0;
 }