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

Commit f1608cca authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.33' into for-2.6.34

parents a47979b5 43f0de8d

arch/arm/plat-s3c64xx/dev-audio.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static struct resource s3c64xx_pcm0_resource[] = { 
	},

};



struct s3c_audio_pdata s3c_pcm0_pdata = {

static struct s3c_audio_pdata s3c_pcm0_pdata = {

	.cfg_gpio = s3c64xx_pcm_cfg_gpio,

};
@@ -151,7 +151,7 @@ static struct resource s3c64xx_pcm1_resource[] = { 
	},

};



struct s3c_audio_pdata s3c_pcm1_pdata = {

static struct s3c_audio_pdata s3c_pcm1_pdata = {

	.cfg_gpio = s3c64xx_pcm_cfg_gpio,

};

sound/soc/codecs/wm_hubs.c

+8 −8
Original line number Diff line number Diff line
@@ -438,11 +438,11 @@ static const struct snd_soc_dapm_widget analogue_dapm_widgets[] = { 
SND_SOC_DAPM_INPUT("IN1LN"),

SND_SOC_DAPM_INPUT("IN1LP"),

SND_SOC_DAPM_INPUT("IN2LN"),

SND_SOC_DAPM_INPUT("IN2LP/VXRN"),

SND_SOC_DAPM_INPUT("IN2LP:VXRN"),

SND_SOC_DAPM_INPUT("IN1RN"),

SND_SOC_DAPM_INPUT("IN1RP"),

SND_SOC_DAPM_INPUT("IN2RN"),

SND_SOC_DAPM_INPUT("IN2RP/VXRP"),

SND_SOC_DAPM_INPUT("IN2RP:VXRP"),



SND_SOC_DAPM_MICBIAS("MICBIAS2", WM8993_POWER_MANAGEMENT_1, 5, 0),

SND_SOC_DAPM_MICBIAS("MICBIAS1", WM8993_POWER_MANAGEMENT_1, 4, 0),
@@ -537,14 +537,14 @@ static const struct snd_soc_dapm_route analogue_routes[] = { 
	{ "IN1R PGA", "IN1RP Switch", "IN1RP" },

	{ "IN1R PGA", "IN1RN Switch", "IN1RN" },



	{ "IN2L PGA", "IN2LP Switch", "IN2LP/VXRN" },

	{ "IN2L PGA", "IN2LP Switch", "IN2LP:VXRN" },

	{ "IN2L PGA", "IN2LN Switch", "IN2LN" },



	{ "IN2R PGA", "IN2RP Switch", "IN2RP/VXRP" },

	{ "IN2R PGA", "IN2RP Switch", "IN2RP:VXRP" },

	{ "IN2R PGA", "IN2RN Switch", "IN2RN" },



	{ "Direct Voice", NULL, "IN2LP/VXRN" },

	{ "Direct Voice", NULL, "IN2RP/VXRP" },

	{ "Direct Voice", NULL, "IN2LP:VXRN" },

	{ "Direct Voice", NULL, "IN2RP:VXRP" },



	{ "MIXINL", "IN1L Switch", "IN1L PGA" },

	{ "MIXINL", "IN2L Switch", "IN2L PGA" },
@@ -565,7 +565,7 @@ static const struct snd_soc_dapm_route analogue_routes[] = { 
	{ "Left Output Mixer", "Right Input Switch", "MIXINR" },

	{ "Left Output Mixer", "IN2RN Switch", "IN2RN" },

	{ "Left Output Mixer", "IN2LN Switch", "IN2LN" },

	{ "Left Output Mixer", "IN2LP Switch", "IN2LP/VXRN" },

	{ "Left Output Mixer", "IN2LP Switch", "IN2LP:VXRN" },

	{ "Left Output Mixer", "IN1L Switch", "IN1L PGA" },

	{ "Left Output Mixer", "IN1R Switch", "IN1R PGA" },
@@ -573,7 +573,7 @@ static const struct snd_soc_dapm_route analogue_routes[] = { 
	{ "Right Output Mixer", "Right Input Switch", "MIXINR" },

	{ "Right Output Mixer", "IN2LN Switch", "IN2LN" },

	{ "Right Output Mixer", "IN2RN Switch", "IN2RN" },

	{ "Right Output Mixer", "IN2RP Switch", "IN2RP/VXRP" },

	{ "Right Output Mixer", "IN2RP Switch", "IN2RP:VXRP" },

	{ "Right Output Mixer", "IN1L Switch", "IN1L PGA" },

	{ "Right Output Mixer", "IN1R Switch", "IN1R PGA" },