Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next (7d590e46) · Commits · e / devices / android_kernel_teracube_2e

Documentation/devicetree/bindings/sound/pcm512x.txt

+25 −3

Original line number	Diff line number	Diff line
		@@ -5,7 +5,8 @@ on the board).

		Required properties:

		- compatible : One of "ti,pcm5121" or "ti,pcm5122"
		- compatible : One of "ti,pcm5121", "ti,pcm5122", "ti,pcm5141" or
		"ti,pcm5142"

		- reg : the I2C address of the device for I2C, the chip select
		number for SPI.
		@@ -16,9 +17,16 @@ Required properties:
		Optional properties:

		- clocks : A clock specifier for the clock connected as SCLK. If this
		is absent the device will be configured to clock from BCLK.
		is absent the device will be configured to clock from BCLK. If pll-in
		and pll-out are specified in addition to a clock, the device is
		configured to accept clock input on a specified gpio pin.

		Example:
		- pll-in, pll-out : gpio pins used to connect the pll using <1>
		through <6>. The device will be configured for clock input on the
		given pll-in pin and PLL output on the given pll-out pin. An
		external connection from the pll-out pin to the SCLK pin is assumed.

		Examples:

		pcm5122: pcm5122@4c {
		compatible = "ti,pcm5122";
		@@ -28,3 +36,17 @@ Example:
		DVDD-supply = <&reg_1v8>;
		CPVDD-supply = <&reg_3v3>;
		};


		pcm5142: pcm5142@4c {
		compatible = "ti,pcm5142";
		reg = <0x4c>;

		AVDD-supply = <&reg_3v3_analog>;
		DVDD-supply = <&reg_1v8>;
		CPVDD-supply = <&reg_3v3>;

		clocks = <&sck>;
		pll-in = <3>;
		pll-out = <6>;
		};

