1 files changed, 31 insertions, 35 deletions

diff --git a/sound/soc/tegra/tegra_das.c b/sound/soc/tegra/tegra_das.c
index 3b55a44146af..3b3c1ba4d235 100644
--- a/sound/soc/tegra/tegra_das.c
+++ b/sound/soc/tegra/tegra_das.c
@@ -172,11 +172,11 @@ static int __devinit tegra_das_probe(struct platform_device *pdev)
         if (das)
                 return -ENODEV;
 
-        das = kzalloc(sizeof(struct tegra_das), GFP_KERNEL);
+        das = devm_kzalloc(&pdev->dev, sizeof(struct tegra_das), GFP_KERNEL);
         if (!das) {
                 dev_err(&pdev->dev, "Can't allocate tegra_das\n");
                 ret = -ENOMEM;
-                goto exit;
+                goto err;
         }
         das->dev = &pdev->dev;
 
@@ -184,22 +184,35 @@ static int __devinit tegra_das_probe(struct platform_device *pdev)
         if (!res) {
                 dev_err(&pdev->dev, "No memory resource\n");
                 ret = -ENODEV;
-                goto err_free;
+                goto err;
         }
 
-        region = request_mem_region(res->start, resource_size(res),
-                                        pdev->name);
+        region = devm_request_mem_region(&pdev->dev, res->start,
+                                         resource_size(res), pdev->name);
         if (!region) {
                 dev_err(&pdev->dev, "Memory region already claimed\n");
                 ret = -EBUSY;
-                goto err_free;
+                goto err;
         }
 
-        das->regs = ioremap(res->start, resource_size(res));
+        das->regs = devm_ioremap(&pdev->dev, res->start, resource_size(res));
         if (!das->regs) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 ret = -ENOMEM;
-                goto err_release;
+                goto err;
+        }
+
+        ret = tegra_das_connect_dap_to_dac(TEGRA_DAS_DAP_ID_1,
+                                           TEGRA_DAS_DAP_SEL_DAC1);
+        if (ret) {
+                dev_err(&pdev->dev, "Can't set up DAS DAP connection\n");
+                goto err;
+        }
+        ret = tegra_das_connect_dac_to_dap(TEGRA_DAS_DAC_ID_1,
+                                           TEGRA_DAS_DAC_SEL_DAP1);
+        if (ret) {
+                dev_err(&pdev->dev, "Can't set up DAS DAC connection\n");
+                goto err;
         }
 
         tegra_das_debug_add(das);
@@ -208,58 +221,41 @@ static int __devinit tegra_das_probe(struct platform_device *pdev)
 
         return 0;
 
-err_release:
-        release_mem_region(res->start, resource_size(res));
-err_free:
-        kfree(das);
+err:
         das = NULL;
-exit:
         return ret;
 }
 
 static int __devexit tegra_das_remove(struct platform_device *pdev)
 {
-        struct resource *res;
-
         if (!das)
                 return -ENODEV;
 
-        platform_set_drvdata(pdev, NULL);
-
         tegra_das_debug_remove(das);
 
-        iounmap(das->regs);
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, resource_size(res));
-
-        kfree(das);
         das = NULL;
 
         return 0;
 }
 
+static const struct of_device_id tegra_das_of_match[] __devinitconst = {
+        { .compatible = "nvidia,tegra20-das", },
+        {},
+};
+
 static struct platform_driver tegra_das_driver = {
         .probe = tegra_das_probe,
         .remove = __devexit_p(tegra_das_remove),
         .driver = {
                 .name = DRV_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = tegra_das_of_match,
         },
 };
-
-static int __init tegra_das_modinit(void)
-{
-        return platform_driver_register(&tegra_das_driver);
-}
-module_init(tegra_das_modinit);
-
-static void __exit tegra_das_modexit(void)
-{
-        platform_driver_unregister(&tegra_das_driver);
-}
-module_exit(tegra_das_modexit);
+module_platform_driver(tegra_das_driver);
 
 MODULE_AUTHOR("Stephen Warren <swarren@nvidia.com>");
 MODULE_DESCRIPTION("Tegra DAS driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:" DRV_NAME);
+MODULE_DEVICE_TABLE(of, tegra_das_of_match);