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

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

Merge branch 'for-2.6.37' into for-2.6.38 

Conflicts:
	include/linux/mfd/wm8994/pdata.h
parents 0d735eaa 1dcb4f38

include/linux/mfd/wm8994/pdata.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ struct wm8994_ldo_pdata { 
#define WM8994_CONFIGURE_GPIO 0x8000



#define WM8994_DRC_REGS 5

#define WM8994_EQ_REGS  19

#define WM8994_EQ_REGS  20

#define WM8958_MBC_CUTOFF_REGS 20

#define WM8958_MBC_COEFF_REGS  48

sound/soc/codecs/wm_hubs.c

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ SOC_DOUBLE_R("Speaker Switch", 
SOC_DOUBLE_R("Speaker ZC Switch",

	     WM8993_SPEAKER_VOLUME_LEFT, WM8993_SPEAKER_VOLUME_RIGHT,

	     7, 1, 0),

SOC_DOUBLE_TLV("Speaker Boost Volume", WM8993_SPKOUT_BOOST, 0, 3, 7, 0,

SOC_DOUBLE_TLV("Speaker Boost Volume", WM8993_SPKOUT_BOOST, 3, 0, 7, 0,

	       spkboost_tlv),

SOC_ENUM("Speaker Reference", speaker_ref),

SOC_ENUM("Speaker Mode", speaker_mode),

sound/soc/soc-core.c

+2 −0
Original line number Diff line number Diff line
@@ -3361,7 +3361,9 @@ int snd_soc_register_dais(struct device *dev, 
		pr_debug("Registered DAI '%s'\n", dai->name);

	}



	mutex_lock(&client_mutex);

	snd_soc_instantiate_cards();

	mutex_unlock(&client_mutex);

	return 0;



err: