Commit 092a1362 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.7-rc7' of... 

Merge tag 'asoc-fix-v6.7-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.7

Quite a big collection of fixes, as ever mostly in drivers.  There's one
framework fix for the HDMI CODEC where it wasn't handling startup
properly for some controllers, and one new x86 quirk, but otherwise all
local fixes or dropping things we don't want to see in a release.
parents ae53e219 8f0f0164

sound/soc/codecs/cs35l45-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static struct i2c_driver cs35l45_i2c_driver = { 
	.driver = {

		.name		= "cs35l45",

		.of_match_table = cs35l45_of_match,

		.pm		= &cs35l45_pm_ops,

		.pm		= pm_ptr(&cs35l45_pm_ops),

	},

	.id_table	= cs35l45_id_i2c,

	.probe		= cs35l45_i2c_probe,

sound/soc/codecs/cs35l45-spi.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static struct spi_driver cs35l45_spi_driver = { 
	.driver = {

		.name		= "cs35l45",

		.of_match_table = cs35l45_of_match,

		.pm		= &cs35l45_pm_ops,

		.pm		= pm_ptr(&cs35l45_pm_ops),

	},

	.id_table	= cs35l45_id_spi,

	.probe		= cs35l45_spi_probe,

sound/soc/codecs/cs35l45.c

+51 −5
Original line number Diff line number Diff line
@@ -947,6 +947,8 @@ static int cs35l45_enter_hibernate(struct cs35l45_private *cs35l45) 


	cs35l45_setup_hibernate(cs35l45);



	regmap_set_bits(cs35l45->regmap, CS35L45_IRQ1_MASK_2, CS35L45_DSP_VIRT2_MBOX_MASK);



	// Don't wait for ACK since bus activity would wake the device

	regmap_write(cs35l45->regmap, CS35L45_DSP_VIRT1_MBOX_1, CSPL_MBOX_CMD_HIBERNATE);
@@ -967,6 +969,8 @@ static int cs35l45_exit_hibernate(struct cs35l45_private *cs35l45) 
					  CSPL_MBOX_CMD_OUT_OF_HIBERNATE);

			if (!ret) {

				dev_dbg(cs35l45->dev, "Wake success at cycle: %d\n", j);

				regmap_clear_bits(cs35l45->regmap, CS35L45_IRQ1_MASK_2,

						 CS35L45_DSP_VIRT2_MBOX_MASK);

				return 0;

			}

			usleep_range(100, 200);
@@ -982,7 +986,7 @@ static int cs35l45_exit_hibernate(struct cs35l45_private *cs35l45) 
	return -ETIMEDOUT;

}



static int __maybe_unused cs35l45_runtime_suspend(struct device *dev)

static int cs35l45_runtime_suspend(struct device *dev)

{

	struct cs35l45_private *cs35l45 = dev_get_drvdata(dev);
@@ -999,7 +1003,7 @@ static int __maybe_unused cs35l45_runtime_suspend(struct device *dev) 
	return 0;

}



static int __maybe_unused cs35l45_runtime_resume(struct device *dev)

static int cs35l45_runtime_resume(struct device *dev)

{

	struct cs35l45_private *cs35l45 = dev_get_drvdata(dev);

	int ret;
@@ -1026,6 +1030,46 @@ static int __maybe_unused cs35l45_runtime_resume(struct device *dev) 
	return ret;

}



static int cs35l45_sys_suspend(struct device *dev)

{

	struct cs35l45_private *cs35l45 = dev_get_drvdata(dev);



	dev_dbg(cs35l45->dev, "System suspend, disabling IRQ\n");

	disable_irq(cs35l45->irq);



	return 0;

}



static int cs35l45_sys_suspend_noirq(struct device *dev)

{

	struct cs35l45_private *cs35l45 = dev_get_drvdata(dev);



	dev_dbg(cs35l45->dev, "Late system suspend, reenabling IRQ\n");

	enable_irq(cs35l45->irq);



	return 0;

}



static int cs35l45_sys_resume_noirq(struct device *dev)

{

	struct cs35l45_private *cs35l45 = dev_get_drvdata(dev);



	dev_dbg(cs35l45->dev, "Early system resume, disabling IRQ\n");

	disable_irq(cs35l45->irq);



	return 0;

}



