Merge remote-tracking branches 'asoc/topic/max98371', 'asoc/topic/max9867', 'asoc/topic/max98926' and 'asoc/topic/mtk' into asoc-next
This commit is contained in:
commit
3b495e4bf3
|
@ -426,7 +426,6 @@ MODULE_DEVICE_TABLE(of, max98371_of_match);
|
||||||
static struct i2c_driver max98371_i2c_driver = {
|
static struct i2c_driver max98371_i2c_driver = {
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "max98371",
|
.name = "max98371",
|
||||||
.owner = THIS_MODULE,
|
|
||||||
.pm = NULL,
|
.pm = NULL,
|
||||||
.of_match_table = of_match_ptr(max98371_of_match),
|
.of_match_table = of_match_ptr(max98371_of_match),
|
||||||
},
|
},
|
||||||
|
|
|
@ -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_mic_tlv, 2000, 100, 1);
|
||||||
static DECLARE_TLV_DB_SCALE(max9860_adc_left_tlv, -1200, 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 DECLARE_TLV_DB_SCALE(max9860_adc_right_tlv, -1200, 100, 1);
|
||||||
static const unsigned int max98088_micboost_tlv[] = {
|
static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(max98088_micboost_tlv,
|
||||||
TLV_DB_RANGE_HEAD(2),
|
|
||||||
0, 1, TLV_DB_SCALE_ITEM(0, 2000, 0),
|
0, 1, TLV_DB_SCALE_ITEM(0, 2000, 0),
|
||||||
2, 2, TLV_DB_SCALE_ITEM(3000, 0, 0),
|
2, 2, TLV_DB_SCALE_ITEM(3000, 0, 0),
|
||||||
};
|
);
|
||||||
|
|
||||||
static const struct snd_kcontrol_new max9867_snd_controls[] = {
|
static const struct snd_kcontrol_new max9867_snd_controls[] = {
|
||||||
SOC_DOUBLE_R("Master Playback Volume", MAX9867_LEFTVOL,
|
SOC_DOUBLE_R("Master Playback Volume", MAX9867_LEFTVOL,
|
||||||
|
|
|
@ -347,7 +347,7 @@ static int max98926_dai_set_fmt(struct snd_soc_dai *codec_dai,
|
||||||
max98926_set_sense_data(max98926);
|
max98926_set_sense_data(max98926);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
dev_err(codec->dev, "DAI clock mode unsupported");
|
dev_err(codec->dev, "DAI clock mode unsupported\n");
|
||||||
return -EINVAL;
|
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;
|
invert = MAX98926_DAI_BCI_MASK | MAX98926_DAI_WCI_MASK;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
dev_err(codec->dev, "DAI invert mode unsupported");
|
dev_err(codec->dev, "DAI invert mode unsupported\n");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -408,7 +408,7 @@ static int max98926_dai_hw_params(struct snd_pcm_substream *substream,
|
||||||
max98926->ch_size = 32;
|
max98926->ch_size = 32;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
dev_dbg(codec->dev, "format unsupported %d",
|
dev_dbg(codec->dev, "format unsupported %d\n",
|
||||||
params_format(params));
|
params_format(params));
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,8 @@
|
||||||
|
|
||||||
#define AFE_BASE_END_OFFSET 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)
|
unsigned int val)
|
||||||
{
|
{
|
||||||
if (reg < 0)
|
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);
|
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)
|
if (reg < 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue