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

Commit a7569afa authored by Joonyoung Shim's avatar Joonyoung Shim Committed by Mark Brown
Browse files

ASoC: MAX9877: fix write operation for register 



The MAX9877 needs an address of start register when we write values to
registers through i2c_master_send(), but the code for this was missed in
max9877_write_regs().

If the value of control is 0 in the max9877_set_out_mode(), the value is
not increased to 1, but actually the value to write to the register
should be 1.
And the register bits for out_mode and osc_mode should be cleared before
writing.

Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 459dc352

sound/soc/codecs/max9877.c

+11 −3
Original line number Diff line number Diff line
@@ -25,7 +25,14 @@ static u8 max9877_regs[5] = { 0x40, 0x00, 0x00, 0x00, 0x49 }; 


static void max9877_write_regs(void)

{

	if (i2c_master_send(i2c, max9877_regs, 5) != 5)

	unsigned int i;

	u8 data[6];



	data[0] = MAX9877_INPUT_MODE;

	for (i = 0; i < ARRAY_SIZE(max9877_regs); i++)

		data[i + 1] = max9877_regs[i];



	if (i2c_master_send(i2c, data, 6) != 6)

		dev_err(&i2c->dev, "i2c write failed\n");

}
@@ -135,12 +142,12 @@ static int max9877_set_out_mode(struct snd_kcontrol *kcontrol, 
{

	u8 value = ucontrol->value.integer.value[0];



	if (value)

	value += 1;



	if ((max9877_regs[MAX9877_OUTPUT_MODE] & MAX9877_OUTMODE_MASK) == value)

		return 0;



	max9877_regs[MAX9877_OUTPUT_MODE] &= ~MAX9877_OUTMODE_MASK;

	max9877_regs[MAX9877_OUTPUT_MODE] |= value;

	max9877_write_regs();

	return 1;
@@ -166,6 +173,7 @@ static int max9877_set_osc_mode(struct snd_kcontrol *kcontrol, 
	if ((max9877_regs[MAX9877_OUTPUT_MODE] & MAX9877_OSC_MASK) == value)

		return 0;



	max9877_regs[MAX9877_OUTPUT_MODE] &= ~MAX9877_OSC_MASK;

	max9877_regs[MAX9877_OUTPUT_MODE] |= value;

	max9877_write_regs();

	return 1;