diff options
author | Stephen Warren <swarren@nvidia.com> | 2013-02-15 19:07:30 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-03 22:22:22 -0500 |
commit | 69de6be70e611c8165b9b5c16d69574d13f2a3b0 (patch) | |
tree | 8ba830f21098d3531275db43bcb04874570fa141 | |
parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) |
ASoC: tegra: assume CONFIG_OF in tegra_asoc_utils_init
Tegra only supports, and always enables, device tree. Remove all runtime
checks for DT support from the driver.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/tegra/tegra_asoc_utils.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c index ba419f86384d..49861c6ed874 100644 --- a/sound/soc/tegra/tegra_asoc_utils.c +++ b/sound/soc/tegra/tegra_asoc_utils.c | |||
@@ -176,11 +176,7 @@ int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data, | |||
176 | data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20; | 176 | data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20; |
177 | else if (of_machine_is_compatible("nvidia,tegra30")) | 177 | else if (of_machine_is_compatible("nvidia,tegra30")) |
178 | data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA30; | 178 | data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA30; |
179 | else if (!dev->of_node) | ||
180 | /* non-DT is always Tegra20 */ | ||
181 | data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20; | ||
182 | else | 179 | else |
183 | /* DT boot, but unknown SoC */ | ||
184 | return -EINVAL; | 180 | return -EINVAL; |
185 | 181 | ||
186 | data->clk_pll_a = clk_get_sys(NULL, "pll_a"); | 182 | data->clk_pll_a = clk_get_sys(NULL, "pll_a"); |