Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/sgtl5000',... (da2495fb) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/devicetree/bindings/sound/sgtl5000.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,8 @@ Required properties:

		- reg : the I2C address of the device

		- #sound-dai-cells: must be equal to 0

		- clocks : the clock provider of SYS_MCLK

		- VDDA-supply : the regulator provider of VDDA
		@@ -40,6 +42,7 @@ Example:
		codec: sgtl5000@a {
		compatible = "fsl,sgtl5000";
		reg = <0x0a>;
		#sound-dai-cells = <0>;
		clocks = <&clks 150>;
		micbias-resistor-k-ohms = <2>;
		micbias-voltage-m-volts = <2250>;

+147 −148

File changed.

Preview size limit exceeded, changes collapsed.

+5 −5

Original line number	Diff line number	Diff line
		@@ -1986,11 +1986,11 @@ enum {
		RT5670_DOWN_RATE_FILTER = (0x1 << 7),
		};

		int rt5670_sel_asrc_clk_src(struct snd_soc_codec *codec,
		int rt5670_sel_asrc_clk_src(struct snd_soc_component *component,
		unsigned int filter_mask, unsigned int clk_src);

		struct rt5670_priv {
		struct snd_soc_codec *codec;
		struct snd_soc_component *component;
		struct rt5670_platform_data pdata;
		struct regmap *regmap;
		struct snd_soc_jack *jack;
		@@ -2012,8 +2012,8 @@ struct rt5670_priv {
		int jack_type_saved;
		};

		void rt5670_jack_suspend(struct snd_soc_codec *codec);
		void rt5670_jack_resume(struct snd_soc_codec *codec);
		int rt5670_set_jack_detect(struct snd_soc_codec *codec,
		void rt5670_jack_suspend(struct snd_soc_component *component);
		void rt5670_jack_resume(struct snd_soc_component *component);
		int rt5670_set_jack_detect(struct snd_soc_component *component,
		struct snd_soc_jack *jack);
		#endif /* __RT5670_H__ */

+172 −103

File changed.

Preview size limit exceeded, changes collapsed.

+7 −0