Merge branch 'for-2.6.37' of... (2f02a59c) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/mach-omap2/board-rx51-peripherals.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -710,10 +710,6 @@ static struct twl4030_platform_data rx51_twldata __initdata = {
		.vio = &rx51_vio,
		};

		static struct aic3x_pdata rx51_aic3x_data __initdata = {
		.gpio_reset = 60,
		};

		static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = {
		.id = TPA6130A2,
		.power_gpio = 98,

sound/soc/codecs/tlv320aic3x.c

+274 −254

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/tlv320aic3x.h

+33 −22

Original line number	Diff line number	Diff line
		@@ -81,52 +81,63 @@
		/* DAC Digital control registers */
		#define LDAC_VOL 43
		#define RDAC_VOL 44
		/* High Power Output control registers */
		/* Left High Power Output control registers */
		#define LINE2L_2_HPLOUT_VOL 45
		#define LINE2R_2_HPROUT_VOL 62
		#define PGAL_2_HPLOUT_VOL 46
		#define PGAL_2_HPROUT_VOL 60
		#define PGAR_2_HPLOUT_VOL 49
		#define PGAR_2_HPROUT_VOL 63
		#define DACL1_2_HPLOUT_VOL 47
		#define DACR1_2_HPROUT_VOL 64
		#define LINE2R_2_HPLOUT_VOL 48
		#define PGAR_2_HPLOUT_VOL 49
		#define DACR1_2_HPLOUT_VOL 50
		#define HPLOUT_CTRL 51
		#define HPROUT_CTRL 65
		/* High Power COM control registers */
		/* Left High Power COM control registers */
		#define LINE2L_2_HPLCOM_VOL 52
		#define LINE2R_2_HPRCOM_VOL 69
		#define PGAL_2_HPLCOM_VOL 53
		#define DACL1_2_HPLCOM_VOL 54
		#define LINE2R_2_HPLCOM_VOL 55
		#define PGAR_2_HPLCOM_VOL 56
		#define DACR1_2_HPLCOM_VOL 57
		#define HPLCOM_CTRL 58
		/* Right High Power Output control registers */
		#define LINE2L_2_HPROUT_VOL 59
		#define PGAL_2_HPROUT_VOL 60
		#define DACL1_2_HPROUT_VOL 61
		#define LINE2R_2_HPROUT_VOL 62
		#define PGAR_2_HPROUT_VOL 63
		#define DACR1_2_HPROUT_VOL 64
		#define HPROUT_CTRL 65
		/* Right High Power COM control registers */
		#define LINE2L_2_HPRCOM_VOL 66
		#define PGAL_2_HPRCOM_VOL 67
		#define DACL1_2_HPRCOM_VOL 68
		#define LINE2R_2_HPRCOM_VOL 69
		#define PGAR_2_HPRCOM_VOL 70
		#define DACL1_2_HPLCOM_VOL 54
		#define DACR1_2_HPRCOM_VOL 71
		#define HPLCOM_CTRL 58
		#define HPRCOM_CTRL 72
		/* Mono Line Output Plus/Minus control registers */
		#define LINE2L_2_MONOLOPM_VOL 73
		#define LINE2R_2_MONOLOPM_VOL 76
		#define PGAL_2_MONOLOPM_VOL 74
		#define PGAR_2_MONOLOPM_VOL 77
		#define DACL1_2_MONOLOPM_VOL 75
		#define LINE2R_2_MONOLOPM_VOL 76
		#define PGAR_2_MONOLOPM_VOL 77
		#define DACR1_2_MONOLOPM_VOL 78
		#define MONOLOPM_CTRL 79
		/* Class-D speaker driver on tlv320aic3007 */
		#define CLASSD_CTRL 73
		/* Line Output Plus/Minus control registers */
		/* Left Line Output Plus/Minus control registers */
		#define LINE2L_2_LLOPM_VOL 80
		#define LINE2L_2_RLOPM_VOL 87
		#define LINE2R_2_LLOPM_VOL 83
		#define LINE2R_2_RLOPM_VOL 90
		#define PGAL_2_LLOPM_VOL 81
		#define PGAL_2_RLOPM_VOL 88
		#define PGAR_2_LLOPM_VOL 84
		#define PGAR_2_RLOPM_VOL 91
		#define DACL1_2_LLOPM_VOL 82
		#define DACL1_2_RLOPM_VOL 89
		#define DACR1_2_RLOPM_VOL 92
		#define LINE2R_2_LLOPM_VOL 83
		#define PGAR_2_LLOPM_VOL 84
		#define DACR1_2_LLOPM_VOL 85
		#define LLOPM_CTRL 86
		/* Right Line Output Plus/Minus control registers */
		#define LINE2L_2_RLOPM_VOL 87
		#define PGAL_2_RLOPM_VOL 88
		#define DACL1_2_RLOPM_VOL 89
		#define LINE2R_2_RLOPM_VOL 90
		#define PGAR_2_RLOPM_VOL 91
		#define DACR1_2_RLOPM_VOL 92
		#define RLOPM_CTRL 93
		/* GPIO/IRQ registers */
		#define AIC3X_STICKY_IRQ_FLAGS_REG 96

sound/soc/omap/rx51.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -146,9 +146,9 @@ static int rx51_spk_event(struct snd_soc_dapm_widget *w,
		struct snd_kcontrol *k, int event)
		{
		if (SND_SOC_DAPM_EVENT_ON(event))
		gpio_set_value(RX51_SPEAKER_AMP_TWL_GPIO, 1);
		gpio_set_value_cansleep(RX51_SPEAKER_AMP_TWL_GPIO, 1);
		else
		gpio_set_value(RX51_SPEAKER_AMP_TWL_GPIO, 0);
		gpio_set_value_cansleep(RX51_SPEAKER_AMP_TWL_GPIO, 0);

		return 0;
		}