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

Commit 7ec298df authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/asoc' into for-linus

parents 02e5fbf6 de0853c0

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -5854,7 +5854,7 @@ F: include/sound/ 
F:	sound/



SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)

M:	Liam Girdwood <lrg@slimlogic.co.uk>

M:	Liam Girdwood <lrg@ti.com>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -6105,7 +6105,7 @@ F: drivers/mmc/host/tifm_sd.c 
F:	include/linux/tifm.h



TI TWL4030 SERIES SOC CODEC DRIVER

M:	Peter Ujfalusi <peter.ujfalusi@nokia.com>

M:	Peter Ujfalusi <peter.ujfalusi@ti.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Maintained

F:	sound/soc/codecs/twl4030*
@@ -6749,7 +6749,7 @@ F: drivers/scsi/vmw_pvscsi.c 
F:	drivers/scsi/vmw_pvscsi.h



VOLTAGE AND CURRENT REGULATOR FRAMEWORK

M:	Liam Girdwood <lrg@slimlogic.co.uk>

M:	Liam Girdwood <lrg@ti.com>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

W:	http://opensource.wolfsonmicro.com/node/15

W:	http://www.slimlogic.co.uk/?p=48

arch/arm/mach-tegra/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -27,12 +27,14 @@ comment "Tegra board type" 


config MACH_HARMONY

       bool "Harmony board"

       select MACH_HAS_SND_SOC_TEGRA_WM8903

       help

         Support for nVidia Harmony development platform



config MACH_KAEN

       bool "Kaen board"

       select MACH_SEABOARD

       select MACH_HAS_SND_SOC_TEGRA_WM8903

       help

         Support for the Kaen version of Seaboard
@@ -43,6 +45,7 @@ config MACH_PAZ00 


config MACH_SEABOARD

       bool "Seaboard board"

       select MACH_HAS_SND_SOC_TEGRA_WM8903

       help

         Support for nVidia Seaboard development platform. It will

	 also be included for some of the derivative boards that

arch/arm/mach-tegra/board-harmony.c

+4 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <asm/mach/time.h>

#include <asm/setup.h>



#include <mach/harmony_audio.h>

#include <mach/tegra_wm8903_pdata.h>

#include <mach/iomap.h>

#include <mach/irqs.h>

#include <mach/sdhci.h>
@@ -67,15 +67,16 @@ static struct platform_device debug_uart = { 
	},

};



static struct harmony_audio_platform_data harmony_audio_pdata = {

static struct tegra_wm8903_platform_data harmony_audio_pdata = {

	.gpio_spkr_en		= TEGRA_GPIO_SPKR_EN,

	.gpio_hp_det		= TEGRA_GPIO_HP_DET,

	.gpio_hp_mute		= -1,

	.gpio_int_mic_en	= TEGRA_GPIO_INT_MIC_EN,

	.gpio_ext_mic_en	= TEGRA_GPIO_EXT_MIC_EN,

};



static struct platform_device harmony_audio_device = {

	.name	= "tegra-snd-harmony",

	.name	= "tegra-snd-wm8903",

	.id	= 0,

	.dev	= {

		.platform_data  = &harmony_audio_pdata,

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

+3 −2
Original line number Diff line number Diff line 
/*

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

 * arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h

 *

 * Copyright 2011 NVIDIA, Inc.

 *
@@ -14,9 +14,10 @@ 
 *

 */



struct harmony_audio_platform_data {

struct tegra_wm8903_platform_data {

	int gpio_spkr_en;

	int gpio_hp_det;

	int gpio_hp_mute;

	int gpio_int_mic_en;

	int gpio_ext_mic_en;

};

drivers/staging/intel_sst/intel_sst_drv_interface.c

+0 −1
Original line number Diff line number Diff line
@@ -508,7 +508,6 @@ int register_sst_card(struct intel_sst_card_ops *card) 
			sst_drv_ctx->pmic_state = SND_MAD_INIT_DONE;

			sst_drv_ctx->rx_time_slot_status = 0; /*default AMIC*/

			card->pcm_control = sst_pmic_ops.pcm_control;

			sst_drv_ctx->scard_ops->card_status = SND_CARD_UN_INIT;

			return 0;

		} else {

			pr_err("strcmp fail %s\n", card->module_name);