diff options
-rw-r--r-- | sound/soc/codecs/nau8825.c | 6 | ||||
-rw-r--r-- | sound/soc/codecs/nau8825.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index efe3a44658d5..abf77dd422f4 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c | |||
@@ -561,9 +561,9 @@ static void nau8825_xtalk_prepare(struct nau8825 *nau8825) | |||
561 | nau8825_xtalk_backup(nau8825); | 561 | nau8825_xtalk_backup(nau8825); |
562 | /* Config IIS as master to output signal by codec */ | 562 | /* Config IIS as master to output signal by codec */ |
563 | regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2, | 563 | regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2, |
564 | NAU8825_I2S_MS_MASK | NAU8825_I2S_DRV_MASK | | 564 | NAU8825_I2S_MS_MASK | NAU8825_I2S_LRC_DIV_MASK | |
565 | NAU8825_I2S_BLK_DIV_MASK, NAU8825_I2S_MS_MASTER | | 565 | NAU8825_I2S_BLK_DIV_MASK, NAU8825_I2S_MS_MASTER | |
566 | (0x2 << NAU8825_I2S_DRV_SFT) | 0x1); | 566 | (0x2 << NAU8825_I2S_LRC_DIV_SFT) | 0x1); |
567 | /* Ramp up headphone volume to 0dB to get better performance and | 567 | /* Ramp up headphone volume to 0dB to get better performance and |
568 | * avoid pop noise in headphone. | 568 | * avoid pop noise in headphone. |
569 | */ | 569 | */ |
@@ -657,7 +657,7 @@ static void nau8825_xtalk_clean(struct nau8825 *nau8825) | |||
657 | NAU8825_IRQ_RMS_EN, NAU8825_IRQ_RMS_EN); | 657 | NAU8825_IRQ_RMS_EN, NAU8825_IRQ_RMS_EN); |
658 | /* Recover default value for IIS */ | 658 | /* Recover default value for IIS */ |
659 | regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2, | 659 | regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2, |
660 | NAU8825_I2S_MS_MASK | NAU8825_I2S_DRV_MASK | | 660 | NAU8825_I2S_MS_MASK | NAU8825_I2S_LRC_DIV_MASK | |
661 | NAU8825_I2S_BLK_DIV_MASK, NAU8825_I2S_MS_SLAVE); | 661 | NAU8825_I2S_BLK_DIV_MASK, NAU8825_I2S_MS_SLAVE); |
662 | /* Restore value of specific register for cross talk */ | 662 | /* Restore value of specific register for cross talk */ |
663 | nau8825_xtalk_restore(nau8825); | 663 | nau8825_xtalk_restore(nau8825); |
diff --git a/sound/soc/codecs/nau8825.h b/sound/soc/codecs/nau8825.h index 5d1704e73241..b6b21b312854 100644 --- a/sound/soc/codecs/nau8825.h +++ b/sound/soc/codecs/nau8825.h | |||
@@ -247,8 +247,8 @@ | |||
247 | 247 | ||
248 | /* I2S_PCM_CTRL2 (0x1d) */ | 248 | /* I2S_PCM_CTRL2 (0x1d) */ |
249 | #define NAU8825_I2S_TRISTATE (1 << 15) /* 0 - normal mode, 1 - Hi-Z output */ | 249 | #define NAU8825_I2S_TRISTATE (1 << 15) /* 0 - normal mode, 1 - Hi-Z output */ |
250 | #define NAU8825_I2S_DRV_SFT 12 | 250 | #define NAU8825_I2S_LRC_DIV_SFT 12 |
251 | #define NAU8825_I2S_DRV_MASK (0x3 << NAU8825_I2S_DRV_SFT) | 251 | #define NAU8825_I2S_LRC_DIV_MASK (0x3 << NAU8825_I2S_LRC_DIV_SFT) |
252 | #define NAU8825_I2S_MS_SFT 3 | 252 | #define NAU8825_I2S_MS_SFT 3 |
253 | #define NAU8825_I2S_MS_MASK (1 << NAU8825_I2S_MS_SFT) | 253 | #define NAU8825_I2S_MS_MASK (1 << NAU8825_I2S_MS_SFT) |
254 | #define NAU8825_I2S_MS_MASTER (1 << NAU8825_I2S_MS_SFT) | 254 | #define NAU8825_I2S_MS_MASTER (1 << NAU8825_I2S_MS_SFT) |