raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

TAS5713: return error if initialisation fails

Browse Source 
Existing TAS5713 driver logs errors during initialisation, but does not return
an error code. Therefore even if initialisation fails, the driver will still be
loaded, but won't work. This patch fixes this. I2C communication error will now
reported correctly by a non-zero return code.
This commit is contained in:
Daniel Matuschek
2015-01-23 16:41:17 +01:00
committed by popcornmix
parent 8b1fa971e2
commit a82f714b0d
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/codecs/tas5713.c
View File

@@ -182,33 +182,40 @@ static int tas5713_probe(struct snd_soc_codec *codec)
// Reset error // Reset error
ret = snd_soc_write(codec, TAS5713_ERROR_STATUS, 0x00); ret = snd_soc_write(codec, TAS5713_ERROR_STATUS, 0x00);
if (ret < 0) return ret;
// Trim oscillator // Trim oscillator
ret = snd_soc_write(codec, TAS5713_OSC_TRIM, 0x00); ret = snd_soc_write(codec, TAS5713_OSC_TRIM, 0x00);
if (ret < 0) return ret;
msleep(1000); msleep(1000);
// Reset error // Reset error
ret = snd_soc_write(codec, TAS5713_ERROR_STATUS, 0x00); ret = snd_soc_write(codec, TAS5713_ERROR_STATUS, 0x00);
if (ret < 0) return ret;
// Clock mode: 44/48kHz, MCLK=64xfs // Clock mode: 44/48kHz, MCLK=64xfs
ret = snd_soc_write(codec, TAS5713_CLOCK_CTRL, 0x60); ret = snd_soc_write(codec, TAS5713_CLOCK_CTRL, 0x60);
if (ret < 0) return ret;
// I2S 24bit // I2S 24bit
ret = snd_soc_write(codec, TAS5713_SERIAL_DATA_INTERFACE, 0x05); ret = snd_soc_write(codec, TAS5713_SERIAL_DATA_INTERFACE, 0x05);
if (ret < 0) return ret;
// Unmute // Unmute
ret = snd_soc_write(codec, TAS5713_SYSTEM_CTRL2, 0x00); ret = snd_soc_write(codec, TAS5713_SYSTEM_CTRL2, 0x00);
if (ret < 0) return ret;
ret = snd_soc_write(codec, TAS5713_SOFT_MUTE, 0x00); ret = snd_soc_write(codec, TAS5713_SOFT_MUTE, 0x00);
if (ret < 0) return ret;
// Set volume to 0db // Set volume to 0db
ret = snd_soc_write(codec, TAS5713_VOL_MASTER, 0x00); ret = snd_soc_write(codec, TAS5713_VOL_MASTER, 0x00);
if (ret < 0) return ret;
// Now start programming the default initialization sequence // Now start programming the default initialization sequence
for (i = 0; i < ARRAY_SIZE(tas5713_init_sequence); ++i) { for (i = 0; i < ARRAY_SIZE(tas5713_init_sequence); ++i) {
ret = i2c_master_send(i2c, ret = i2c_master_send(i2c,
tas5713_init_sequence[i].data, tas5713_init_sequence[i].data,
tas5713_init_sequence[i].size); tas5713_init_sequence[i].size);
if (ret < 0) { if (ret < 0) {
printk(KERN_INFO "TAS5713 CODEC PROBE: InitSeq returns: %d\n", ret); printk(KERN_INFO "TAS5713 CODEC PROBE: InitSeq returns: %d\n", ret);
} }
@@ -216,7 +223,7 @@ static int tas5713_probe(struct snd_soc_codec *codec)
// Unmute // Unmute
ret = snd_soc_write(codec, TAS5713_SYSTEM_CTRL2, 0x00); ret = snd_soc_write(codec, TAS5713_SYSTEM_CTRL2, 0x00);
if (ret < 0) return ret;
return 0; return 0;
} }