ASoC: rt5682: fix i2c arbitration lost issue
Subsystems (2)
Sasha Levin
maintainerPATCH 2/187 spi: pxa2xx: Add support for Intel Jasper Lake
In reply to Sasha LevinFrom: Jarkko Nikula <[email protected]>
[ Upstream commit 9c7315c9fca5de203538163cf42699bb10328902 ]
LPSS SPI on Intel Jasper Lake is compatible with Intel Ice Lake which follows Intel Cannon Lake. Add PCI IDs of Jasper Lake.
--- drivers/spi/spi-pxa2xx.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/spi/spi-pxa2xx.c +4 -0
@@ -1441,6 +1441,10 @@ static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = { { PCI_VDEVICE(INTEL, 0x4b2a), LPSS_BXT_SSP }, { PCI_VDEVICE(INTEL, 0x4b2b), LPSS_BXT_SSP }, { PCI_VDEVICE(INTEL, 0x4b37), LPSS_BXT_SSP }, +/* JSL */ + { PCI_VDEVICE(INTEL, 0x4daa), LPSS_CNL_SSP }, + { PCI_VDEVICE(INTEL, 0x4dab), LPSS_CNL_SSP }, + { PCI_VDEVICE(INTEL, 0x4dfb), LPSS_CNL_SSP },/* APL */ { PCI_VDEVICE(INTEL, 0x5ac2), LPSS_BXT_SSP }, { PCI_VDEVICE(INTEL, 0x5ac4), LPSS_BXT_SSP },
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 1/187 ASoC: rt5682: fix i2c arbitration lost issue
From: Shuming Fan <[email protected]>
[ Upstream commit bc094709de0192a756c6946a7c89c543243ae609 ]
This patch modified the HW initial setting to fix i2c arbitration lost issue.
--- sound/soc/codecs/rt5682.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/rt5682.c +2 -0
@@ -72,6 +72,7 @@ struct rt5682_priv {static const struct reg_sequence patch_list[] = { {RT5682_HP_IMP_SENS_CTRL_19 ,0x1000 }, {RT5682_DAC_ADC_DIG_VOL1 ,0xa020 }, + {RT5682_I2C_CTRL ,0x000f }, };static const struct reg_default rt5682_reg[] = {
@@ -2481,6 +2482,7 @@ static void rt5682_calibrate(struct rt5682_priv *rt5682)mutex_lock (&rt5682->calibrate_mutex);rt5682_reset (rt5682->regmap); +regmap_write (rt5682->regmap,RT5682_I2C_CTRL ,0x000f );regmap_write (rt5682->regmap,RT5682_PWR_ANLG_1 ,0xa2af );usleep_range (15000 ,20000 );regmap_write (rt5682->regmap,RT5682_PWR_ANLG_1 ,0xf2af );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/187 regulator: fix use after free issue
From: Wen Yang <[email protected]>
[ Upstream commit 4affd79a125ac91e6a53be843ea3960a8fc00cbb ]
This is caused by dereferencing 'rdev' after put_device() in the _regulator_get()/_regulator_put() functions. This patch just moves the put_device() down a bit to avoid the issue.
--- drivers/regulator/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/core.c +2 -2
@@ -1935,8 +1935,8 @@ struct regulator *_regulator_get(struct device *dev, const char *id, regulator =create_regulator (rdev, dev, id);if (regulator ==NULL ) { regulator =ERR_PTR (-ENOMEM ); -put_device (&rdev->dev);module_put (rdev->owner); +put_device (&rdev->dev);return regulator; }
@@ -2057,13 +2057,13 @@ static void _regulator_put(struct regulator *regulator) rdev->open_count--; rdev->exclusive =0 ; -put_device (&rdev->dev);regulator_unlock (rdev);kfree_const (regulator->supply_name);kfree (regulator);module_put (rdev->owner); +put_device (&rdev->dev); }/**
Signature · 1 line
2.20.1
Mark Brown
maintainerQuoted 5 lines · Sasha Levin
From: Shuming Fan <[email protected]>
[ Upstream commit
bc094709de0192a756c6946a7c89c543243ae609]This patch modified the HW initial setting to fix i2c arbitration lost issue.
It's not great to send stuff like this out during vacations, there's a good chance people won't be looking at their mail these two weeks...