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

Unverified Commit fee15714 authored by Stephan Gerhold's avatar Stephan Gerhold Committed by Mark Brown
Browse files

ASoC: Intel: sst: Fallback to BYT-CR if IRQ 5 is missing 

Some devices detected as BYT-T by the PMIC-type based detection
have only a single IRQ listed in the 80860F28 ACPI device. This
causes -ENXIO later when attempting to get the IRQ at index 5.
It turns out these devices behave more like BYT-CR devices,
and using the IRQ at index 0 makes sound work correctly.

This patch adds a fallback for these devices to is_byt_cr():
If there is no IRQ resource at index 5, treating the device
as BYT-T is guaranteed to fail later, so we can safely treat
these devices as BYT-CR without breaking any working device.

Link: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-December/143176.html


Signed-off-by: default avatarStephan Gerhold <stephan@gerhold.net>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b97205ef

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

+14 −2
Original line number Diff line number Diff line
@@ -255,8 +255,9 @@ static int is_byt(void) 
	return status;

}



static bool is_byt_cr(struct device *dev)

static bool is_byt_cr(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	int status = 0;



	if (!is_byt())
@@ -285,6 +286,17 @@ static bool is_byt_cr(struct device *dev) 
	} 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;

}
@@ -331,7 +343,7 @@ static int sst_acpi_probe(struct platform_device *pdev) 
	if (ret < 0)

		return ret;



	if (is_byt_cr(dev)) {

	if (is_byt_cr(pdev)) {

		/* override resource info */

		byt_rvp_platform_data.res_info = &bytcr_res_info;

	}