Patchwork [1/6] ASoC: tegra: assume CONFIG_OF in tegra_asoc_utils_init

login
register
mail settings
Submitter Stephen Warren
Date Feb. 16, 2013, 12:07 a.m.
Message ID <1360973255-344-1-git-send-email-swarren@wwwdotorg.org>
Download mbox | patch
Permalink /patch/220901/
State Not Applicable, archived
Headers show

Comments

Stephen Warren - Feb. 16, 2013, 12:07 a.m.
From: Stephen Warren <swarren@nvidia.com>

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>
---
 sound/soc/tegra/tegra_asoc_utils.c |    4 ----
 1 file changed, 4 deletions(-)
Mark Brown - Feb. 20, 2013, 5:25 p.m.
On Fri, Feb 15, 2013 at 05:07:30PM -0700, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> Tegra only supports, and always enables, device tree. Remove all runtime
> checks for DT support from the driver.

Applied all, thanks.

Patch

diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c
index ba419f8..49861c6 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,
 		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");