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

ASoC: Intel: use common helpers to detect CPUs 



We have duplicated code in multiple locations (atom, machine drivers,
SOF) to detect Baytrail, Cherrytrail and other SOCs. This is not very
elegant, and introduces dependencies on CONFIG_X86 that prevent
COMPILE_TEST from working.

Add common helpers to provide same functionality in a cleaner
way. This will also help support the DMI-based quirks being introduced
to handle SOF/SST autodetection.

Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f499edf9

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

+3 −62
Original line number Diff line number Diff line
@@ -38,12 +38,11 @@ 
#include <acpi/platform/aclinux.h>

#include <acpi/actypes.h>

#include <acpi/acpi_bus.h>

#include <asm/cpu_device_id.h>

#include <asm/iosf_mbi.h>

#include <sound/soc-acpi.h>

#include <sound/soc-acpi-intel-match.h>

#include "../sst-mfld-platform.h"

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

#include "../../common/soc-intel-quirks.h"

#include "sst.h"



/* LPE viewpoint addresses */
@@ -243,64 +242,6 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx) 
	return 0;

}



static int is_byt(void)

{

	bool status = false;

	static const struct x86_cpu_id cpu_ids[] = {

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

		{}

	};

	if (x86_match_cpu(cpu_ids))

		status = true;

	return status;

}



static bool is_byt_cr(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	int status = 0;



	if (!is_byt())

		return false;



	if (iosf_mbi_available()) {

		u32 bios_status;

		status = iosf_mbi_read(BT_MBI_UNIT_PMC, /* 0x04 PUNIT */

				       MBI_REG_READ, /* 0x10 */

				       0x006, /* BIOS_CONFIG */

				       &bios_status);



		if (status) {

			dev_err(dev, "could not read PUNIT BIOS_CONFIG\n");

		} else {

			/* bits 26:27 mirror PMIC options */

			bios_status = (bios_status >> 26) & 3;



			if (bios_status == 1 || bios_status == 3) {

				dev_info(dev, "Detected Baytrail-CR platform\n");

				return true;

			}



			dev_info(dev, "BYT-CR not detected\n");

		}

	} else {

		dev_info(dev, "IOSF_MBI not available, no BYT-CR detection\n");

	}



	if (platform_get_resource(pdev, IORESOURCE_IRQ, 5) == NULL) {

		/*

		 * Some devices detected as BYT-T have only a single IRQ listed,

		 * causing platform_get_irq with index 5 to return -ENXIO.

		 * The correct IRQ in this case is at index 0, as on BYT-CR.

		 */

		dev_info(dev, "Falling back to Baytrail-CR platform\n");

		return true;

	}



	return false;

}





static int sst_acpi_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -325,7 +266,7 @@ static int sst_acpi_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	if (is_byt())

	if (soc_intel_is_byt())

		mach->pdata = &byt_rvp_platform_data;

	else

		mach->pdata = &chv_platform_data;
@@ -343,7 +284,7 @@ static int sst_acpi_probe(struct platform_device *pdev) 
	if (ret < 0)

		return ret;



	if (is_byt_cr(pdev)) {

	if (soc_intel_is_byt_cr(pdev)) {

		/* override resource info */

		byt_rvp_platform_data.res_info = &bytcr_res_info;

	}

sound/soc/intel/boards/bxt_da7219_max98357a.c

+3 −8
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
 * GNU General Public License for more details.

 */



#include <asm/cpu_device_id.h>

#include <linux/input.h>

#include <linux/module.h>

#include <linux/platform_device.h>
@@ -29,6 +28,7 @@ 
#include "../../codecs/hdac_hdmi.h"

#include "../../codecs/da7219.h"

#include "../../codecs/da7219-aad.h"

#include "../common/soc-intel-quirks.h"



#define BXT_DIALOG_CODEC_DAI	"da7219-hifi"

#define BXT_MAXIM_CODEC_DAI	"HiFi"
@@ -568,11 +568,6 @@ static struct snd_soc_dai_link broxton_dais[] = { 
	},

};



static const struct x86_cpu_id glk_ids[] = {

	{ X86_VENDOR_INTEL, 6, 0x7A }, /* Geminilake CPU_ID */

	{}

};



#define NAME_SIZE	32

static int bxt_card_late_probe(struct snd_soc_card *card)

