| Message ID | 1397723743.601.0.camel@phoenix (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1025c05f727be33e065bb502a223637681c7991d |
| Headers | show |
On Thu, 17 Apr 2014, Axel Lin wrote: > The REVID mask was changed by commit a1253ef6d3fa > "ASoC: cs42l51: split i2c from codec driver". Fix it. > > Signed-off-by: Axel Lin <axel.lin@ingics.com> Sorry about that. Acked-by: Brian Austin <brian.austin@cirrus.com>
On Thu, Apr 17, 2014 at 04:35:43PM +0800, Axel Lin wrote: > The REVID mask was changed by commit a1253ef6d3fa > "ASoC: cs42l51: split i2c from codec driver". Fix it. Applied, thanks.
diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index dadc20d..09488d9 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c @@ -548,7 +548,8 @@ int cs42l51_probe(struct device *dev, struct regmap *regmap) ret = -ENODEV; goto error; } - dev_info(dev, "Cirrus Logic CS42L51, Revision: %02X\n", val & 0xFF); + dev_info(dev, "Cirrus Logic CS42L51, Revision: %02X\n", + val & CS42L51_CHIP_REV_MASK); ret = snd_soc_register_codec(dev, &soc_codec_device_cs42l51, &cs42l51_dai, 1); diff --git a/sound/soc/codecs/cs42l51.h b/sound/soc/codecs/cs42l51.h index 641ef18..8c55bf3 100644 --- a/sound/soc/codecs/cs42l51.h +++ b/sound/soc/codecs/cs42l51.h @@ -26,6 +26,7 @@ int cs42l51_probe(struct device *dev, struct regmap *regmap); #define CS42L51_CHIP_ID 0x1B #define CS42L51_CHIP_REV_A 0x00 #define CS42L51_CHIP_REV_B 0x01 +#define CS42L51_CHIP_REV_MASK 0x07 #define CS42L51_CHIP_REV_ID 0x01 #define CS42L51_MK_CHIP_REV(a, b) ((a)<<3|(b))
The REVID mask was changed by commit a1253ef6d3fa "ASoC: cs42l51: split i2c from codec driver". Fix it. Signed-off-by: Axel Lin <axel.lin@ingics.com> --- sound/soc/codecs/cs42l51.c | 3 ++- sound/soc/codecs/cs42l51.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)