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

Merge branch 'topic/input' of... 

Merge branch 'topic/input' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-cs42l51

Conflicts:
	sound/soc/codecs/Kconfig
parents 1025c05f c894e394

sound/soc/codecs/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_ALC5632 if I2C

	select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC

	select SND_SOC_CS42L51_I2C if I2C

	select SND_SOC_CS42L52 if I2C

	select SND_SOC_CS42L52 if I2C && INPUT

	select SND_SOC_CS42L73 if I2C

	select SND_SOC_CS4270 if I2C

	select SND_SOC_CS4271 if SND_SOC_I2C_AND_SPI
@@ -127,7 +127,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_WM8955 if I2C

	select SND_SOC_WM8960 if I2C

	select SND_SOC_WM8961 if I2C

	select SND_SOC_WM8962 if I2C

	select SND_SOC_WM8962 if I2C && INPUT

	select SND_SOC_WM8971 if I2C

	select SND_SOC_WM8974 if I2C

	select SND_SOC_WM8978 if I2C
@@ -286,7 +286,7 @@ config SND_SOC_CS42L51_I2C 


config SND_SOC_CS42L52

	tristate "Cirrus Logic CS42L52 CODEC"

	depends on I2C

	depends on I2C && INPUT



config SND_SOC_CS42L73

	tristate "Cirrus Logic CS42L73 CODEC"
@@ -602,7 +602,7 @@ config SND_SOC_WM8961 


config SND_SOC_WM8962

	tristate "Wolfson Microelectronics WM8962 CODEC"

	depends on I2C

	depends on I2C && INPUT



config SND_SOC_WM8971

	tristate

sound/soc/codecs/cs42l52.c

+0 −12
Original line number Diff line number Diff line
@@ -50,11 +50,9 @@ struct cs42l52_private { 
	u8 mclksel;

	u32 mclk;

	u8 flags;

#if IS_ENABLED(CONFIG_INPUT)

	struct input_dev *beep;

	struct work_struct beep_work;

	int beep_rate;

#endif

};



static const struct reg_default cs42l52_reg_defaults[] = {
@@ -962,7 +960,6 @@ static int cs42l52_resume(struct snd_soc_codec *codec) 
	return 0;

}



#if IS_ENABLED(CONFIG_INPUT)

static int beep_rates[] = {

	261, 522, 585, 667, 706, 774, 889, 1000,

	1043, 1200, 1333, 1412, 1600, 1714, 2000, 2182
@@ -1096,15 +1093,6 @@ static void cs42l52_free_beep(struct snd_soc_codec *codec) 
	snd_soc_update_bits(codec, CS42L52_BEEP_TONE_CTL,

			    CS42L52_BEEP_EN_MASK, 0);

}

#else

static void cs42l52_init_beep(struct snd_soc_codec *codec)

{

}



static void cs42l52_free_beep(struct snd_soc_codec *codec)

{

}

#endif



static int cs42l52_probe(struct snd_soc_codec *codec)

{

sound/soc/codecs/wm8962.c

+0 −12
Original line number Diff line number Diff line
@@ -74,11 +74,9 @@ struct wm8962_priv { 
	struct regulator_bulk_data supplies[WM8962_NUM_SUPPLIES];

	struct notifier_block disable_nb[WM8962_NUM_SUPPLIES];



#if IS_ENABLED(CONFIG_INPUT)

	struct input_dev *beep;

	struct work_struct beep_work;

	int beep_rate;

#endif



#ifdef CONFIG_GPIOLIB

	struct gpio_chip gpio_chip;
@@ -3145,7 +3143,6 @@ int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack) 
}

EXPORT_SYMBOL_GPL(wm8962_mic_detect);



#if IS_ENABLED(CONFIG_INPUT)

static int beep_rates[] = {

	500, 1000, 2000, 4000,

};
@@ -3277,15 +3274,6 @@ static void wm8962_free_beep(struct snd_soc_codec *codec) 


	snd_soc_update_bits(codec, WM8962_BEEP_GENERATOR_1, WM8962_BEEP_ENA,0);

}

#else

static void wm8962_init_beep(struct snd_soc_codec *codec)

{

}



static void wm8962_free_beep(struct snd_soc_codec *codec)

{

}

#endif



static void wm8962_set_gpio_mode(struct wm8962_priv *wm8962, int gpio)

{

sound/soc/fsl/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ config SND_SOC_EUKREA_TLV320 


config SND_SOC_IMX_WM8962

	tristate "SoC Audio support for i.MX boards with wm8962"

	depends on OF && I2C

	depends on OF && I2C && INPUT

	select SND_SOC_WM8962

	select SND_SOC_IMX_PCM_DMA

	select SND_SOC_IMX_AUDMUX

sound/soc/samsung/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ config SND_SOC_SPEYSIDE 


config SND_SOC_TOBERMORY

	tristate "Audio support for Wolfson Tobermory"

	depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410

	depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && INPUT

	select SND_SAMSUNG_I2S

	select SND_SOC_WM8962