diff options
Diffstat (limited to 'sound/soc/tegra/tegra_asoc_utils.c')
-rw-r--r-- | sound/soc/tegra/tegra_asoc_utils.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c index 266189d4ff13..9515ce58ea02 100644 --- a/sound/soc/tegra/tegra_asoc_utils.c +++ b/sound/soc/tegra/tegra_asoc_utils.c | |||
@@ -119,13 +119,15 @@ int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data, | |||
119 | 119 | ||
120 | data->dev = dev; | 120 | data->dev = dev; |
121 | 121 | ||
122 | if (!of_have_populated_dt()) | 122 | if (of_machine_is_compatible("nvidia,tegra20")) |
123 | data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20; | ||
124 | else if (of_machine_is_compatible("nvidia,tegra20")) | ||
125 | data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20; | 123 | data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20; |
126 | else if (of_machine_is_compatible("nvidia,tegra30")) | 124 | else if (of_machine_is_compatible("nvidia,tegra30")) |
127 | data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA30; | 125 | data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA30; |
126 | else if (!dev->of_node) | ||
127 | /* non-DT is always Tegra20 */ | ||
128 | data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20; | ||
128 | else | 129 | else |
130 | /* DT boot, but unknown SoC */ | ||
129 | return -EINVAL; | 131 | return -EINVAL; |
130 | 132 | ||
131 | data->clk_pll_a = clk_get_sys(NULL, "pll_a"); | 133 | data->clk_pll_a = clk_get_sys(NULL, "pll_a"); |