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

Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/hdmi',... 

Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/hdmi', 'asoc/topic/maintainers' and 'asoc/topic/max8960' into asoc-next
parents dd0111dc d93c5066 efc9194b 181ad2a5 716540fd

Documentation/devicetree/bindings/sound/max9860.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
MAX9860 Mono Audio Voice Codec



Required properties:



  - compatible : "maxim,max9860"



  - reg : the I2C address of the device



  - AVDD-supply, DVDD-supply and DVDDIO-supply : power supplies for

    the device, as covered in bindings/regulator/regulator.txt



  - clock-names : Required element: "mclk".



  - clocks : A clock specifier for the clock connected as MCLK.



Examples:



	max9860: max9860@10 {

		compatible = "maxim,max9860";

		reg = <0x10>;



		AVDD-supply = <&reg_1v8>;

		DVDD-supply = <&reg_1v8>;

		DVDDIO-supply = <&reg_3v0>;



		clock-names = "mclk";

		clocks = <&pck2>;

	};

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -7270,6 +7270,13 @@ F: Documentation/devicetree/bindings/i2c/max6697.txt 
F:	drivers/hwmon/max6697.c

F:	include/linux/platform_data/max6697.h



MAX9860 MONO AUDIO VOICE CODEC DRIVER

M:	Peter Rosin <peda@axentia.se>

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

S:	Maintained

F:	Documentation/devicetree/bindings/sound/max9860.txt

F:	sound/soc/codecs/max9860.*



MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS

M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

L:	linux-pm@vger.kernel.org
@@ -10724,6 +10731,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 
L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

W:	http://alsa-project.org/main/index.php/ASoC

S:	Supported

F:	Documentation/devicetree/bindings/sound/

F:	Documentation/sound/alsa/soc/

F:	sound/soc/

F:	include/sound/soc*

include/sound/hdmi-codec.h

+8 −5
Original line number Diff line number Diff line
@@ -53,18 +53,19 @@ struct hdmi_codec_params { 
	int channels;

};



struct hdmi_codec_pdata;

struct hdmi_codec_ops {

	/*

	 * Called when ASoC starts an audio stream setup.

	 * Optional

	 */

	int (*audio_startup)(struct device *dev);

	int (*audio_startup)(struct device *dev, void *data);



	/*

	 * Configures HDMI-encoder for audio stream.

	 * Mandatory

	 */

	int (*hw_params)(struct device *dev,

	int (*hw_params)(struct device *dev, void *data,

			 struct hdmi_codec_daifmt *fmt,

			 struct hdmi_codec_params *hparms);
@@ -72,19 +73,20 @@ struct hdmi_codec_ops { 
	 * Shuts down the audio stream.

	 * Mandatory

	 */

	void (*audio_shutdown)(struct device *dev);

	void (*audio_shutdown)(struct device *dev, void *data);



	/*

	 * Mute/unmute HDMI audio stream.

	 * Optional

	 */

	int (*digital_mute)(struct device *dev, bool enable);

	int (*digital_mute)(struct device *dev, void *data, bool enable);



	/*

	 * Provides EDID-Like-Data from connected HDMI device.

	 * Optional

	 */

	int (*get_eld)(struct device *dev, uint8_t *buf, size_t len);

	int (*get_eld)(struct device *dev, void *data,

		       uint8_t *buf, size_t len);

};



/* HDMI codec initalization data */
@@ -93,6 +95,7 @@ struct hdmi_codec_pdata { 
	uint i2s:1;

	uint spdif:1;

	int max_i2s_channels;

	void *data;

};



#define HDMI_CODEC_DRV_NAME "hdmi-audio-codec"

sound/soc/codecs/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_MAX98925 if I2C

	select SND_SOC_MAX98926 if I2C

	select SND_SOC_MAX9850 if I2C

	select SND_SOC_MAX9860 if I2C

	select SND_SOC_MAX9768 if I2C

	select SND_SOC_MAX9877 if I2C

	select SND_SOC_MC13783 if MFD_MC13XXX
@@ -568,6 +569,11 @@ config SND_SOC_MAX98926 
config SND_SOC_MAX9850

	tristate



config SND_SOC_MAX9860

	tristate "Maxim MAX9860 Mono Audio Voice Codec"

	depends on I2C

	select REGMAP_I2C



config SND_SOC_PCM1681

	tristate "Texas Instruments PCM1681 CODEC"

	depends on I2C

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ snd-soc-max9867-objs := max9867.o 
snd-soc-max98925-objs := max98925.o

snd-soc-max98926-objs := max98926.o

snd-soc-max9850-objs := max9850.o

snd-soc-max9860-objs := max9860.o

snd-soc-mc13783-objs := mc13783.o

snd-soc-ml26124-objs := ml26124.o

snd-soc-nau8825-objs := nau8825.o
@@ -301,6 +302,7 @@ obj-$(CONFIG_SND_SOC_MAX9867) += snd-soc-max9867.o 
obj-$(CONFIG_SND_SOC_MAX98925)	+= snd-soc-max98925.o

obj-$(CONFIG_SND_SOC_MAX98926)	+= snd-soc-max98926.o

obj-$(CONFIG_SND_SOC_MAX9850)	+= snd-soc-max9850.o

obj-$(CONFIG_SND_SOC_MAX9860)	+= snd-soc-max9860.o

obj-$(CONFIG_SND_SOC_MC13783)	+= snd-soc-mc13783.o

obj-$(CONFIG_SND_SOC_ML26124)	+= snd-soc-ml26124.o

obj-$(CONFIG_SND_SOC_NAU8825)   += snd-soc-nau8825.o