3 files changed, 13 insertions, 3 deletions

diff --git a/sound/soc/tegra-alt/include/tegra_asoc_utils_alt.h b/sound/soc/tegra-alt/include/tegra_asoc_utils_alt.h
index 03eaff99f..8140880a1 100644
--- a/sound/soc/tegra-alt/include/tegra_asoc_utils_alt.h
+++ b/sound/soc/tegra-alt/include/tegra_asoc_utils_alt.h
@@ -62,6 +62,7 @@ struct tegra_asoc_audio_clock_info {
         u32 set_pll_out_rate;
         u32 set_aud_mclk_rate;
         u32 mclk_scale;
+        bool fixed_pll;
 
         /* FIXME: below would be removed going ahead */
         u32 clk_rates[MAX_NUM_RATES];
diff --git a/sound/soc/tegra-alt/machine_drivers/tegra_machine_driver_mobile.c b/sound/soc/tegra-alt/machine_drivers/tegra_machine_driver_mobile.c
index 053fe320b..b2e8fa27c 100644
--- a/sound/soc/tegra-alt/machine_drivers/tegra_machine_driver_mobile.c
+++ b/sound/soc/tegra-alt/machine_drivers/tegra_machine_driver_mobile.c
@@ -765,6 +765,11 @@ static int tegra_machine_driver_probe(struct platform_device *pdev)
                                  &machine->audio_clock.mclk_scale) < 0)
                 dev_dbg(&pdev->dev, "Missing property mclk-fs\n");
 
+        if (of_property_read_bool(np, "fixed-pll")) {
+                machine->audio_clock.fixed_pll = true;
+                dev_info(&pdev->dev, "PLL configuration is fixed from DT\n");
+        }
+
         tegra_machine_dma_set_mask(pdev);
 
         ret = add_dai_links(pdev);
diff --git a/sound/soc/tegra-alt/utils/tegra_asoc_utils_alt.c b/sound/soc/tegra-alt/utils/tegra_asoc_utils_alt.c
index 4dd0bcfda..38927c0a1 100644
--- a/sound/soc/tegra-alt/utils/tegra_asoc_utils_alt.c
+++ b/sound/soc/tegra-alt/utils/tegra_asoc_utils_alt.c
@@ -114,6 +114,9 @@ int tegra_alt_asoc_utils_set_rate(struct tegra_asoc_audio_clock_info *data,
         unsigned int new_pll_base, req_bclk;
         int err;
 
+        if (data->fixed_pll)
+                goto update_mclk_rate;
+
         switch (srate) {
         case 11025:
         case 22050:
@@ -147,9 +150,6 @@ int tegra_alt_asoc_utils_set_rate(struct tegra_asoc_audio_clock_info *data,
                 return err;
         }
 
-        if (data->mclk_scale)
-                aud_mclk = srate * data->mclk_scale;
-
         if (data->set_pll_base_rate != new_pll_base) {
                 err = clk_set_rate(data->clk_pll_base, new_pll_base);
                 if (err) {
@@ -171,6 +171,10 @@ int tegra_alt_asoc_utils_set_rate(struct tegra_asoc_audio_clock_info *data,
                 data->set_pll_out_rate = pll_out;
         }
 
+update_mclk_rate:
+        if (data->mclk_scale)
+                aud_mclk = srate * data->mclk_scale;
+
         if (data->set_aud_mclk_rate != aud_mclk) {
                 err = clk_set_rate(data->clk_aud_mclk, aud_mclk);
                 if (err) {