mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
[ALSA] Fix misc bugs in i2c/others/ak4114.c
* correct register for 'IEC958 Non-PCM Bitstream', 'IEC958 DTS Bitstream' to use AK4114_REG_RCS0 * correct check for control name: if (strstr(kctl->id.name, 'Playback')) * correct check: if (!chip->init) in snd_ak4114_external_rate * added PCM control 'IEC958 PPL Lock Status' Signed-off-by: Pavel Hofman <dustin@seznam.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
parent
208eee2a9d
commit
c4116ae717
2 changed files with 16 additions and 5 deletions
|
@ -158,7 +158,7 @@
|
||||||
#define AK4114_CHECK_NO_STAT (1<<0) /* no statistics */
|
#define AK4114_CHECK_NO_STAT (1<<0) /* no statistics */
|
||||||
#define AK4114_CHECK_NO_RATE (1<<1) /* no rate check */
|
#define AK4114_CHECK_NO_RATE (1<<1) /* no rate check */
|
||||||
|
|
||||||
#define AK4114_CONTROLS 14
|
#define AK4114_CONTROLS 15
|
||||||
|
|
||||||
typedef void (ak4114_write_t)(void *private_data, unsigned char addr, unsigned char data);
|
typedef void (ak4114_write_t)(void *private_data, unsigned char addr, unsigned char data);
|
||||||
typedef unsigned char (ak4114_read_t)(void *private_data, unsigned char addr);
|
typedef unsigned char (ak4114_read_t)(void *private_data, unsigned char addr);
|
||||||
|
|
|
@ -435,7 +435,7 @@ static struct snd_kcontrol_new snd_ak4114_iec958_controls[] = {
|
||||||
.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
|
.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
|
||||||
.info = snd_ak4114_in_bit_info,
|
.info = snd_ak4114_in_bit_info,
|
||||||
.get = snd_ak4114_in_bit_get,
|
.get = snd_ak4114_in_bit_get,
|
||||||
.private_value = (6<<8) | AK4114_REG_RCS1,
|
.private_value = (6<<8) | AK4114_REG_RCS0,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||||
|
@ -443,7 +443,15 @@ static struct snd_kcontrol_new snd_ak4114_iec958_controls[] = {
|
||||||
.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
|
.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
|
||||||
.info = snd_ak4114_in_bit_info,
|
.info = snd_ak4114_in_bit_info,
|
||||||
.get = snd_ak4114_in_bit_get,
|
.get = snd_ak4114_in_bit_get,
|
||||||
.private_value = (3<<8) | AK4114_REG_RCS1,
|
.private_value = (3<<8) | AK4114_REG_RCS0,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||||
|
.name = "IEC958 PPL Lock Status",
|
||||||
|
.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
|
||||||
|
.info = snd_ak4114_in_bit_info,
|
||||||
|
.get = snd_ak4114_in_bit_get,
|
||||||
|
.private_value = (1<<31) | (4<<8) | AK4114_REG_RCS0,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -462,7 +470,7 @@ int snd_ak4114_build(struct ak4114 *ak4114,
|
||||||
kctl = snd_ctl_new1(&snd_ak4114_iec958_controls[idx], ak4114);
|
kctl = snd_ctl_new1(&snd_ak4114_iec958_controls[idx], ak4114);
|
||||||
if (kctl == NULL)
|
if (kctl == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
if (!strstr(kctl->id.name, "Playback")) {
|
if (strstr(kctl->id.name, "Playback")) {
|
||||||
if (ply_substream == NULL) {
|
if (ply_substream == NULL) {
|
||||||
snd_ctl_free_one(kctl);
|
snd_ctl_free_one(kctl);
|
||||||
ak4114->kctls[idx] = NULL;
|
ak4114->kctls[idx] = NULL;
|
||||||
|
@ -526,6 +534,9 @@ static void ak4114_notify(struct ak4114 *ak4114,
|
||||||
if (c0 & AK4114_DTSCD)
|
if (c0 & AK4114_DTSCD)
|
||||||
snd_ctl_notify(ak4114->card, SNDRV_CTL_EVENT_MASK_VALUE,
|
snd_ctl_notify(ak4114->card, SNDRV_CTL_EVENT_MASK_VALUE,
|
||||||
&ak4114->kctls[13]->id);
|
&ak4114->kctls[13]->id);
|
||||||
|
if (c0 & AK4114_UNLCK)
|
||||||
|
snd_ctl_notify(ak4114->card, SNDRV_CTL_EVENT_MASK_VALUE,
|
||||||
|
&ak4114->kctls[14]->id);
|
||||||
}
|
}
|
||||||
|
|
||||||
int snd_ak4114_external_rate(struct ak4114 *ak4114)
|
int snd_ak4114_external_rate(struct ak4114 *ak4114)
|
||||||
|
@ -587,7 +598,7 @@ static void ak4114_stats(struct work_struct *work)
|
||||||
{
|
{
|
||||||
struct ak4114 *chip = container_of(work, struct ak4114, work.work);
|
struct ak4114 *chip = container_of(work, struct ak4114, work.work);
|
||||||
|
|
||||||
if (chip->init)
|
if (!chip->init)
|
||||||
snd_ak4114_check_rate_and_errors(chip, 0);
|
snd_ak4114_check_rate_and_errors(chip, 0);
|
||||||
|
|
||||||
schedule_delayed_work(&chip->work, HZ / 10);
|
schedule_delayed_work(&chip->work, HZ / 10);
|
||||||
|
|
Loading…
Reference in a new issue