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

Commit 7c5eec4e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/rcar', 'asoc/fix/rt5670' and... 

Merge remote-tracking branches 'asoc/fix/rcar', 'asoc/fix/rt5670' and 'asoc/fix/wm8940' into asoc-linus
parents af5fb678 4f353250 572f1f61 50c7a0ef

sound/soc/codecs/rt5670.c

+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ static const struct snd_kcontrol_new rt5670_snd_controls[] = { 
		RT5670_L_MUTE_SFT, RT5670_R_MUTE_SFT, 1, 1),

	SOC_DOUBLE_TLV("HP Playback Volume", RT5670_HP_VOL,

		RT5670_L_VOL_SFT, RT5670_R_VOL_SFT,

		39, 0, out_vol_tlv),

		39, 1, out_vol_tlv),

	/* OUTPUT Control */

	SOC_DOUBLE("OUT Channel Switch", RT5670_LOUT1,

		RT5670_VOL_L_SFT, RT5670_VOL_R_SFT, 1, 1),

sound/soc/codecs/wm8940.c

+1 −0
Original line number Diff line number Diff line
@@ -743,6 +743,7 @@ static const struct regmap_config wm8940_regmap = { 
	.max_register = WM8940_MONOMIX,

	.reg_defaults = wm8940_reg_defaults,

	.num_reg_defaults = ARRAY_SIZE(wm8940_reg_defaults),

	.cache_type = REGCACHE_RBTREE,



	.readable_reg = wm8940_readable_register,

	.volatile_reg = wm8940_volatile_register,

sound/soc/sh/rcar/adg.c

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, 
		}

	}



	rsnd_mod_bset(adg_mod, SSICKR, 0x00FF0000, ckr);

	rsnd_mod_bset(adg_mod, SSICKR, 0x80FF0000, ckr);

	rsnd_mod_write(adg_mod, BRRA,  rbga);

	rsnd_mod_write(adg_mod, BRRB,  rbgb);