Merge remote-tracking branches 'asoc/topic/tas2552', 'asoc/topic/tas5086', 'asoc/topic/tegra', 'asoc/topic/tlv' and 'asoc/topic/topology' into asoc-next
这个提交包含在:

@@ -398,48 +398,43 @@ static int max98095_mic2pre_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const unsigned int max98095_micboost_tlv[] = {
|
||||
TLV_DB_RANGE_HEAD(2),
|
||||
static const DECLARE_TLV_DB_RANGE(max98095_micboost_tlv,
|
||||
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 DECLARE_TLV_DB_SCALE(max98095_mic_tlv, 0, 100, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(max98095_adc_tlv, -1200, 100, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(max98095_adcboost_tlv, 0, 600, 0);
|
||||
|
||||
static const unsigned int max98095_hp_tlv[] = {
|
||||
TLV_DB_RANGE_HEAD(5),
|
||||
static const DECLARE_TLV_DB_RANGE(max98095_hp_tlv,
|
||||
0, 6, TLV_DB_SCALE_ITEM(-6700, 400, 0),
|
||||
7, 14, TLV_DB_SCALE_ITEM(-4000, 300, 0),
|
||||
15, 21, TLV_DB_SCALE_ITEM(-1700, 200, 0),
|
||||
22, 27, TLV_DB_SCALE_ITEM(-400, 100, 0),
|
||||
28, 31, TLV_DB_SCALE_ITEM(150, 50, 0),
|
||||
};
|
||||
28, 31, TLV_DB_SCALE_ITEM(150, 50, 0)
|
||||
);
|
||||
|
||||
static const unsigned int max98095_spk_tlv[] = {
|
||||
TLV_DB_RANGE_HEAD(4),
|
||||
static const DECLARE_TLV_DB_RANGE(max98095_spk_tlv,
|
||||
0, 10, TLV_DB_SCALE_ITEM(-5900, 400, 0),
|
||||
11, 18, TLV_DB_SCALE_ITEM(-1700, 200, 0),
|
||||
19, 27, TLV_DB_SCALE_ITEM(-200, 100, 0),
|
||||
28, 39, TLV_DB_SCALE_ITEM(650, 50, 0),
|
||||
};
|
||||
28, 39, TLV_DB_SCALE_ITEM(650, 50, 0)
|
||||
);
|
||||
|
||||
static const unsigned int max98095_rcv_lout_tlv[] = {
|
||||
TLV_DB_RANGE_HEAD(5),
|
||||
static const DECLARE_TLV_DB_RANGE(max98095_rcv_lout_tlv,
|
||||
0, 6, TLV_DB_SCALE_ITEM(-6200, 400, 0),
|
||||
7, 14, TLV_DB_SCALE_ITEM(-3500, 300, 0),
|
||||
15, 21, TLV_DB_SCALE_ITEM(-1200, 200, 0),
|
||||
22, 27, TLV_DB_SCALE_ITEM(100, 100, 0),
|
||||
28, 31, TLV_DB_SCALE_ITEM(650, 50, 0),
|
||||
};
|
||||
28, 31, TLV_DB_SCALE_ITEM(650, 50, 0)
|
||||
);
|
||||
|
||||
static const unsigned int max98095_lin_tlv[] = {
|
||||
TLV_DB_RANGE_HEAD(3),
|
||||
static const DECLARE_TLV_DB_RANGE(max98095_lin_tlv,
|
||||
0, 2, TLV_DB_SCALE_ITEM(-600, 300, 0),
|
||||
3, 3, TLV_DB_SCALE_ITEM(300, 1100, 0),
|
||||
4, 5, TLV_DB_SCALE_ITEM(1400, 600, 0),
|
||||
};
|
||||
4, 5, TLV_DB_SCALE_ITEM(1400, 600, 0)
|
||||
);
|
||||
|
||||
static const struct snd_kcontrol_new max98095_snd_controls[] = {
|
||||
|
||||
|
在新工单中引用
屏蔽一个用户