Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge remote-tracking branches 'asoc/fix/axi', 'asoc/fix/cs4265',... 

Merge remote-tracking branches 'asoc/fix/axi', 'asoc/fix/cs4265', 'asoc/fix/da732x', 'asoc/fix/omap', 'asoc/fix/rsnd', 'asoc/fix/rt5640', 'asoc/fix/rt5677', 'asoc/fix/simple' and 'asoc/fix/tegra' into asoc-linus
parents e65f6b1e d1555c40 fb18cd2a aa477462 fdaf42c0 c8e6e960 f4821e8e 22e51345 e3c4a28b d50884af

Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt

+1 −1
Original line number Diff line number Diff line 
ADI AXI-SPDIF controller



Required properties:

 - compatible : Must be "adi,axi-spdif-1.00.a"

 - compatible : Must be "adi,axi-spdif-tx-1.00.a"

 - reg : Must contain SPDIF core's registers location and length

 - clocks : Pairs of phandle and specifier referencing the controller's clocks.

   The controller expects two clocks, the clock used for the AXI interface and

sound/soc/codecs/cs4265.c

+6 −6
Original line number Diff line number Diff line
@@ -282,10 +282,10 @@ static const struct cs4265_clk_para clk_map_table[] = { 


	/*64k*/

	{8192000, 64000, 1, 0},

	{1228800, 64000, 1, 1},

	{1693440, 64000, 1, 2},

	{2457600, 64000, 1, 3},

	{3276800, 64000, 1, 4},

	{12288000, 64000, 1, 1},

	{16934400, 64000, 1, 2},

	{24576000, 64000, 1, 3},

	{32768000, 64000, 1, 4},



	/* 88.2k */

	{11289600, 88200, 1, 0},
@@ -435,10 +435,10 @@ static int cs4265_pcm_hw_params(struct snd_pcm_substream *substream, 
	index = cs4265_get_clk_index(cs4265->sysclk, params_rate(params));

	if (index >= 0) {

		snd_soc_update_bits(codec, CS4265_ADC_CTL,

			CS4265_ADC_FM, clk_map_table[index].fm_mode);

			CS4265_ADC_FM, clk_map_table[index].fm_mode << 6);

		snd_soc_update_bits(codec, CS4265_MCLK_FREQ,

			CS4265_MCLK_FREQ_MASK,

			clk_map_table[index].mclkdiv);

			clk_map_table[index].mclkdiv << 4);



	} else {

		dev_err(codec->dev, "can't get correct mclk\n");

sound/soc/codecs/da732x.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
 */



#ifndef __DA732X_H_

#define __DA732X_H

#define __DA732X_H_



#include <sound/soc.h>

sound/soc/codecs/rt5640.c

+1 −0
Original line number Diff line number Diff line
@@ -2059,6 +2059,7 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5640 = { 
static const struct regmap_config rt5640_regmap = {

	.reg_bits = 8,

	.val_bits = 16,

	.use_single_rw = true,



	.max_register = RT5640_VENDOR_ID2 + 1 + (ARRAY_SIZE(rt5640_ranges) *

					       RT5640_PR_SPACING),

sound/soc/codecs/rt5677.c

+4 −4
Original line number Diff line number Diff line
@@ -2135,10 +2135,10 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = { 
	{ "BST2", NULL, "IN2P" },

	{ "BST2", NULL, "IN2N" },



	{ "IN1P", NULL, "micbias1" },

	{ "IN1N", NULL, "micbias1" },

	{ "IN2P", NULL, "micbias1" },

	{ "IN2N", NULL, "micbias1" },

	{ "IN1P", NULL, "MICBIAS1" },

	{ "IN1N", NULL, "MICBIAS1" },

	{ "IN2P", NULL, "MICBIAS1" },

	{ "IN2N", NULL, "MICBIAS1" },



	{ "ADC 1", NULL, "BST1" },

	{ "ADC 1", NULL, "ADC 1 power" },