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

Commit 2ddaa676 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/rt5665', 'asoc/fix/simple',... 

Merge remote-tracking branches 'asoc/fix/rt5665', 'asoc/fix/simple', 'asoc/fix/sti' and 'asoc/fix/sun8i' into asoc-linus
parents 367b1301 83749aba 971edb0a 3c9d3f1b eb3abaea

arch/arm/boot/dts/sun8i-a33.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ 
		simple-audio-card,mclk-fs = <512>;

		simple-audio-card,aux-devs = <&codec_analog>;

		simple-audio-card,routing =

			"Left DAC", "Digital Left DAC",

			"Right DAC", "Digital Right DAC";

			"Left DAC", "AIF1 Slot 0 Left",

			"Right DAC", "AIF1 Slot 0 Right";

		status = "disabled";



		simple-audio-card,cpu {

sound/soc/codecs/rt5665.c

+7 −3
Original line number Diff line number Diff line
@@ -1241,7 +1241,7 @@ static irqreturn_t rt5665_irq(int irq, void *data) 
static void rt5665_jd_check_handler(struct work_struct *work)

{

	struct rt5665_priv *rt5665 = container_of(work, struct rt5665_priv,

		calibrate_work.work);

		jd_check_work.work);



	if (snd_soc_read(rt5665->codec, RT5665_AJD1_CTRL) & 0x0010) {

		/* jack out */
@@ -2252,7 +2252,7 @@ static const char * const rt5665_if2_1_adc_in_src[] = { 


static const SOC_ENUM_SINGLE_DECL(

	rt5665_if2_1_adc_in_enum, RT5665_DIG_INF2_DATA,

	RT5665_IF3_ADC_IN_SFT, rt5665_if2_1_adc_in_src);

	RT5665_IF2_1_ADC_IN_SFT, rt5665_if2_1_adc_in_src);



static const struct snd_kcontrol_new rt5665_if2_1_adc_in_mux =

	SOC_DAPM_ENUM("IF2_1 ADC IN Source", rt5665_if2_1_adc_in_enum);
@@ -3178,6 +3178,9 @@ static const struct snd_soc_dapm_route rt5665_dapm_routes[] = { 
	{"DAC Mono Right Filter", NULL, "DAC Mono R ASRC", is_using_asrc},

	{"DAC Stereo1 Filter", NULL, "DAC STO1 ASRC", is_using_asrc},

	{"DAC Stereo2 Filter", NULL, "DAC STO2 ASRC", is_using_asrc},

	{"I2S1 ASRC", NULL, "CLKDET"},

	{"I2S2 ASRC", NULL, "CLKDET"},

	{"I2S3 ASRC", NULL, "CLKDET"},



	/*Vref*/

	{"Mic Det Power", NULL, "Vref2"},
@@ -3912,6 +3915,7 @@ static const struct snd_soc_dapm_route rt5665_dapm_routes[] = { 
	{"Mono MIX", "MONOVOL Switch", "MONOVOL"},

	{"Mono Amp", NULL, "Mono MIX"},

	{"Mono Amp", NULL, "Vref2"},

	{"Mono Amp", NULL, "Vref3"},

	{"Mono Amp", NULL, "CLKDET SYS"},

	{"Mono Amp", NULL, "CLKDET MONO"},

	{"Mono Playback", "Switch", "Mono Amp"},
@@ -4798,7 +4802,7 @@ static int rt5665_i2c_probe(struct i2c_client *i2c, 
	/* Enhance performance*/

	regmap_update_bits(rt5665->regmap, RT5665_PWR_ANLG_1,

		RT5665_HP_DRIVER_MASK | RT5665_LDO1_DVO_MASK,

		RT5665_HP_DRIVER_5X | RT5665_LDO1_DVO_09);

		RT5665_HP_DRIVER_5X | RT5665_LDO1_DVO_12);



	INIT_DELAYED_WORK(&rt5665->jack_detect_work,

				rt5665_jack_detect_handler);

sound/soc/codecs/rt5665.h

+1 −1
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ 
#define RT5665_HP_DRIVER_MASK			(0x3 << 2)

#define RT5665_HP_DRIVER_1X			(0x0 << 2)

#define RT5665_HP_DRIVER_3X			(0x1 << 2)

#define RT5665_HP_DRIVER_5X			(0x2 << 2)

#define RT5665_HP_DRIVER_5X			(0x3 << 2)

#define RT5665_LDO1_DVO_MASK			(0x3)

#define RT5665_LDO1_DVO_09			(0x0)

#define RT5665_LDO1_DVO_10			(0x1)

sound/soc/generic/simple-card-utils.c

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ int asoc_simple_card_parse_clk(struct device *dev, 
	clk = devm_get_clk_from_child(dev, node, NULL);

	if (!IS_ERR(clk)) {

		simple_dai->sysclk = clk_get_rate(clk);

		simple_dai->clk = clk;

	} else if (!of_property_read_u32(node, "system-clock-frequency", &val)) {

		simple_dai->sysclk = val;

	} else {

sound/soc/sti/uniperif_reader.c

+3 −0
Original line number Diff line number Diff line
@@ -349,6 +349,8 @@ static int uni_reader_startup(struct snd_pcm_substream *substream, 
	struct uniperif *reader = priv->dai_data.uni;

	int ret;



	reader->substream = substream;



	if (!UNIPERIF_TYPE_IS_TDM(reader))

		return 0;
@@ -378,6 +380,7 @@ static void uni_reader_shutdown(struct snd_pcm_substream *substream, 
		/* Stop the reader */

		uni_reader_stop(reader);

	}

	reader->substream = NULL;

}



static const struct snd_soc_dai_ops uni_reader_dai_ops = {