Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit fbea16db authored by Hans de Goede's avatar Hans de Goede Committed by Mark Brown
Browse files

ASoC: Intel: bytcr_rt5651: Remove is_valleyview helper 



Remove is_valleyview helper, this is not necessary, we can simply call
x86_match_cpu() directly instead.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 81583afe

sound/soc/intel/boards/bytcr_rt5651.c

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

#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>
@@ -680,18 +681,11 @@ static char byt_rt5651_codec_aif_name[12]; /* = "rt5651-aif[1|2]" */ 
static char byt_rt5651_cpu_dai_name[10]; /*  = "ssp[0|2]-port" */

static char byt_rt5651_long_name[40]; /* = "bytcr-rt5651-*-mic[-swapped-hp]" */



static bool is_valleyview(void)

{

	static const struct x86_cpu_id cpu_ids[] = {

		{ X86_VENDOR_INTEL, 6, 55 }, /* Valleyview, Bay Trail */

static const struct x86_cpu_id baytrail_cpu_ids[] = {

	{ X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT1 }, /* Valleyview */

	{}

};



	if (!x86_match_cpu(cpu_ids))

		return false;

	return true;

}



struct acpi_chan_package {   /* ACPICA seems to require 64 bit integers */

	u64 aif_value;       /* 1: AIF1, 2: AIF2 */

	u64 mclock_value;    /* usually 25MHz (0x17d7940), ignored */
@@ -741,7 +735,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
	 * swap SSP0 if bytcr is detected

	 * (will be overridden if DMI quirk is detected)

	 */

	if (is_valleyview()) {

	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;