renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 23:23:55 +08:00
Code

ALSA: hda/cs8409: Use timeout rather than retries for I2C transaction waits

Browse Source 
Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
Signed-off-by: Vitaly Rodionov <vitalyr@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210811185654.6837-25-vitalyr@opensource.cirrus.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Stefan Binding 2021-08-11 19:56:51 +01:00 committed by Takashi Iwai
parent fed0aaca0b
commit 928adf0ebc
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/pci/hda/patch_cs8409.c
View File

@ -140,24 +140,14 @@ static void cs8409_enable_i2c_clock(struct hda_codec *codec)
* @codec: the codec instance
*
* Wait for I2C transaction to complete.
* Return -1 if transaction wait times out.
* Return -ETIMEDOUT if transaction wait times out.
*/
static int cs8409_i2c_wait_complete(struct hda_codec *codec)
{
int repeat = 5;
unsigned int retval;
do {
retval = cs8409_vendor_coef_get(codec, CS8409_I2C_STS);
if ((retval & 0x18) != 0x18) {
usleep_range(2000, 4000);
--repeat;
} else
return 0;
} while (repeat);
return -1;
return read_poll_timeout(cs8409_vendor_coef_get, retval, retval & 0x18,
CS42L42_I2C_SLEEP_US, CS42L42_I2C_TIMEOUT_US, false, codec, CS8409_I2C_STS);
}
/**

2
sound/pci/hda/patch_cs8409.h
View File

@ -231,6 +231,8 @@ enum cs8409_coefficient_index_registers {
#define CS42L42_HSTYPE_MASK (0x03)
#define CS42L42_JACK_INSERTED (0x0C)
#define CS42L42_JACK_REMOVED (0x00)
#define CS42L42_I2C_TIMEOUT_US (20000)
#define CS42L42_I2C_SLEEP_US (2000)
/* Dell BULLSEYE / WARLOCK / CYBORG Specific Definitions */