Unverified Commit 3ee1cd4f authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: use standard interface for Atom machine drivers 



Don't rely on internal Atom/SST-specific data structures, use
generic interface to let other drivers use the same machine drivers
as is, e.g. SOF to support BYT-CR devices

Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 842bb513

sound/soc/intel/atom/sst/sst_acpi.c

+4 −0
Original line number Diff line number Diff line
@@ -341,6 +341,10 @@ static int sst_acpi_probe(struct platform_device *pdev) 
		byt_rvp_platform_data.res_info = &bytcr_res_info;

	}



	/* update machine parameters */

	mach->mach_params.acpi_ipc_irq_index =

		pdata->res_info->acpi_ipc_irq_index;



	plat_dev = platform_device_register_data(dev, pdata->platform, -1,

						NULL, 0);

	if (IS_ERR(plat_dev)) {

sound/soc/intel/boards/bytcr_rt5640.c

+1 −5
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/input.h>

#include <linux/slab.h>

#include <asm/cpu_device_id.h>

#include <asm/platform_sst_audio.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>
@@ -1152,10 +1151,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
	 * (will be overridden if DMI quirk is detected)

	 */

	if (is_valleyview()) {

		struct sst_platform_info *p_info = mach->pdata;

		const struct sst_res_info *res_info = p_info->res_info;



		if (res_info->acpi_ipc_irq_index == 0)

		if (mach->mach_params.acpi_ipc_irq_index == 0)

			is_bytcr = true;

	}

sound/soc/intel/boards/bytcr_rt5651.c

+1 −5
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/slab.h>

#include <asm/cpu_device_id.h>

#include <asm/intel-family.h>

#include <asm/platform_sst_audio.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>
@@ -920,10 +919,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
	 * (will be overridden if DMI quirk is detected)

	 */

	if (x86_match_cpu(baytrail_cpu_ids)) {

		struct sst_platform_info *p_info = mach->pdata;

		const struct sst_res_info *res_info = p_info->res_info;



		if (res_info->acpi_ipc_irq_index == 0)

		if (mach->mach_params.acpi_ipc_irq_index == 0)

			is_bytcr = true;

	}

sound/soc/intel/boards/cht_bsw_rt5645.c

+1 −5
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/dmi.h>

#include <linux/slab.h>

#include <asm/cpu_device_id.h>

#include <asm/platform_sst_audio.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>
@@ -585,10 +584,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) 
	 * (will be overridden if DMI quirk is detected)

	 */

	if (is_valleyview()) {

		struct sst_platform_info *p_info = mach->pdata;

		const struct sst_res_info *res_info = p_info->res_info;



		if (res_info->acpi_ipc_irq_index == 0)

		if (mach->mach_params.acpi_ipc_irq_index == 0)

			is_bytcr = true;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE