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

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

Merge branches 'for-2.6.38' and 'tegra-arch' into for-2.6.39

parents f9eabc3d f019ee5f 47f5ae51

arch/arm/mach-tegra/include/mach/harmony_audio.h

+3 −0
Original line number Diff line number Diff line
@@ -16,4 +16,7 @@ 


struct harmony_audio_platform_data {

	int gpio_spkr_en;

	int gpio_hp_det;

	int gpio_int_mic_en;

	int gpio_ext_mic_en;

};

sound/soc/codecs/cx20442.c

+3 −0
Original line number Diff line number Diff line
@@ -367,9 +367,12 @@ static int cx20442_codec_remove(struct snd_soc_codec *codec) 
	return 0;

}



static const u8 cx20442_reg = CX20442_TELOUT | CX20442_MIC;



static struct snd_soc_codec_driver cx20442_codec_dev = {

	.probe = 	cx20442_codec_probe,

	.remove = 	cx20442_codec_remove,

	.reg_cache_default = &cx20442_reg,

	.reg_cache_size = 1,

	.reg_word_size = sizeof(u8),

	.read = cx20442_read_reg_cache,

sound/soc/omap/ams-delta.c

+0 −2
Original line number Diff line number Diff line
@@ -507,8 +507,6 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd) 
	/* Set up digital mute if not provided by the codec */

	if (!codec_dai->driver->ops) {

		codec_dai->driver->ops = &ams_delta_dai_ops;

	} else if (!codec_dai->driver->ops->digital_mute) {

		codec_dai->driver->ops->digital_mute = ams_delta_digital_mute;

	} else {

		ams_delta_ops.startup = ams_delta_startup;

		ams_delta_ops.shutdown = ams_delta_shutdown;