Skip to content

Commit

Permalink
ASoC: tegra: utils: Don't use of_have_populated_dt()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Warren authored and Mark Brown committed Apr 10, 2012
1 parent 20dc24a commit 8127bf5
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions sound/soc/tegra/tegra_asoc_utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,15 @@ int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data,

data->dev = dev;

if (!of_have_populated_dt())
data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20;
else if (of_machine_is_compatible("nvidia,tegra20"))
if (of_machine_is_compatible("nvidia,tegra20"))
data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20;
else if (of_machine_is_compatible("nvidia,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
/* DT boot, but unknown SoC */
return -EINVAL;

data->clk_pll_a = clk_get_sys(NULL, "pll_a");
Expand Down

0 comments on commit 8127bf5

Please sign in to comment.