Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ee1a4d4b7fcfce31dade9f2ad333b34159cee799

Authored by Stephen Warren
Committed by Mark Brown
1 parent 250b68512d
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ASoC: Tegra: wm8903 machine driver: Drop Ventana support 

Board file support for Ventana is not yet mainlined, and probably won't
ever be given the move to Device-Tree. Consequently, the Ventana entry
is being removed from arch/arm/tools/mach-types in the next merge window,
since it was registered over a year ago.

This will also remove function machine_is_ventana(), which is used by
the ASoC Tegra WM8903 machine driver. This will cause compilation
failures. Drop Ventana support to resolve this.

Hopefully, in the not-too-distant future, tegra_wm8903.c will be able to
configure itself from Device-Tree, and hence we'll be able to re-instate
Ventana support just by creating a .dts file for the board.

Also note that Aebl support is in a similar boat. However, that board
isn't scheduled for deprecation for at least another 5 months, and
perhaps we will have completely removed non-Device-Tree support from
tegra_wm8903.c by then and/or adjusted mach-types policy.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

sound/soc/tegra/tegra_wm8903.c
Diff comments   View file @ ee1a4d4
... ... @@ -319,7 +319,7 @@
319 319 snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");
320 320  
321 321 /* FIXME: Calculate automatically based on DAPM routes? */
322   - if (!machine_is_harmony() && !machine_is_ventana())
  322 + if (!machine_is_harmony())
323 323 snd_soc_dapm_nc_pin(dapm, "IN1L");
324 324 if (!machine_is_seaboard() && !machine_is_aebl())
325 325 snd_soc_dapm_nc_pin(dapm, "IN1R");
... ... @@ -395,7 +395,7 @@
395 395 platform_set_drvdata(pdev, card);
396 396 snd_soc_card_set_drvdata(card, machine);
397 397  
398   - if (machine_is_harmony() || machine_is_ventana()) {
  398 + if (machine_is_harmony()) {
399 399 card->dapm_routes = harmony_audio_map;
400 400 card->num_dapm_routes = ARRAY_SIZE(harmony_audio_map);
401 401 } else if (machine_is_seaboard()) {