include/sound/pcm.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -275,6 +275,12 @@ struct snd_pcm_hw_constraint_list {
		unsigned int mask;
		};

		struct snd_pcm_hw_constraint_ranges {
		unsigned int count;
		const struct snd_interval *ranges;
		unsigned int mask;
		};

		struct snd_pcm_hwptr_log;

		struct snd_pcm_runtime {
		@@ -910,6 +916,8 @@ void snd_interval_mulkdiv(const struct snd_interval *a, unsigned int k,
		const struct snd_interval b, struct snd_interval c);
		int snd_interval_list(struct snd_interval *i, unsigned int count,
		const unsigned int *list, unsigned int mask);
		int snd_interval_ranges(struct snd_interval *i, unsigned int count,
		const struct snd_interval *list, unsigned int mask);
		int snd_interval_ratnum(struct snd_interval *i,
		unsigned int rats_count, struct snd_ratnum *rats,
		unsigned int nump, unsigned int denp);
		@@ -934,6 +942,10 @@ int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime,
		unsigned int cond,
		snd_pcm_hw_param_t var,
		const struct snd_pcm_hw_constraint_list *l);
		int snd_pcm_hw_constraint_ranges(struct snd_pcm_runtime *runtime,
		unsigned int cond,
		snd_pcm_hw_param_t var,
		const struct snd_pcm_hw_constraint_ranges *r);
		int snd_pcm_hw_constraint_ratnums(struct snd_pcm_runtime *runtime,
		unsigned int cond,
		snd_pcm_hw_param_t var,

sound/core/pcm_lib.c

+85 −0

Original line number	Diff line number	Diff line
		@@ -1015,6 +1015,60 @@ int snd_interval_list(struct snd_interval *i, unsigned int count,

		EXPORT_SYMBOL(snd_interval_list);

		/**
		* snd_interval_ranges - refine the interval value from the list of ranges
		* @i: the interval value to refine
		* @count: the number of elements in the list of ranges
		* @ranges: the ranges list
		* @mask: the bit-mask to evaluate
		*
		* Refines the interval value from the list of ranges.
		* When mask is non-zero, only the elements corresponding to bit 1 are
		* evaluated.
		*
		* Return: Positive if the value is changed, zero if it's not changed, or a
		* negative error code.
		*/
		int snd_interval_ranges(struct snd_interval *i, unsigned int count,
		const struct snd_interval *ranges, unsigned int mask)
		{
		unsigned int k;
		struct snd_interval range_union;
		struct snd_interval range;

		if (!count) {
		snd_interval_none(i);
		return -EINVAL;
		}
		snd_interval_any(&range_union);
		range_union.min = UINT_MAX;
		range_union.max = 0;
		for (k = 0; k < count; k++) {
		if (mask && !(mask & (1 << k)))
		continue;
		snd_interval_copy(&range, &ranges[k]);
		if (snd_interval_refine(&range, i) < 0)
		continue;
		if (snd_interval_empty(&range))
		continue;

		if (range.min < range_union.min) {
		range_union.min = range.min;
		range_union.openmin = 1;
		}
		if (range.min == range_union.min && !range.openmin)
		range_union.openmin = 0;
		if (range.max > range_union.max) {
		range_union.max = range.max;
		range_union.openmax = 1;
		}
		if (range.max == range_union.max && !range.openmax)
		range_union.openmax = 0;
		}
		return snd_interval_refine(i, &range_union);
		}
		EXPORT_SYMBOL(snd_interval_ranges);

		static int snd_interval_step(struct snd_interval *i, unsigned int step)
		{
		unsigned int n;
		@@ -1221,6 +1275,37 @@ int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime,

		EXPORT_SYMBOL(snd_pcm_hw_constraint_list);

		static int snd_pcm_hw_rule_ranges(struct snd_pcm_hw_params *params,
		struct snd_pcm_hw_rule *rule)
		{
		struct snd_pcm_hw_constraint_ranges *r = rule->private;
		return snd_interval_ranges(hw_param_interval(params, rule->var),
		r->count, r->ranges, r->mask);
		}


		/**
		* snd_pcm_hw_constraint_ranges - apply list of range constraints to a parameter
		* @runtime: PCM runtime instance
		* @cond: condition bits
		* @var: hw_params variable to apply the list of range constraints
		* @r: ranges
		*
		* Apply the list of range constraints to an interval parameter.
		*
		* Return: Zero if successful, or a negative error code on failure.
		*/
		int snd_pcm_hw_constraint_ranges(struct snd_pcm_runtime *runtime,
		unsigned int cond,
		snd_pcm_hw_param_t var,
		const struct snd_pcm_hw_constraint_ranges *r)
		{
		return snd_pcm_hw_rule_add(runtime, cond, var,
		snd_pcm_hw_rule_ranges, (void *)r,
		var, -1);
		}
		EXPORT_SYMBOL(snd_pcm_hw_constraint_ranges);

		static int snd_pcm_hw_rule_ratnums(struct snd_pcm_hw_params *params,
		struct snd_pcm_hw_rule *rule)
		{

sound/soc/codecs/pcm512x-i2c.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,8 @@ static int pcm512x_i2c_remove(struct i2c_client *i2c)
		static const struct i2c_device_id pcm512x_i2c_id[] = {
		{ "pcm5121", },
		{ "pcm5122", },
		{ "pcm5141", },
		{ "pcm5142", },
		{ }
		};
		MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id);
		@@ -53,6 +55,8 @@ MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id);
		static const struct of_device_id pcm512x_of_match[] = {
		{ .compatible = "ti,pcm5121", },
		{ .compatible = "ti,pcm5122", },
		{ .compatible = "ti,pcm5141", },
		{ .compatible = "ti,pcm5142", },
		{ }
		};
		MODULE_DEVICE_TABLE(of, pcm512x_of_match);

sound/soc/codecs/pcm512x-spi.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,8 @@ static int pcm512x_spi_remove(struct spi_device *spi)
		static const struct spi_device_id pcm512x_spi_id[] = {
		{ "pcm5121", },
		{ "pcm5122", },
		{ "pcm5141", },
		{ "pcm5142", },
		{ },
		};
		MODULE_DEVICE_TABLE(spi, pcm512x_spi_id);
		@@ -50,6 +52,8 @@ MODULE_DEVICE_TABLE(spi, pcm512x_spi_id);
		static const struct of_device_id pcm512x_of_match[] = {
		{ .compatible = "ti,pcm5121", },
		{ .compatible = "ti,pcm5122", },
		{ .compatible = "ti,pcm5141", },
		{ .compatible = "ti,pcm5142", },
		{ }
		};
		MODULE_DEVICE_TABLE(of, pcm512x_of_match);