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

Commit 3b495e4b authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/max98371', 'asoc/topic/max9867',... 

Merge remote-tracking branches 'asoc/topic/max98371', 'asoc/topic/max9867', 'asoc/topic/max98926' and 'asoc/topic/mtk' into asoc-next
parents ee61b892 408ef7e1 349fa18c 478cc9f9 22e76614

sound/soc/codecs/max98371.c

+0 −1
Original line number Diff line number Diff line
@@ -426,7 +426,6 @@ MODULE_DEVICE_TABLE(of, max98371_of_match); 
static struct i2c_driver max98371_i2c_driver = {

	.driver = {

		.name = "max98371",

		.owner = THIS_MODULE,

		.pm = NULL,

		.of_match_table = of_match_ptr(max98371_of_match),

	},

sound/soc/codecs/max9867.c

+2 −3
Original line number Diff line number Diff line
@@ -38,11 +38,10 @@ static DECLARE_TLV_DB_SCALE(max9860_capture_tlv, -600, 200, 0); 
static DECLARE_TLV_DB_SCALE(max9860_mic_tlv, 2000, 100, 1);

static DECLARE_TLV_DB_SCALE(max9860_adc_left_tlv, -1200, 100, 1);

static DECLARE_TLV_DB_SCALE(max9860_adc_right_tlv, -1200, 100, 1);

static const unsigned int max98088_micboost_tlv[] = {

	TLV_DB_RANGE_HEAD(2),

static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(max98088_micboost_tlv,

	0, 1, TLV_DB_SCALE_ITEM(0, 2000, 0),

	2, 2, TLV_DB_SCALE_ITEM(3000, 0, 0),

};

);



static const struct snd_kcontrol_new max9867_snd_controls[] = {

	SOC_DOUBLE_R("Master Playback Volume", MAX9867_LEFTVOL,

sound/soc/codecs/max98926.c

+3 −3
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static int max98926_dai_set_fmt(struct snd_soc_dai *codec_dai, 
		max98926_set_sense_data(max98926);

		break;

	default:

		dev_err(codec->dev, "DAI clock mode unsupported");

		dev_err(codec->dev, "DAI clock mode unsupported\n");

		return -EINVAL;

	}
@@ -364,7 +364,7 @@ static int max98926_dai_set_fmt(struct snd_soc_dai *codec_dai, 
		invert = MAX98926_DAI_BCI_MASK | MAX98926_DAI_WCI_MASK;

		break;

	default:

		dev_err(codec->dev, "DAI invert mode unsupported");

		dev_err(codec->dev, "DAI invert mode unsupported\n");

		return -EINVAL;

	}
@@ -408,7 +408,7 @@ static int max98926_dai_hw_params(struct snd_pcm_substream *substream, 
		max98926->ch_size = 32;

		break;

	default:

		dev_dbg(codec->dev, "format unsupported %d",

		dev_dbg(codec->dev, "format unsupported %d\n",

			params_format(params));

		return -EINVAL;

	}

sound/soc/mediatek/common/mtk-afe-fe-dai.c

+3 −2
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 


#define AFE_BASE_END_OFFSET 8



int mtk_regmap_update_bits(struct regmap *map, int reg, unsigned int mask,

static int mtk_regmap_update_bits(struct regmap *map, int reg,

			   unsigned int mask,

			   unsigned int val)

{

	if (reg < 0)
@@ -31,7 +32,7 @@ int mtk_regmap_update_bits(struct regmap *map, int reg, unsigned int mask, 
	return regmap_update_bits(map, reg, mask, val);

}



int mtk_regmap_write(struct regmap *map, int reg, unsigned int val)

static int mtk_regmap_write(struct regmap *map, int reg, unsigned int val)

{

	if (reg < 0)

		return 0;