Merge branch 'topic/asoc' into for-linus (b5c78489) · Commits · e / devices / android_kernel_teracube_2e

Documentation/sound/alsa/soc/dapm.txt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -116,6 +116,9 @@ SOC_DAPM_SINGLE("HiFi Playback Switch", WM8731_APANA, 4, 1, 0),
	SND_SOC_DAPM_MIXER("Output Mixer", WM8731_PWR, 4, 1, wm8731_output_mixer_controls,		SND_SOC_DAPM_MIXER("Output Mixer", WM8731_PWR, 4, 1, wm8731_output_mixer_controls,
	ARRAY_SIZE(wm8731_output_mixer_controls)),		ARRAY_SIZE(wm8731_output_mixer_controls)),

			If you dont want the mixer elements prefixed with the name of the mixer widget,
			you can use SND_SOC_DAPM_MIXER_NAMED_CTL instead. the parameters are the same
			as for SND_SOC_DAPM_MIXER.

	2.3 Platform/Machine domain Widgets		2.3 Platform/Machine domain Widgets
	-----------------------------------		-----------------------------------

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -135,6 +135,11 @@ static unsigned long e740_pin_config[] __initdata = {
	/* IrDA */		/* IrDA */
	GPIO38_GPIO \| MFP_LPM_DRIVE_HIGH,		GPIO38_GPIO \| MFP_LPM_DRIVE_HIGH,

			/* Audio power control */
			GPIO16_GPIO, /* AC97 codec AVDD2 supply (analogue power) */
			GPIO40_GPIO, /* Mic amp power */
			GPIO41_GPIO, /* Headphone amp power */

	/* PC Card */		/* PC Card */
	GPIO8_GPIO, /* CD0 */		GPIO8_GPIO, /* CD0 */
	GPIO44_GPIO, /* CD1 */		GPIO44_GPIO, /* CD1 */

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -133,6 +133,11 @@ static unsigned long e750_pin_config[] __initdata = {
	/* IrDA */		/* IrDA */
	GPIO38_GPIO \| MFP_LPM_DRIVE_HIGH,		GPIO38_GPIO \| MFP_LPM_DRIVE_HIGH,

			/* Audio power control */
			GPIO4_GPIO, /* Headphone amp power */
			GPIO7_GPIO, /* Speaker amp power */
			GPIO37_GPIO, /* Headphone detect */

	/* PC Card */		/* PC Card */
	GPIO8_GPIO, /* CD0 */		GPIO8_GPIO, /* CD0 */
	GPIO44_GPIO, /* CD1 */		GPIO44_GPIO, /* CD1 */

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -153,6 +153,13 @@ static unsigned long h5000_pin_config[] __initdata = {
	GPIO23_SSP1_SCLK,		GPIO23_SSP1_SCLK,
	GPIO25_SSP1_TXD,		GPIO25_SSP1_TXD,
	GPIO26_SSP1_RXD,		GPIO26_SSP1_RXD,

			/* I2S */
			GPIO28_I2S_BITCLK_OUT,
			GPIO29_I2S_SDATA_IN,
			GPIO30_I2S_SDATA_OUT,
			GPIO31_I2S_SYNC,
			GPIO32_I2S_SYSCLK,
	};		};

	/*		/*

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -45,6 +45,21 @@
	/* e7xx IrDA power control */		/* e7xx IrDA power control */
	#define GPIO_E7XX_IR_OFF 38		#define GPIO_E7XX_IR_OFF 38

			/* e740 audio control GPIOs */
			#define GPIO_E740_WM9705_nAVDD2 16
			#define GPIO_E740_MIC_ON 40
			#define GPIO_E740_AMP_ON 41

			/* e750 audio control GPIOs */
			#define GPIO_E750_HP_AMP_OFF 4
			#define GPIO_E750_SPK_AMP_OFF 7
			#define GPIO_E750_HP_DETECT 37

			/* e800 audio control GPIOs */
			#define GPIO_E800_HP_DETECT 81
			#define GPIO_E800_HP_AMP_OFF 82
			#define GPIO_E800_SPK_AMP_ON 83

	/* ASIC related GPIOs */		/* ASIC related GPIOs */
	#define GPIO_ESERIES_TMIO_IRQ 5		#define GPIO_ESERIES_TMIO_IRQ 5
	#define GPIO_ESERIES_TMIO_PCLR 19		#define GPIO_ESERIES_TMIO_PCLR 19