Revert "TEMP: asoc: tegra-alt: disable SLGC"
Dara Ramesh [Mon, 22 Sep 2014 08:54:43 +0000 (13:54 +0530)]
This reverts commit 5779e4ce11d24ca76e85350997a972bf91fa70b9.

Change-Id: I7440554bcef82449bd25dfd3a590c1e39d154b13
Signed-off-by: Dara Ramesh <dramesh@nvidia.com>
Reviewed-on: http://git-master/r/501141
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Arun Shamanna Lakshmi <aruns@nvidia.com>
Reviewed-by: Darren Sun <darrens@nvidia.com>
Reviewed-by: Rahul Mittal <rmittal@nvidia.com>
Tested-by: Rahul Mittal <rmittal@nvidia.com>

drivers/dma/tegra210-adma.c
sound/soc/tegra-alt/tegra210_admaif_alt.c
sound/soc/tegra-alt/tegra210_mixer_alt.c
sound/soc/tegra-alt/tegra210_sfc_alt.c
sound/soc/tegra/tegra210_admaif.c
sound/soc/tegra/tegra210_amixer.c
sound/soc/tegra/tegra210_dmic.c
sound/soc/tegra/tegra210_i2s.c

index dc3d555..52cb361 100644 (file)
@@ -1297,9 +1297,7 @@ static int tegra_adma_probe(struct platform_device *pdev)
        tdma->dma_dev.device_control = tegra_adma_device_control;
        tdma->dma_dev.device_tx_status = tegra_adma_tx_status;
        tdma->dma_dev.device_issue_pending = tegra_adma_issue_pending;
-
-       /* Disable SLGC and enable global ADMA registers */
-       global_write(tdma, ADMA_GLOBAL_CG, 0);
+       /* Enable global ADMA registers */
        global_write(tdma, ADMA_GLOBAL_CMD, 1);
        ret = dma_async_device_register(&tdma->dma_dev);
        if (ret < 0) {
index b9ca29c..06a166a 100644 (file)
@@ -644,9 +644,6 @@ static int tegra210_admaif_probe(struct platform_device *pdev)
                ret = PTR_ERR(admaif->regmap);
                goto err_clk_put;
        }
-
-        /* Disable SLGC */
-       regmap_write(admaif->regmap, TEGRA210_ADMAIF_GLOBAL_CG_0, 0);
        regcache_cache_only(admaif->regmap, true);
 
        pm_runtime_enable(&pdev->dev);
index d62b57f..d2a2467 100644 (file)
@@ -614,9 +614,6 @@ static int tegra210_mixer_platform_probe(struct platform_device *pdev)
                ret = PTR_ERR(mixer->regmap);
                goto err_clk_put;
        }
-
-        /* Disable SLGC */
-       regmap_write(mixer->regmap, TEGRA210_MIXER_CG, 0);
        regcache_cache_only(mixer->regmap, true);
 
        if (of_property_read_u32(pdev->dev.of_node,
index cce175f..4a8721a 100644 (file)
@@ -505,9 +505,6 @@ static int tegra210_sfc_platform_probe(struct platform_device *pdev)
                ret = PTR_ERR(sfc->regmap);
                goto err_clk_put;
        }
-
-        /* Disable SLGC */
-       regmap_write(sfc->regmap, TEGRA210_SFC_CG, 0);
        regcache_cache_only(sfc->regmap, true);
 
        if (of_property_read_u32(pdev->dev.of_node,
index 41b2429..ccf3b3e 100644 (file)
@@ -488,9 +488,6 @@ static int tegra210_admaif_probe(struct platform_device *pdev)
                ret = PTR_ERR(tegra210_admaif->regmap);
                goto err_clk_put_admaif;
        }
-       /* Disable SLCG */
-       regmap_write(tegra210_admaif->regmap,
-                       TEGRA210_ADMAIF_GLOBAL_CG_0, 0);
        regcache_cache_only(tegra210_admaif->regmap, true);
 
        pm_runtime_enable(&pdev->dev);
index 53ef694..11a6cb8 100644 (file)
@@ -713,8 +713,6 @@ static int tegra210_amixer_probe(struct platform_device *pdev)
                ret = PTR_ERR(amixer->regmap);
                goto err_free;
        }
-       /* Disable SLCG */
-       regmap_write(amixer->regmap, TEGRA210_AMIXER_CG, 0);
        regcache_cache_only(amixer->regmap, true);
 
        pm_runtime_enable(&pdev->dev);
index 434ab9a..c9e73b0 100644 (file)
@@ -575,8 +575,6 @@ static int tegra210_dmic_probe(struct platform_device *pdev)
                ret = PTR_ERR(dmic->regmap);
                goto err_free;
        }
-       /* Disable SLCG */
-       regmap_write(dmic->regmap, TEGRA210_DMIC_CG, 0);
        regcache_cache_only(dmic->regmap, true);
 
        pm_runtime_enable(&pdev->dev);
index 0a8eee6..95d9af3 100644 (file)
@@ -767,8 +767,6 @@ static int tegra210_i2s_platform_probe(struct platform_device *pdev)
                ret = PTR_ERR(i2s->regmap);
                goto err_pll_a_out0_clk_put;
        }
-       /* Disable SLCG */
-       regmap_write(i2s->regmap, TEGRA210_I2S_CG, 0);
        regcache_cache_only(i2s->regmap, true);
 
        pm_runtime_enable(&pdev->dev);