ASoC: Intel: bytcr_rt5651: Fix IN1 map headsetmic mapping

The initial bytcr_rt5651 machine driver commit mapped IN2 as the headset
mic. In retrospect this is not correct as all known boards have the headset
mic on IN3. To workaround this special IN?_HS_IN3 mappings were added.

This commit fixes the original IN1 mapping to correctly have the headset
mic on IN3, moves all users of the IN1_HS_IN3 mapping over to the fixed
IN1_MAP and drops the now no longer needed IN1_HS_IN3 mapping.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c
index b8ca7137d8b24147899b58def0e0501e83752f39..bf2adb36f4556974cb366fe1053393df9ca4fae6 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5651.c
+++ b/sound/soc/intel/boards/bytcr_rt5651.c
@@ -41,7 +41,6 @@ enum {
        BYT_RT5651_DMIC_MAP,
        BYT_RT5651_IN1_MAP,
        BYT_RT5651_IN1_IN2_MAP,
-       BYT_RT5651_IN1_HS_IN3_MAP,
 };
 
 enum {
@@ -90,7 +89,7 @@ struct byt_rt5651_private {
 
 /* Default: jack-detect on JD1_1, internal mic on in1, headsetmic on in3 */
 static unsigned long byt_rt5651_quirk = BYT_RT5651_DEFAULT_QUIRKS |
-                                       BYT_RT5651_IN1_HS_IN3_MAP;
+                                       BYT_RT5651_IN1_MAP;
 
 static void log_quirks(struct device *dev)
 {
@@ -100,8 +99,6 @@ static void log_quirks(struct device *dev)
                dev_info(dev, "quirk IN1_MAP enabled");
        if (BYT_RT5651_MAP(byt_rt5651_quirk) == BYT_RT5651_IN1_IN2_MAP)
                dev_info(dev, "quirk IN1_IN2_MAP enabled");
-       if (BYT_RT5651_MAP(byt_rt5651_quirk) == BYT_RT5651_IN1_HS_IN3_MAP)
-               dev_info(dev, "quirk IN1_HS_IN3_MAP enabled");
        if (BYT_RT5651_JDSRC(byt_rt5651_quirk)) {
                dev_info(dev, "quirk realtek,jack-detect-source %ld\n",
                         BYT_RT5651_JDSRC(byt_rt5651_quirk));
@@ -247,7 +244,7 @@ static const struct snd_soc_dapm_route byt_rt5651_intmic_dmic_map[] = {
 static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_map[] = {
        {"Internal Mic", NULL, "micbias1"},
        {"IN1P", NULL, "Internal Mic"},
-       {"IN2P", NULL, "Headset Mic"},
+       {"IN3P", NULL, "Headset Mic"},
 };
 
 static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_in2_map[] = {
@@ -257,12 +254,6 @@ static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_in2_map[] = {
        {"IN3P", NULL, "Headset Mic"},
 };
 
-static const struct snd_soc_dapm_route byt_rt5651_intmic_in1_hs_in3_map[] = {
-       {"Internal Mic", NULL, "micbias1"},
-       {"IN1P", NULL, "Internal Mic"},
-       {"IN3P", NULL, "Headset Mic"},
-};
-
 static const struct snd_soc_dapm_route byt_rt5651_ssp0_aif1_map[] = {
        {"ssp0 Tx", NULL, "modem_out"},
        {"modem_in", NULL, "ssp0 Rx"},
@@ -348,7 +339,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Circuitco"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "Minnowboard Max B3 PLATFORM"),
                },
-               .driver_data = (void *)(BYT_RT5651_IN1_HS_IN3_MAP),
+               .driver_data = (void *)(BYT_RT5651_IN1_MAP),
        },
        {
                .callback = byt_rt5651_quirk_cb,
@@ -357,7 +348,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "Minnowboard Turbot"),
                },
                .driver_data = (void *)(BYT_RT5651_MCLK_EN |
-                                       BYT_RT5651_IN1_HS_IN3_MAP),
+                                       BYT_RT5651_IN1_MAP),
        },
        {
                .callback = byt_rt5651_quirk_cb,
@@ -376,7 +367,7 @@ static const struct dmi_system_id byt_rt5651_quirk_table[] = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "D2D3_Vi8A1"),
                },
                .driver_data = (void *)(BYT_RT5651_DEFAULT_QUIRKS |
-                                       BYT_RT5651_IN1_HS_IN3_MAP),
+                                       BYT_RT5651_IN1_MAP),
        },
        {
                /* VIOS LTH17 */
@@ -448,10 +439,6 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)
                custom_map = byt_rt5651_intmic_in1_in2_map;
                num_routes = ARRAY_SIZE(byt_rt5651_intmic_in1_in2_map);
                break;
-       case BYT_RT5651_IN1_HS_IN3_MAP:
-               custom_map = byt_rt5651_intmic_in1_hs_in3_map;
-               num_routes = ARRAY_SIZE(byt_rt5651_intmic_in1_hs_in3_map);
-               break;
        default:
                custom_map = byt_rt5651_intmic_dmic_map;
                num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic_map);
@@ -696,10 +683,8 @@ struct acpi_chan_package {   /* ACPICA seems to require 64 bit integers */
 
 static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
 {
-       const char * const intmic_name[] =
-               { "dmic", "in1", "in12", "in1" };
-       const char * const hsmic_name[] =
-               {  "in2", "in2", "in3", "in3" };
+       const char * const intmic_name[] = { "dmic", "in1", "in12" };
+       const char * const hsmic_name[] = { "in2", "in3", "in3" };
        struct byt_rt5651_private *priv;
        struct snd_soc_acpi_mach *mach;
        const char *i2c_name = NULL;