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

Commit 0e76ee41 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/pcm1792' into asoc-next

parents 3a2ac12f 3aae2799

sound/soc/codecs/pcm1792a.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ 
#define PCM1792A_DAC_VOL_LEFT	0x10

#define PCM1792A_DAC_VOL_LEFT	0x10

#define PCM1792A_DAC_VOL_RIGHT	0x11

#define PCM1792A_DAC_VOL_RIGHT	0x11

#define PCM1792A_FMT_CONTROL	0x12

#define PCM1792A_FMT_CONTROL	0x12

#define PCM1792A_MODE_CONTROL	0x13

#define PCM1792A_SOFT_MUTE	PCM1792A_FMT_CONTROL

#define PCM1792A_SOFT_MUTE	PCM1792A_FMT_CONTROL





#define PCM1792A_FMT_MASK	0x70

#define PCM1792A_FMT_MASK	0x70
@@ -164,6 +165,8 @@ static const struct snd_kcontrol_new pcm1792a_controls[] = { 
	SOC_DOUBLE_R_RANGE_TLV("DAC Playback Volume", PCM1792A_DAC_VOL_LEFT,

	SOC_DOUBLE_R_RANGE_TLV("DAC Playback Volume", PCM1792A_DAC_VOL_LEFT,

			 PCM1792A_DAC_VOL_RIGHT, 0, 0xf, 0xff, 0,

			 PCM1792A_DAC_VOL_RIGHT, 0, 0xf, 0xff, 0,

			 pcm1792a_dac_tlv),

			 pcm1792a_dac_tlv),

	SOC_SINGLE("DAC Invert Output Switch", PCM1792A_MODE_CONTROL, 7, 1, 0),

	SOC_SINGLE("DAC Rolloff Filter Switch", PCM1792A_MODE_CONTROL, 1, 1, 0),

};

};





static const struct snd_soc_dapm_widget pcm1792a_dapm_widgets[] = {

static const struct snd_soc_dapm_widget pcm1792a_dapm_widgets[] = {

sound/soc/codecs/pcm1792a.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,8 @@ 
#define __PCM1792A_H__

#define __PCM1792A_H__





#define PCM1792A_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_8000_48000 | \

#define PCM1792A_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_8000_48000 | \

			SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000)

			SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | \

			SNDRV_PCM_RATE_192000)





#define PCM1792A_FORMATS (SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S24_LE | \

#define PCM1792A_FORMATS (SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S24_LE | \

			  SNDRV_PCM_FMTBIT_S16_LE)

			  SNDRV_PCM_FMTBIT_S16_LE)