ASoC: tegra: utils: Don't use of_have_populated_dt()
Recent list discussions concluded that drivers should not be calling of_have_populated_dt(), and hence of_have_populated_dt() should not be exported. Use a different mechanism to detect DT vs. non-DT boot. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
20dc24a951
commit
8127bf5529
|
@ -119,13 +119,15 @@ int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data,
|
||||||
|
|
||||||
data->dev = dev;
|
data->dev = dev;
|
||||||
|
|
||||||
if (!of_have_populated_dt())
|
if (of_machine_is_compatible("nvidia,tegra20"))
|
||||||
data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20;
|
|
||||||
else if (of_machine_is_compatible("nvidia,tegra20"))
|
|
||||||
data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20;
|
data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20;
|
||||||
else if (of_machine_is_compatible("nvidia,tegra30"))
|
else if (of_machine_is_compatible("nvidia,tegra30"))
|
||||||
data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA30;
|
data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA30;
|
||||||
|
else if (!dev->of_node)
|
||||||
|
/* non-DT is always Tegra20 */
|
||||||
|
data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20;
|
||||||
else
|
else
|
||||||
|
/* DT boot, but unknown SoC */
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
data->clk_pll_a = clk_get_sys(NULL, "pll_a");
|
data->clk_pll_a = clk_get_sys(NULL, "pll_a");
|
||||||
|
|
Loading…
Reference in New Issue