{
@@ -582,7 +577,7 @@ static int bxt_card_late_probe(struct snd_soc_card *card) 
	int err, i = 0;

	char jack_name[NAME_SIZE];



	if (x86_match_cpu(glk_ids))

	if (soc_intel_is_glk())

		snd_soc_dapm_add_routes(&card->dapm, gemini_map,

					ARRAY_SIZE(gemini_map));

	else
@@ -645,7 +640,7 @@ static int broxton_audio_probe(struct platform_device *pdev) 


	broxton_audio_card.dev = &pdev->dev;

	snd_soc_card_set_drvdata(&broxton_audio_card, ctx);

	if (x86_match_cpu(glk_ids)) {

	if (soc_intel_is_glk()) {

		unsigned int i;



		broxton_audio_card.name = "glkda7219max";

sound/soc/intel/boards/bytcht_es8316.c

+3 −9
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <asm/cpu_device_id.h>

#include <asm/intel-family.h>

#include <asm/platform_sst_audio.h>

#include <sound/jack.h>

#include <sound/pcm.h>
@@ -40,6 +38,7 @@ 
#include <sound/soc-acpi.h>

#include "../atom/sst-atom-controls.h"

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

#include "../common/soc-intel-quirks.h"



/* jd-inv + terminating entry */

#define MAX_NO_PROPS 2
@@ -430,11 +429,6 @@ static struct snd_soc_card byt_cht_es8316_card = { 
	.resume_post = byt_cht_es8316_resume,

};



static const struct x86_cpu_id baytrail_cpu_ids[] = {

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

	{}

};



static const struct acpi_gpio_params first_gpio = { 0, 0, false };



static const struct acpi_gpio_mapping byt_cht_es8316_gpios[] = {
@@ -506,7 +500,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) 
	dmi_id = dmi_first_match(byt_cht_es8316_quirk_table);

	if (dmi_id) {

		quirk = (unsigned long)dmi_id->driver_data;

	} else if (x86_match_cpu(baytrail_cpu_ids) &&

	} else if (soc_intel_is_byt() &&

		   mach->mach_params.acpi_ipc_irq_index == 0) {

		/* On BYTCR default to SSP0, internal-mic-in2-map, mono-spk */

		quirk = BYT_CHT_ES8316_SSP0 | BYT_CHT_ES8316_INTMIC_IN2_MAP |

sound/soc/intel/boards/bytcr_rt5640.c

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

#include <linux/input.h>

#include <linux/slab.h>

#include <asm/cpu_device_id.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>
@@ -38,6 +37,7 @@ 
#include "../../codecs/rt5640.h"

#include "../atom/sst-atom-controls.h"

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

#include "../common/soc-intel-quirks.h"



enum {

	BYT_RT5640_DMIC1_MAP,
@@ -1130,18 +1130,6 @@ static struct snd_soc_card byt_rt5640_card = { 
	.resume_post = byt_rt5640_resume,

};



static bool is_valleyview(void)

{

	static const struct x86_cpu_id cpu_ids[] = {

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

		{}

	};



	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 */
@@ -1190,7 +1178,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
	 * swap SSP0 if bytcr is detected

	 * (will be overridden if DMI quirk is detected)

	 */

	if (is_valleyview()) {

	if (soc_intel_is_byt()) {

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

			is_bytcr = true;

	}

sound/soc/intel/boards/bytcr_rt5651.c

+3 −14
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#include <linux/gpio/consumer.h>

#include <linux/gpio/machine.h>

#include <linux/slab.h>

#include <asm/cpu_device_id.h>

#include <asm/intel-family.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>
@@ -39,6 +37,7 @@ 
#include <sound/soc-acpi.h>

#include "../../codecs/rt5651.h"

#include "../atom/sst-atom-controls.h"

#include "../common/soc-intel-quirks.h"



enum {

	BYT_RT5651_DMIC_MAP,
@@ -852,16 +851,6 @@ static struct snd_soc_card byt_rt5651_card = { 
	.resume_post = byt_rt5651_resume,

};



static const struct x86_cpu_id baytrail_cpu_ids[] = {

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

	{}

};



static const struct x86_cpu_id cherrytrail_cpu_ids[] = {

	{ X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_AIRMONT },     /* Braswell */

	{}

};



static const struct acpi_gpio_params ext_amp_enable_gpios = { 0, 0, false };



static const struct acpi_gpio_mapping cht_rt5651_gpios[] = {
@@ -932,7 +921,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 (x86_match_cpu(baytrail_cpu_ids)) {

	if (soc_intel_is_byt()) {

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

			is_bytcr = true;

	}
@@ -1001,7 +990,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
	}



	/* Cherry Trail devices use an external amplifier enable gpio */

	if (x86_match_cpu(cherrytrail_cpu_ids) && !byt_rt5651_gpios)

	if (soc_intel_is_cht() && !byt_rt5651_gpios)

		byt_rt5651_gpios = cht_rt5651_gpios;



	if (byt_rt5651_gpios) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE