ASoC: Intel: haswell: Remove haswell-solution specific code (0ce16105) · Commits · 戴 / test

sound/soc/intel/boards/haswell.c

+4 −24

Original line number	Diff line number	Diff line
		@@ -13,9 +13,6 @@
		#include <sound/soc-acpi.h>
		#include <sound/pcm_params.h>

		#include "../common/sst-dsp.h"
		#include "../haswell/sst-haswell-ipc.h"

		#include "../../codecs/rt5640.h"

		/* Haswell ULT platforms have a Headphone and Mic jack */
		@@ -77,25 +74,6 @@ static const struct snd_soc_ops haswell_rt5640_ops = {
		.hw_params = haswell_rt5640_hw_params,
		};

		static int haswell_rtd_init(struct snd_soc_pcm_runtime *rtd)
		{
		struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
		struct sst_pdata *pdata = dev_get_platdata(component->dev);
		struct sst_hsw *haswell = pdata->dsp;
		int ret;

		/* Set ADSP SSP port settings */
		ret = sst_hsw_device_set_config(haswell, SST_HSW_DEVICE_SSP_0,
		SST_HSW_DEVICE_MCLK_FREQ_24_MHZ,
		SST_HSW_DEVICE_CLOCK_MASTER, 9);
		if (ret < 0) {
		dev_err(rtd->dev, "failed to set device config\n");
		return ret;
		}

		return 0;
		}

		SND_SOC_DAILINK_DEF(dummy,
		DAILINK_COMP_ARRAY(COMP_DUMMY()));

		@@ -117,13 +95,15 @@ SND_SOC_DAILINK_DEF(codec,
		SND_SOC_DAILINK_DEF(platform,
		DAILINK_COMP_ARRAY(COMP_PLATFORM("haswell-pcm-audio")));

		SND_SOC_DAILINK_DEF(ssp0_port,
		DAILINK_COMP_ARRAY(COMP_CPU("ssp0-port")));

		static struct snd_soc_dai_link haswell_rt5640_dais[] = {
		/* Front End DAI links */
		{
		.name = "System",
		.stream_name = "System Playback/Capture",
		.dynamic = 1,
		.init = haswell_rtd_init,
		.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
		.dpcm_playback = 1,
		.dpcm_capture = 1,
		@@ -167,7 +147,7 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = {
		.ops = &haswell_rt5640_ops,
		.dpcm_playback = 1,
		.dpcm_capture = 1,
		SND_SOC_DAILINK_REG(dummy, codec, dummy),
		SND_SOC_DAILINK_REG(ssp0_port, codec, platform),
		},
		};

Admin message