ASoC: tegra-alt: mobile: fix codec clock
Dara Ramesh [Mon, 18 Aug 2014 17:41:24 +0000 (10:41 -0700)]
fix codec clock settings and i2s regualtor.

Change-Id: I9f1b06f312a262f1d17c6f329ae026508f99e2c9
Signed-off-by: Dara Ramesh <dramesh@nvidia.com>
Reviewed-on: http://git-master/r/461332
Reviewed-by: Rahul Mittal <rmittal@nvidia.com>

sound/soc/tegra-alt/tegra210_i2s_alt.c
sound/soc/tegra-alt/tegra_t210ref_mobile_alt.c

index 03a4d54..6af80c7 100644 (file)
@@ -655,8 +655,15 @@ static int tegra210_i2s_platform_probe(struct platform_device *pdev)
                of_property_for_each_string(np, "regulator-supplies",
                                prop, supply)
                i2s->supplies[count++].supply = supply;
-       }
 
+               ret = devm_regulator_bulk_get(&pdev->dev, i2s->num_supplies,
+                                                 i2s->supplies);
+               if (ret) {
+                       dev_err(&pdev->dev,
+                               "Failed to get supplies: %d\n", ret);
+                       return ret;
+               }
+       }
 
        i2s->pinctrl = devm_pinctrl_get(&pdev->dev);
        if (IS_ERR(i2s->pinctrl)) {
index ca45042..b9afd19 100644 (file)
@@ -586,7 +586,7 @@ static int tegra_t210ref_driver_probe(struct platform_device *pdev)
 
 
        if (gpio_is_valid(pdata->gpio_ldo1_en)) {
-               ret = gpio_request(pdata->gpio_ldo1_en, "rt5639");
+               ret = gpio_request(pdata->gpio_ldo1_en, "audio_ldo1");
                if (ret)
                        dev_err(&pdev->dev, "Fail gpio_request AUDIO_LDO1\n");
                else {
@@ -648,6 +648,12 @@ static int tegra_t210ref_driver_probe(struct platform_device *pdev)
        machine->pdata = pdata;
        machine->pcard = card;
 
+       ret = tegra_alt_asoc_utils_init(&machine->audio_clock,
+                                       &pdev->dev,
+                                       card);
+       if (ret)
+               goto err_alloc_dai_link;
+
        ret = snd_soc_register_card(card);
        if (ret) {
                dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",