static int cs35l45_sys_resume(struct device *dev)

{

	struct cs35l45_private *cs35l45 = dev_get_drvdata(dev);



	dev_dbg(cs35l45->dev, "System resume, reenabling IRQ\n");

	enable_irq(cs35l45->irq);



	return 0;

}



static int cs35l45_apply_property_config(struct cs35l45_private *cs35l45)

{

	struct device_node *node = cs35l45->dev->of_node;
@@ -1466,10 +1510,12 @@ void cs35l45_remove(struct cs35l45_private *cs35l45) 
}

EXPORT_SYMBOL_NS_GPL(cs35l45_remove, SND_SOC_CS35L45);



const struct dev_pm_ops cs35l45_pm_ops = {

	SET_RUNTIME_PM_OPS(cs35l45_runtime_suspend, cs35l45_runtime_resume, NULL)

EXPORT_GPL_DEV_PM_OPS(cs35l45_pm_ops) = {

	RUNTIME_PM_OPS(cs35l45_runtime_suspend, cs35l45_runtime_resume, NULL)



	SYSTEM_SLEEP_PM_OPS(cs35l45_sys_suspend, cs35l45_sys_resume)

	NOIRQ_SYSTEM_SLEEP_PM_OPS(cs35l45_sys_suspend_noirq, cs35l45_sys_resume_noirq)

};

EXPORT_SYMBOL_NS_GPL(cs35l45_pm_ops, SND_SOC_CS35L45);



MODULE_DESCRIPTION("ASoC CS35L45 driver");

MODULE_AUTHOR("James Schulman, Cirrus Logic Inc, <james.schulman@cirrus.com>");

sound/soc/codecs/cs42l43-jack.c

+12 −11
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ int cs42l43_set_jack(struct snd_soc_component *component, 
	return ret;

}



static void cs42l43_start_hs_bias(struct cs42l43_codec *priv, bool force_high)

static void cs42l43_start_hs_bias(struct cs42l43_codec *priv, bool type_detect)

{

	struct cs42l43 *cs42l43 = priv->core;

	unsigned int val = 0x3 << CS42L43_HSBIAS_MODE_SHIFT;
@@ -247,10 +247,11 @@ static void cs42l43_start_hs_bias(struct cs42l43_codec *priv, bool force_high) 
	regmap_update_bits(cs42l43->regmap, CS42L43_HS2,

			   CS42L43_HS_CLAMP_DISABLE_MASK, CS42L43_HS_CLAMP_DISABLE_MASK);



	if (!force_high && priv->bias_low)

	if (!type_detect) {

		if (priv->bias_low)

			val = 0x2 << CS42L43_HSBIAS_MODE_SHIFT;



	if (priv->bias_sense_ua) {

		if (priv->bias_sense_ua)

			regmap_update_bits(cs42l43->regmap,

					   CS42L43_HS_BIAS_SENSE_AND_CLAMP_AUTOCONTROL,

					   CS42L43_HSBIAS_SENSE_EN_MASK |

sound/soc/codecs/hdmi-codec.c

+10 −2
Original line number Diff line number Diff line
@@ -850,7 +850,8 @@ static int hdmi_dai_probe(struct snd_soc_dai *dai) 
static void hdmi_codec_jack_report(struct hdmi_codec_priv *hcp,

				   unsigned int jack_status)

{

	if (hcp->jack && jack_status != hcp->jack_status) {

	if (jack_status != hcp->jack_status) {

		if (hcp->jack)

			snd_soc_jack_report(hcp->jack, jack_status, SND_JACK_LINEOUT);

		hcp->jack_status = jack_status;

	}
@@ -880,6 +881,13 @@ static int hdmi_codec_set_jack(struct snd_soc_component *component, 


	if (hcp->hcd.ops->hook_plugged_cb) {

		hcp->jack = jack;



		/*

		 * Report the initial jack status which may have been provided

		 * by the parent hdmi driver while the hpd hook was registered.

		 */

		snd_soc_jack_report(jack, hcp->jack_status, SND_JACK_LINEOUT);



		return 0;

	}