Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a33b56a6 authored by John Hsu's avatar John Hsu Committed by Mark Brown
Browse files

ASoC: nau8825: correct the function name of register 



Change to correct name of the register function.

Signed-off-by: default avatarJohn Hsu <KCHSU0@nuvoton.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a5de5b74

sound/soc/codecs/nau8825.c

+3 −3
Original line number Diff line number Diff line
@@ -561,9 +561,9 @@ static void nau8825_xtalk_prepare(struct nau8825 *nau8825) 
	nau8825_xtalk_backup(nau8825);

	/* Config IIS as master to output signal by codec */

	regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2,

		NAU8825_I2S_MS_MASK | NAU8825_I2S_DRV_MASK |

		NAU8825_I2S_MS_MASK | NAU8825_I2S_LRC_DIV_MASK |

		NAU8825_I2S_BLK_DIV_MASK, NAU8825_I2S_MS_MASTER |

		(0x2 << NAU8825_I2S_DRV_SFT) | 0x1);

		(0x2 << NAU8825_I2S_LRC_DIV_SFT) | 0x1);

	/* Ramp up headphone volume to 0dB to get better performance and

	 * avoid pop noise in headphone.

	 */
@@ -657,7 +657,7 @@ static void nau8825_xtalk_clean(struct nau8825 *nau8825) 
		NAU8825_IRQ_RMS_EN, NAU8825_IRQ_RMS_EN);

	/* Recover default value for IIS */

	regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2,

		NAU8825_I2S_MS_MASK | NAU8825_I2S_DRV_MASK |

		NAU8825_I2S_MS_MASK | NAU8825_I2S_LRC_DIV_MASK |

		NAU8825_I2S_BLK_DIV_MASK, NAU8825_I2S_MS_SLAVE);

	/* Restore value of specific register for cross talk */

	nau8825_xtalk_restore(nau8825);

sound/soc/codecs/nau8825.h

+2 −2
Original line number Diff line number Diff line
@@ -247,8 +247,8 @@ 


/* I2S_PCM_CTRL2 (0x1d) */

#define NAU8825_I2S_TRISTATE	(1 << 15) /* 0 - normal mode, 1 - Hi-Z output */

#define NAU8825_I2S_DRV_SFT	12

#define NAU8825_I2S_DRV_MASK	(0x3 << NAU8825_I2S_DRV_SFT)

#define NAU8825_I2S_LRC_DIV_SFT	12

#define NAU8825_I2S_LRC_DIV_MASK	(0x3 << NAU8825_I2S_LRC_DIV_SFT)

#define NAU8825_I2S_MS_SFT	3

#define NAU8825_I2S_MS_MASK	(1 << NAU8825_I2S_MS_SFT)

#define NAU8825_I2S_MS_MASTER	(1 << NAU8825_I2S_MS_SFT)