ASoC: cs42xx8: Mark chip ID as volatile and remove cache bypass
Subsystems (3)
PATCH v2 1/3 ASoC: cs42xx8: Mark chip ID as volatile and remove cache bypass
Rather than manually enabling cache bypass when reading the ID registers simply remove the default which will cause the first read to go to the hardware. The old code worked this is simply the more standard way to implement this. There is a comment included in the code that claims the chip ID register also contains the right input volume, however this is clearly not the case from the rest of the driver. Further investigation reveals exactly the same comment in the wm8962 driver, where this is the case, so this is almost certainly a copy and paste error from when the driver was created.
---
Changes since v1:
- Don't mark the ID register as volatile.
Thanks,
Charles
sound/soc/codecs/cs42xx8.c | 10 ---------- 1 file changed, 10 deletions(-)
sound/soc/codecs/cs42xx8.c +0 -10
@@ -321,7 +321,6 @@ static struct snd_soc_dai_driver cs42xx8_dai = { };static const struct reg_default cs42xx8_reg[] = { - {0x01 ,0x01 },/* Chip I.D. and Revision Register */ {0x02 ,0x00 },/* Power Control */ {0x03 ,0xF0 },/* Functional Mode */ {0x04 ,0x46 },/* Interface Formats */
@@ -498,13 +497,6 @@ int cs42xx8_probe(struct device *dev, struct regmap *regmap)/* Make sure hardware reset done */ msleep (5 ); -/* -* We haven't marked the chip revision as volatile due to -* sharing a register with the right input volume; explicitly -* bypass the cache to read it. -*/ -regcache_cache_bypass (cs42xx8->regmap, true); -/* Validate the chip ID */ ret =regmap_read (cs42xx8->regmap,CS42XX8_CHIPID , &val);if (ret <0 ) {
@@ -523,8 +515,6 @@ int cs42xx8_probe(struct device *dev, struct regmap *regmap)dev_info (dev,"found device, revision %X\n" , val &CS42XX8_CHIPID_REV_ID_MASK ); -regcache_cache_bypass (cs42xx8->regmap, false); - cs42xx8_dai.name = cs42xx8->drvdata->name;/* Each adc supports stereo input */
Signature · 1 line
2.1.4
PATCH v2 2/3 ASoC: cs42l56: Make ID registers volatile and remove cache bypass
Rather than manually enabling cache bypass when reading the ID registers simply remove the default which will cause the first read to go to the hardware. The old code worked this is simply the more standard way to implement this.
---
Changes since v1:
- Don't mark the ID register as volatile.
Thanks,
Charles
sound/soc/codecs/cs42l56.c | 6 ------ 1 file changed, 6 deletions(-)
sound/soc/codecs/cs42l56.c +0 -6
@@ -64,8 +64,6 @@ struct cs42l56_private { };static const struct reg_default cs42l56_reg_defaults[] = { - {1 ,0x56 },/* r01 - ID 1 */ - {2 ,0x04 },/* r02 - ID 2 */ {3 ,0x7f },/* r03 - Power Ctl 1 */ {4 ,0xff },/* r04 - Power Ctl 2 */ {5 ,0x00 },/* ro5 - Clocking Ctl 1 */
@@ -1262,8 +1260,6 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client,return ret; } -regcache_cache_bypass (cs42l56->regmap, true); - ret =regmap_read (cs42l56->regmap,CS42L56_CHIP_ID_1 , ®); devid = reg &CS42L56_CHIP_ID_MASK ;if (devid !=CS42L56_DEVID ) {
@@ -1279,8 +1275,6 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client,dev_info (&i2c_client->dev,"Alpha Rev %X Metal Rev %X\n" , alpha_rev, metal_rev); -regcache_cache_bypass (cs42l56->regmap, false); -if (cs42l56->pdata.ain1a_ref_cfg)regmap_update_bits (cs42l56->regmap,CS42L56_AIN_REFCFG_ADC_MUX ,CS42L56_AIN1A_REF_MASK ,1 );
Signature · 1 line
2.1.4
PATCH v2 3/3 ASoC: cs42l73: Remove cache bypass for read of ID registers
In reply to Charles KeepaxDon't manually enable cache_bypass for reading the ID registers they don't have a default anyway so the first read will always hit the hardware. The old code worked this is simply the more standard way to implement this.
---
Changes since v1:
- Don't mark the ID register as volatile.
Thanks,
Charles
sound/soc/codecs/cs42l73.c | 4 ---- 1 file changed, 4 deletions(-)
sound/soc/codecs/cs42l73.c +0 -4
@@ -1337,8 +1337,6 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client,gpio_set_value_cansleep (cs42l73->pdata.reset_gpio,1 ); } -regcache_cache_bypass (cs42l73->regmap, true); -/* initialize codec */ ret =regmap_read (cs42l73->regmap,CS42L73_DEVID_AB , ®); devid = (reg &0xFF ) <<12 ;
@@ -1366,8 +1364,6 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client,dev_info (&i2c_client->dev,"Cirrus Logic CS42L73, Revision: %02X\n" , reg &0xFF ); -regcache_cache_bypass (cs42l73->regmap, false); - ret =snd_soc_register_codec (&i2c_client->dev, &soc_codec_dev_cs42l73, cs42l73_dai,ARRAY_SIZE (cs42l73_dai));
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: cs42l73: Remove cache bypass for read of ID registers" to the asoc tree
The patch
ASoC: cs42l73: Remove cache bypass for read of ID registers
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
ca493dabbc77a20c1df9a386f192126b863a2437Mon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Tue, 25 Oct 2016 16:42:31 +0100
Subject: [PATCH] ASoC: cs42l73: Remove cache bypass for read of ID registers
Don't manually enable cache_bypass for reading the ID registers they don't have a default anyway so the first read will always hit the hardware. The old code worked this is simply the more standard way to implement this.
--- sound/soc/codecs/cs42l73.c | 4 ---- 1 file changed, 4 deletions(-)
sound/soc/codecs/cs42l73.c +0 -4
@@ -1337,8 +1337,6 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client,gpio_set_value_cansleep (cs42l73->pdata.reset_gpio,1 ); } -regcache_cache_bypass (cs42l73->regmap, true); -/* initialize codec */ ret =regmap_read (cs42l73->regmap,CS42L73_DEVID_AB , ®); devid = (reg &0xFF ) <<12 ;
@@ -1366,8 +1364,6 @@ static int cs42l73_i2c_probe(struct i2c_client *i2c_client,dev_info (&i2c_client->dev,"Cirrus Logic CS42L73, Revision: %02X\n" , reg &0xFF ); -regcache_cache_bypass (cs42l73->regmap, false); - ret =snd_soc_register_codec (&i2c_client->dev, &soc_codec_dev_cs42l73, cs42l73_dai,ARRAY_SIZE (cs42l73_dai));
Signature · 1 line
2.8.1
Mark Brown
maintainerApplied "ASoC: cs42l56: Make ID registers volatile and remove cache bypass" to the asoc tree
In reply to Charles KeepaxThe patch
ASoC: cs42l56: Make ID registers volatile and remove cache bypass
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
da5eb41763c750d1660ca0a962f15f268821b3e6Mon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Tue, 25 Oct 2016 16:42:30 +0100
Subject: [PATCH] ASoC: cs42l56: Make ID registers volatile and remove cache
bypass
Rather than manually enabling cache bypass when reading the ID registers simply remove the default which will cause the first read to go to the hardware. The old code worked this is simply the more standard way to implement this.
--- sound/soc/codecs/cs42l56.c | 6 ------ 1 file changed, 6 deletions(-)
sound/soc/codecs/cs42l56.c +0 -6
@@ -64,8 +64,6 @@ struct cs42l56_private { };static const struct reg_default cs42l56_reg_defaults[] = { - {1 ,0x56 },/* r01 - ID 1 */ - {2 ,0x04 },/* r02 - ID 2 */ {3 ,0x7f },/* r03 - Power Ctl 1 */ {4 ,0xff },/* r04 - Power Ctl 2 */ {5 ,0x00 },/* ro5 - Clocking Ctl 1 */
@@ -1262,8 +1260,6 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client,return ret; } -regcache_cache_bypass (cs42l56->regmap, true); - ret =regmap_read (cs42l56->regmap,CS42L56_CHIP_ID_1 , ®); devid = reg &CS42L56_CHIP_ID_MASK ;if (devid !=CS42L56_DEVID ) {
@@ -1279,8 +1275,6 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client,dev_info (&i2c_client->dev,"Alpha Rev %X Metal Rev %X\n" , alpha_rev, metal_rev); -regcache_cache_bypass (cs42l56->regmap, false); -if (cs42l56->pdata.ain1a_ref_cfg)regmap_update_bits (cs42l56->regmap,CS42L56_AIN_REFCFG_ADC_MUX ,CS42L56_AIN1A_REF_MASK ,1 );
Signature · 1 line
2.8.1
Mark Brown
maintainerApplied "ASoC: cs42xx8: Mark chip ID as volatile and remove cache bypass" to the asoc tree
In reply to Charles KeepaxThe patch
ASoC: cs42xx8: Mark chip ID as volatile and remove cache bypass
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
03d2ec460f126d8f4409d137b5865bc4eca253c0Mon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Tue, 25 Oct 2016 16:42:29 +0100
Subject: [PATCH] ASoC: cs42xx8: Mark chip ID as volatile and remove cache
bypass
Rather than manually enabling cache bypass when reading the ID registers simply remove the default which will cause the first read to go to the hardware. The old code worked this is simply the more standard way to implement this. There is a comment included in the code that claims the chip ID register also contains the right input volume, however this is clearly not the case from the rest of the driver. Further investigation reveals exactly the same comment in the wm8962 driver, where this is the case, so this is almost certainly a copy and paste error from when the driver was created.
--- sound/soc/codecs/cs42xx8.c | 10 ---------- 1 file changed, 10 deletions(-)
sound/soc/codecs/cs42xx8.c +0 -10
@@ -321,7 +321,6 @@ static struct snd_soc_dai_driver cs42xx8_dai = { };static const struct reg_default cs42xx8_reg[] = { - {0x01 ,0x01 },/* Chip I.D. and Revision Register */ {0x02 ,0x00 },/* Power Control */ {0x03 ,0xF0 },/* Functional Mode */ {0x04 ,0x46 },/* Interface Formats */
@@ -498,13 +497,6 @@ int cs42xx8_probe(struct device *dev, struct regmap *regmap)/* Make sure hardware reset done */ msleep (5 ); -/* -* We haven't marked the chip revision as volatile due to -* sharing a register with the right input volume; explicitly -* bypass the cache to read it. -*/ -regcache_cache_bypass (cs42xx8->regmap, true); -/* Validate the chip ID */ ret =regmap_read (cs42xx8->regmap,CS42XX8_CHIPID , &val);if (ret <0 ) {
@@ -523,8 +515,6 @@ int cs42xx8_probe(struct device *dev, struct regmap *regmap)dev_info (dev,"found device, revision %X\n" , val &CS42XX8_CHIPID_REV_ID_MASK ); -regcache_cache_bypass (cs42xx8->regmap, false); - cs42xx8_dai.name = cs42xx8->drvdata->name;/* Each adc supports stereo input */
Signature · 1 line
2.8.1