ASoC: Intel: Rename broadwell source file to bdw_rt286
authorCezary Rojewski <cezary.rojewski@intel.com>
Mon, 20 Jun 2022 10:13:53 +0000 (12:13 +0200)
committerMark Brown <broonie@kernel.org>
Thu, 23 Jun 2022 12:07:36 +0000 (13:07 +0100)
Rename source file to drop any ambiguity.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Tested-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220620101402.2684366-9-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/Makefile
sound/soc/intel/boards/bdw_rt286.c [new file with mode: 0644]
sound/soc/intel/boards/broadwell.c [deleted file]

index e479546a3d4b8a4bd7ac952002b288d635bf549e..eea1e26acfdaa206eef3f9d938d2a8d47294479d 100644 (file)
@@ -2,7 +2,7 @@
 snd-soc-sst-haswell-objs := hsw_rt5640.o
 snd-soc-sst-bdw-rt5650-mach-objs := bdw-rt5650.o
 snd-soc-sst-bdw-rt5677-mach-objs := bdw-rt5677.o
-snd-soc-sst-broadwell-objs := broadwell.o
+snd-soc-sst-broadwell-objs := bdw_rt286.o
 snd-soc-sst-bxt-da7219_max98357a-objs := bxt_da7219_max98357a.o
 snd-soc-sst-bxt-rt298-objs := bxt_rt298.o
 snd-soc-sst-sof-pcm512x-objs := sof_pcm512x.o
diff --git a/sound/soc/intel/boards/bdw_rt286.c b/sound/soc/intel/boards/bdw_rt286.c
new file mode 100644 (file)
index 0000000..48bf324
--- /dev/null
@@ -0,0 +1,338 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Intel Broadwell Wildcatpoint SST Audio
+ *
+ * Copyright (C) 2013, Intel Corporation. All rights reserved.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+#include <sound/jack.h>
+#include <sound/pcm_params.h>
+#include <sound/soc-acpi.h>
+
+#include "../../codecs/rt286.h"
+
+static struct snd_soc_jack broadwell_headset;
+/* Headset jack detection DAPM pins */
+static struct snd_soc_jack_pin broadwell_headset_pins[] = {
+       {
+               .pin = "Mic Jack",
+               .mask = SND_JACK_MICROPHONE,
+       },
+       {
+               .pin = "Headphone Jack",
+               .mask = SND_JACK_HEADPHONE,
+       },
+};
+
+static const struct snd_kcontrol_new broadwell_controls[] = {
+       SOC_DAPM_PIN_SWITCH("Speaker"),
+       SOC_DAPM_PIN_SWITCH("Headphone Jack"),
+};
+
+static const struct snd_soc_dapm_widget broadwell_widgets[] = {
+       SND_SOC_DAPM_HP("Headphone Jack", NULL),
+       SND_SOC_DAPM_SPK("Speaker", NULL),
+       SND_SOC_DAPM_MIC("Mic Jack", NULL),
+       SND_SOC_DAPM_MIC("DMIC1", NULL),
+       SND_SOC_DAPM_MIC("DMIC2", NULL),
+       SND_SOC_DAPM_LINE("Line Jack", NULL),
+};
+
+static const struct snd_soc_dapm_route broadwell_rt286_map[] = {
+
+       /* speaker */
+       {"Speaker", NULL, "SPOR"},
+       {"Speaker", NULL, "SPOL"},
+
+       /* HP jack connectors - unknown if we have jack deteck */
+       {"Headphone Jack", NULL, "HPO Pin"},
+
+       /* other jacks */
+       {"MIC1", NULL, "Mic Jack"},
+       {"LINE1", NULL, "Line Jack"},
+
+       /* digital mics */
+       {"DMIC1 Pin", NULL, "DMIC1"},
+       {"DMIC2 Pin", NULL, "DMIC2"},
+
+       /* CODEC BE connections */
+       {"SSP0 CODEC IN", NULL, "AIF1 Capture"},
+       {"AIF1 Playback", NULL, "SSP0 CODEC OUT"},
+};
+
+static int broadwell_rt286_codec_init(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
+       int ret = 0;
+       ret = snd_soc_card_jack_new_pins(rtd->card, "Headset",
+               SND_JACK_HEADSET | SND_JACK_BTN_0, &broadwell_headset,
+               broadwell_headset_pins, ARRAY_SIZE(broadwell_headset_pins));
+       if (ret)
+               return ret;
+
+       snd_soc_component_set_jack(component, &broadwell_headset, NULL);
+       return 0;
+}
+
+
+static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd,
+                       struct snd_pcm_hw_params *params)
+{
+       struct snd_interval *rate = hw_param_interval(params,
+                                                     SNDRV_PCM_HW_PARAM_RATE);
+       struct snd_interval *chan = hw_param_interval(params,
+                                                     SNDRV_PCM_HW_PARAM_CHANNELS);
+
+       /* The ADSP will covert the FE rate to 48k, stereo */
+       rate->min = rate->max = 48000;
+       chan->min = chan->max = 2;
+
+       /* set SSP0 to 16 bit */
+       params_set_format(params, SNDRV_PCM_FORMAT_S16_LE);
+       return 0;
+}
+
+static int broadwell_rt286_hw_params(struct snd_pcm_substream *substream,
+       struct snd_pcm_hw_params *params)
+{
+       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+       struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
+       int ret;
+
+       ret = snd_soc_dai_set_sysclk(codec_dai, RT286_SCLK_S_PLL, 24000000,
+               SND_SOC_CLOCK_IN);
+
+       if (ret < 0) {
+               dev_err(rtd->dev, "can't set codec sysclk configuration\n");
+               return ret;
+       }
+
+       return ret;
+}
+
+static const struct snd_soc_ops broadwell_rt286_ops = {
+       .hw_params = broadwell_rt286_hw_params,
+};
+
+static const unsigned int channels[] = {
+       2,
+};
+
+static const struct snd_pcm_hw_constraint_list constraints_channels = {
+       .count = ARRAY_SIZE(channels),
+       .list = channels,
+       .mask = 0,
+};
+
+static int broadwell_fe_startup(struct snd_pcm_substream *substream)
+{
+       struct snd_pcm_runtime *runtime = substream->runtime;
+
+       /* Board supports stereo configuration only */
+       runtime->hw.channels_max = 2;
+       return snd_pcm_hw_constraint_list(runtime, 0,
+                                         SNDRV_PCM_HW_PARAM_CHANNELS,
+                                         &constraints_channels);
+}
+
+static const struct snd_soc_ops broadwell_fe_ops = {
+       .startup = broadwell_fe_startup,
+};
+
+SND_SOC_DAILINK_DEF(system,
+       DAILINK_COMP_ARRAY(COMP_CPU("System Pin")));
+
+SND_SOC_DAILINK_DEF(offload0,
+       DAILINK_COMP_ARRAY(COMP_CPU("Offload0 Pin")));
+
+SND_SOC_DAILINK_DEF(offload1,
+       DAILINK_COMP_ARRAY(COMP_CPU("Offload1 Pin")));
+
+SND_SOC_DAILINK_DEF(loopback,
+       DAILINK_COMP_ARRAY(COMP_CPU("Loopback Pin")));
+
+SND_SOC_DAILINK_DEF(dummy,
+       DAILINK_COMP_ARRAY(COMP_DUMMY()));
+
+SND_SOC_DAILINK_DEF(platform,
+       DAILINK_COMP_ARRAY(COMP_PLATFORM("haswell-pcm-audio")));
+
+SND_SOC_DAILINK_DEF(codec,
+       DAILINK_COMP_ARRAY(COMP_CODEC("i2c-INT343A:00", "rt286-aif1")));
+
+SND_SOC_DAILINK_DEF(ssp0_port,
+           DAILINK_COMP_ARRAY(COMP_CPU("ssp0-port")));
+
+/* broadwell digital audio interface glue - connects codec <--> CPU */
+static struct snd_soc_dai_link broadwell_rt286_dais[] = {
+       /* Front End DAI links */
+       {
+               .name = "System PCM",
+               .stream_name = "System Playback/Capture",
+               .nonatomic = 1,
+               .dynamic = 1,
+               .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+               .ops = &broadwell_fe_ops,
+               .dpcm_playback = 1,
+               .dpcm_capture = 1,
+               SND_SOC_DAILINK_REG(system, dummy, platform),
+       },
+       {
+               .name = "Offload0",
+               .stream_name = "Offload0 Playback",
+               .nonatomic = 1,
+               .dynamic = 1,
+               .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+               .dpcm_playback = 1,
+               SND_SOC_DAILINK_REG(offload0, dummy, platform),
+       },
+       {
+               .name = "Offload1",
+               .stream_name = "Offload1 Playback",
+               .nonatomic = 1,
+               .dynamic = 1,
+               .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+               .dpcm_playback = 1,
+               SND_SOC_DAILINK_REG(offload1, dummy, platform),
+       },
+       {
+               .name = "Loopback PCM",
+               .stream_name = "Loopback",
+               .nonatomic = 1,
+               .dynamic = 1,
+               .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+               .dpcm_capture = 1,
+               SND_SOC_DAILINK_REG(loopback, dummy, platform),
+       },
+       /* Back End DAI links */
+       {
+               /* SSP0 - Codec */
+               .name = "Codec",
+               .id = 0,
+               .no_pcm = 1,
+               .init = broadwell_rt286_codec_init,
+               .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+                       SND_SOC_DAIFMT_CBC_CFC,
+               .ignore_pmdown_time = 1,
+               .be_hw_params_fixup = broadwell_ssp0_fixup,
+               .ops = &broadwell_rt286_ops,
+               .dpcm_playback = 1,
+               .dpcm_capture = 1,
+               SND_SOC_DAILINK_REG(ssp0_port, codec, platform),
+       },
+};
+
+static void broadwell_disable_jack(struct snd_soc_card *card)
+{
+       struct snd_soc_component *component;
+
+       for_each_card_components(card, component) {
+               if (!strcmp(component->name, "i2c-INT343A:00")) {
+
+                       dev_dbg(component->dev, "disabling jack detect before going to suspend.\n");
+                       snd_soc_component_set_jack(component, NULL, NULL);
+                       break;
+               }
+       }
+}
+
+static int broadwell_suspend(struct snd_soc_card *card)
+{
+       broadwell_disable_jack(card);
+
+       return 0;
+}
+
+static int broadwell_resume(struct snd_soc_card *card){
+       struct snd_soc_component *component;
+
+       for_each_card_components(card, component) {
+               if (!strcmp(component->name, "i2c-INT343A:00")) {
+
+                       dev_dbg(component->dev, "enabling jack detect for resume.\n");
+                       snd_soc_component_set_jack(component, &broadwell_headset, NULL);
+                       break;
+               }
+       }
+       return 0;
+}
+
+/* use space before codec name to simplify card ID, and simplify driver name */
+#define SOF_CARD_NAME "bdw rt286" /* card name will be 'sof-bdw rt286' */
+#define SOF_DRIVER_NAME "SOF"
+
+#define CARD_NAME "broadwell-rt286"
+#define DRIVER_NAME NULL /* card name will be used for driver name */
+
+/* broadwell audio machine driver for WPT + RT286S */
+static struct snd_soc_card broadwell_rt286 = {
+       .owner = THIS_MODULE,
+       .dai_link = broadwell_rt286_dais,
+       .num_links = ARRAY_SIZE(broadwell_rt286_dais),
+       .controls = broadwell_controls,
+       .num_controls = ARRAY_SIZE(broadwell_controls),
+       .dapm_widgets = broadwell_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(broadwell_widgets),
+       .dapm_routes = broadwell_rt286_map,
+       .num_dapm_routes = ARRAY_SIZE(broadwell_rt286_map),
+       .fully_routed = true,
+       .suspend_pre = broadwell_suspend,
+       .resume_post = broadwell_resume,
+};
+
+static int broadwell_audio_probe(struct platform_device *pdev)
+{
+       struct snd_soc_acpi_mach *mach;
+       int ret;
+
+       broadwell_rt286.dev = &pdev->dev;
+
+       /* override platform name, if required */
+       mach = pdev->dev.platform_data;
+       ret = snd_soc_fixup_dai_links_platform_name(&broadwell_rt286,
+                                                   mach->mach_params.platform);
+       if (ret)
+               return ret;
+
+       /* set card and driver name */
+       if (snd_soc_acpi_sof_parent(&pdev->dev)) {
+               broadwell_rt286.name = SOF_CARD_NAME;
+               broadwell_rt286.driver_name = SOF_DRIVER_NAME;
+       } else {
+               broadwell_rt286.name = CARD_NAME;
+               broadwell_rt286.driver_name = DRIVER_NAME;
+       }
+
+       return devm_snd_soc_register_card(&pdev->dev, &broadwell_rt286);
+}
+
+static int broadwell_audio_remove(struct platform_device *pdev)
+{
+       struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+       broadwell_disable_jack(card);
+
+       return 0;
+}
+
+static struct platform_driver broadwell_audio = {
+       .probe = broadwell_audio_probe,
+       .remove = broadwell_audio_remove,
+       .driver = {
+               .name = "broadwell-audio",
+               .pm = &snd_soc_pm_ops
+       },
+};
+
+module_platform_driver(broadwell_audio)
+
+/* Module information */
+MODULE_AUTHOR("Liam Girdwood, Xingchao Wang");
+MODULE_DESCRIPTION("Intel SST Audio for WPT/Broadwell");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:broadwell-audio");
diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c
deleted file mode 100644 (file)
index 48bf324..0000000
+++ /dev/null
@@ -1,338 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Intel Broadwell Wildcatpoint SST Audio
- *
- * Copyright (C) 2013, Intel Corporation. All rights reserved.
- */
-
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/soc.h>
-#include <sound/jack.h>
-#include <sound/pcm_params.h>
-#include <sound/soc-acpi.h>
-
-#include "../../codecs/rt286.h"
-
-static struct snd_soc_jack broadwell_headset;
-/* Headset jack detection DAPM pins */
-static struct snd_soc_jack_pin broadwell_headset_pins[] = {
-       {
-               .pin = "Mic Jack",
-               .mask = SND_JACK_MICROPHONE,
-       },
-       {
-               .pin = "Headphone Jack",
-               .mask = SND_JACK_HEADPHONE,
-       },
-};
-
-static const struct snd_kcontrol_new broadwell_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Speaker"),
-       SOC_DAPM_PIN_SWITCH("Headphone Jack"),
-};
-
-static const struct snd_soc_dapm_widget broadwell_widgets[] = {
-       SND_SOC_DAPM_HP("Headphone Jack", NULL),
-       SND_SOC_DAPM_SPK("Speaker", NULL),
-       SND_SOC_DAPM_MIC("Mic Jack", NULL),
-       SND_SOC_DAPM_MIC("DMIC1", NULL),
-       SND_SOC_DAPM_MIC("DMIC2", NULL),
-       SND_SOC_DAPM_LINE("Line Jack", NULL),
-};
-
-static const struct snd_soc_dapm_route broadwell_rt286_map[] = {
-
-       /* speaker */
-       {"Speaker", NULL, "SPOR"},
-       {"Speaker", NULL, "SPOL"},
-
-       /* HP jack connectors - unknown if we have jack deteck */
-       {"Headphone Jack", NULL, "HPO Pin"},
-
-       /* other jacks */
-       {"MIC1", NULL, "Mic Jack"},
-       {"LINE1", NULL, "Line Jack"},
-
-       /* digital mics */
-       {"DMIC1 Pin", NULL, "DMIC1"},
-       {"DMIC2 Pin", NULL, "DMIC2"},
-
-       /* CODEC BE connections */
-       {"SSP0 CODEC IN", NULL, "AIF1 Capture"},
-       {"AIF1 Playback", NULL, "SSP0 CODEC OUT"},
-};
-
-static int broadwell_rt286_codec_init(struct snd_soc_pcm_runtime *rtd)
-{
-       struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-       int ret = 0;
-       ret = snd_soc_card_jack_new_pins(rtd->card, "Headset",
-               SND_JACK_HEADSET | SND_JACK_BTN_0, &broadwell_headset,
-               broadwell_headset_pins, ARRAY_SIZE(broadwell_headset_pins));
-       if (ret)
-               return ret;
-
-       snd_soc_component_set_jack(component, &broadwell_headset, NULL);
-       return 0;
-}
-
-
-static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd,
-                       struct snd_pcm_hw_params *params)
-{
-       struct snd_interval *rate = hw_param_interval(params,
-                                                     SNDRV_PCM_HW_PARAM_RATE);
-       struct snd_interval *chan = hw_param_interval(params,
-                                                     SNDRV_PCM_HW_PARAM_CHANNELS);
-
-       /* The ADSP will covert the FE rate to 48k, stereo */
-       rate->min = rate->max = 48000;
-       chan->min = chan->max = 2;
-
-       /* set SSP0 to 16 bit */
-       params_set_format(params, SNDRV_PCM_FORMAT_S16_LE);
-       return 0;
-}
-
-static int broadwell_rt286_hw_params(struct snd_pcm_substream *substream,
-       struct snd_pcm_hw_params *params)
-{
-       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-       struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
-       int ret;
-
-       ret = snd_soc_dai_set_sysclk(codec_dai, RT286_SCLK_S_PLL, 24000000,
-               SND_SOC_CLOCK_IN);
-
-       if (ret < 0) {
-               dev_err(rtd->dev, "can't set codec sysclk configuration\n");
-               return ret;
-       }
-
-       return ret;
-}
-
-static const struct snd_soc_ops broadwell_rt286_ops = {
-       .hw_params = broadwell_rt286_hw_params,
-};
-
-static const unsigned int channels[] = {
-       2,
-};
-
-static const struct snd_pcm_hw_constraint_list constraints_channels = {
-       .count = ARRAY_SIZE(channels),
-       .list = channels,
-       .mask = 0,
-};
-
-static int broadwell_fe_startup(struct snd_pcm_substream *substream)
-{
-       struct snd_pcm_runtime *runtime = substream->runtime;
-
-       /* Board supports stereo configuration only */
-       runtime->hw.channels_max = 2;
-       return snd_pcm_hw_constraint_list(runtime, 0,
-                                         SNDRV_PCM_HW_PARAM_CHANNELS,
-                                         &constraints_channels);
-}
-
-static const struct snd_soc_ops broadwell_fe_ops = {
-       .startup = broadwell_fe_startup,
-};
-
-SND_SOC_DAILINK_DEF(system,
-       DAILINK_COMP_ARRAY(COMP_CPU("System Pin")));
-
-SND_SOC_DAILINK_DEF(offload0,
-       DAILINK_COMP_ARRAY(COMP_CPU("Offload0 Pin")));
-
-SND_SOC_DAILINK_DEF(offload1,
-       DAILINK_COMP_ARRAY(COMP_CPU("Offload1 Pin")));
-
-SND_SOC_DAILINK_DEF(loopback,
-       DAILINK_COMP_ARRAY(COMP_CPU("Loopback Pin")));
-
-SND_SOC_DAILINK_DEF(dummy,
-       DAILINK_COMP_ARRAY(COMP_DUMMY()));
-
-SND_SOC_DAILINK_DEF(platform,
-       DAILINK_COMP_ARRAY(COMP_PLATFORM("haswell-pcm-audio")));
-
-SND_SOC_DAILINK_DEF(codec,
-       DAILINK_COMP_ARRAY(COMP_CODEC("i2c-INT343A:00", "rt286-aif1")));
-
-SND_SOC_DAILINK_DEF(ssp0_port,
-           DAILINK_COMP_ARRAY(COMP_CPU("ssp0-port")));
-
-/* broadwell digital audio interface glue - connects codec <--> CPU */
-static struct snd_soc_dai_link broadwell_rt286_dais[] = {
-       /* Front End DAI links */
-       {
-               .name = "System PCM",
-               .stream_name = "System Playback/Capture",
-               .nonatomic = 1,
-               .dynamic = 1,
-               .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
-               .ops = &broadwell_fe_ops,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
-               SND_SOC_DAILINK_REG(system, dummy, platform),
-       },
-       {
-               .name = "Offload0",
-               .stream_name = "Offload0 Playback",
-               .nonatomic = 1,
-               .dynamic = 1,
-               .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
-               .dpcm_playback = 1,
-               SND_SOC_DAILINK_REG(offload0, dummy, platform),
-       },
-       {
-               .name = "Offload1",
-               .stream_name = "Offload1 Playback",
-               .nonatomic = 1,
-               .dynamic = 1,
-               .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
-               .dpcm_playback = 1,
-               SND_SOC_DAILINK_REG(offload1, dummy, platform),
-       },
-       {
-               .name = "Loopback PCM",
-               .stream_name = "Loopback",
-               .nonatomic = 1,
-               .dynamic = 1,
-               .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
-               .dpcm_capture = 1,
-               SND_SOC_DAILINK_REG(loopback, dummy, platform),
-       },
-       /* Back End DAI links */
-       {
-               /* SSP0 - Codec */
-               .name = "Codec",
-               .id = 0,
-               .no_pcm = 1,
-               .init = broadwell_rt286_codec_init,
-               .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                       SND_SOC_DAIFMT_CBC_CFC,
-               .ignore_pmdown_time = 1,
-               .be_hw_params_fixup = broadwell_ssp0_fixup,
-               .ops = &broadwell_rt286_ops,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
-               SND_SOC_DAILINK_REG(ssp0_port, codec, platform),
-       },
-};
-
-static void broadwell_disable_jack(struct snd_soc_card *card)
-{
-       struct snd_soc_component *component;
-
-       for_each_card_components(card, component) {
-               if (!strcmp(component->name, "i2c-INT343A:00")) {
-
-                       dev_dbg(component->dev, "disabling jack detect before going to suspend.\n");
-                       snd_soc_component_set_jack(component, NULL, NULL);
-                       break;
-               }
-       }
-}
-
-static int broadwell_suspend(struct snd_soc_card *card)
-{
-       broadwell_disable_jack(card);
-
-       return 0;
-}
-
-static int broadwell_resume(struct snd_soc_card *card){
-       struct snd_soc_component *component;
-
-       for_each_card_components(card, component) {
-               if (!strcmp(component->name, "i2c-INT343A:00")) {
-
-                       dev_dbg(component->dev, "enabling jack detect for resume.\n");
-                       snd_soc_component_set_jack(component, &broadwell_headset, NULL);
-                       break;
-               }
-       }
-       return 0;
-}
-
-/* use space before codec name to simplify card ID, and simplify driver name */
-#define SOF_CARD_NAME "bdw rt286" /* card name will be 'sof-bdw rt286' */
-#define SOF_DRIVER_NAME "SOF"
-
-#define CARD_NAME "broadwell-rt286"
-#define DRIVER_NAME NULL /* card name will be used for driver name */
-
-/* broadwell audio machine driver for WPT + RT286S */
-static struct snd_soc_card broadwell_rt286 = {
-       .owner = THIS_MODULE,
-       .dai_link = broadwell_rt286_dais,
-       .num_links = ARRAY_SIZE(broadwell_rt286_dais),
-       .controls = broadwell_controls,
-       .num_controls = ARRAY_SIZE(broadwell_controls),
-       .dapm_widgets = broadwell_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(broadwell_widgets),
-       .dapm_routes = broadwell_rt286_map,
-       .num_dapm_routes = ARRAY_SIZE(broadwell_rt286_map),
-       .fully_routed = true,
-       .suspend_pre = broadwell_suspend,
-       .resume_post = broadwell_resume,
-};
-
-static int broadwell_audio_probe(struct platform_device *pdev)
-{
-       struct snd_soc_acpi_mach *mach;
-       int ret;
-
-       broadwell_rt286.dev = &pdev->dev;
-
-       /* override platform name, if required */
-       mach = pdev->dev.platform_data;
-       ret = snd_soc_fixup_dai_links_platform_name(&broadwell_rt286,
-                                                   mach->mach_params.platform);
-       if (ret)
-               return ret;
-
-       /* set card and driver name */
-       if (snd_soc_acpi_sof_parent(&pdev->dev)) {
-               broadwell_rt286.name = SOF_CARD_NAME;
-               broadwell_rt286.driver_name = SOF_DRIVER_NAME;
-       } else {
-               broadwell_rt286.name = CARD_NAME;
-               broadwell_rt286.driver_name = DRIVER_NAME;
-       }
-
-       return devm_snd_soc_register_card(&pdev->dev, &broadwell_rt286);
-}
-
-static int broadwell_audio_remove(struct platform_device *pdev)
-{
-       struct snd_soc_card *card = platform_get_drvdata(pdev);
-
-       broadwell_disable_jack(card);
-
-       return 0;
-}
-
-static struct platform_driver broadwell_audio = {
-       .probe = broadwell_audio_probe,
-       .remove = broadwell_audio_remove,
-       .driver = {
-               .name = "broadwell-audio",
-               .pm = &snd_soc_pm_ops
-       },
-};
-
-module_platform_driver(broadwell_audio)
-
-/* Module information */
-MODULE_AUTHOR("Liam Girdwood, Xingchao Wang");
-MODULE_DESCRIPTION("Intel SST Audio for WPT/Broadwell");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:broadwell-audio");