Merge remote-tracking branch 'asoc/topic/da7219' into asoc-next
This commit is contained in:
99
include/sound/da7219-aad.h
Normal file
99
include/sound/da7219-aad.h
Normal file
@@ -0,0 +1,99 @@
|
||||
/*
|
||||
* da7219-aad.h - DA7322 ASoC Codec AAD Driver Platform Data
|
||||
*
|
||||
* Copyright (c) 2015 Dialog Semiconductor Ltd.
|
||||
*
|
||||
* Author: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*/
|
||||
|
||||
#ifndef __DA7219_AAD_PDATA_H
|
||||
#define __DA7219_AAD_PDATA_H
|
||||
|
||||
enum da7219_aad_micbias_pulse_lvl {
|
||||
DA7219_AAD_MICBIAS_PULSE_LVL_OFF = 0,
|
||||
DA7219_AAD_MICBIAS_PULSE_LVL_2_8V = 6,
|
||||
DA7219_AAD_MICBIAS_PULSE_LVL_2_9V,
|
||||
};
|
||||
|
||||
enum da7219_aad_btn_cfg {
|
||||
DA7219_AAD_BTN_CFG_2MS = 1,
|
||||
DA7219_AAD_BTN_CFG_5MS,
|
||||
DA7219_AAD_BTN_CFG_10MS,
|
||||
DA7219_AAD_BTN_CFG_50MS,
|
||||
DA7219_AAD_BTN_CFG_100MS,
|
||||
DA7219_AAD_BTN_CFG_200MS,
|
||||
DA7219_AAD_BTN_CFG_500MS,
|
||||
};
|
||||
|
||||
enum da7219_aad_mic_det_thr {
|
||||
DA7219_AAD_MIC_DET_THR_200_OHMS = 0,
|
||||
DA7219_AAD_MIC_DET_THR_500_OHMS,
|
||||
DA7219_AAD_MIC_DET_THR_750_OHMS,
|
||||
DA7219_AAD_MIC_DET_THR_1000_OHMS,
|
||||
};
|
||||
|
||||
enum da7219_aad_jack_ins_deb {
|
||||
DA7219_AAD_JACK_INS_DEB_5MS = 0,
|
||||
DA7219_AAD_JACK_INS_DEB_10MS,
|
||||
DA7219_AAD_JACK_INS_DEB_20MS,
|
||||
DA7219_AAD_JACK_INS_DEB_50MS,
|
||||
DA7219_AAD_JACK_INS_DEB_100MS,
|
||||
DA7219_AAD_JACK_INS_DEB_200MS,
|
||||
DA7219_AAD_JACK_INS_DEB_500MS,
|
||||
DA7219_AAD_JACK_INS_DEB_1S,
|
||||
};
|
||||
|
||||
enum da7219_aad_jack_det_rate {
|
||||
DA7219_AAD_JACK_DET_RATE_32_64MS = 0,
|
||||
DA7219_AAD_JACK_DET_RATE_64_128MS,
|
||||
DA7219_AAD_JACK_DET_RATE_128_256MS,
|
||||
DA7219_AAD_JACK_DET_RATE_256_512MS,
|
||||
};
|
||||
|
||||
enum da7219_aad_jack_rem_deb {
|
||||
DA7219_AAD_JACK_REM_DEB_1MS = 0,
|
||||
DA7219_AAD_JACK_REM_DEB_5MS,
|
||||
DA7219_AAD_JACK_REM_DEB_10MS,
|
||||
DA7219_AAD_JACK_REM_DEB_20MS,
|
||||
};
|
||||
|
||||
enum da7219_aad_btn_avg {
|
||||
DA7219_AAD_BTN_AVG_1 = 0,
|
||||
DA7219_AAD_BTN_AVG_2,
|
||||
DA7219_AAD_BTN_AVG_4,
|
||||
DA7219_AAD_BTN_AVG_8,
|
||||
};
|
||||
|
||||
enum da7219_aad_adc_1bit_rpt {
|
||||
DA7219_AAD_ADC_1BIT_RPT_1 = 0,
|
||||
DA7219_AAD_ADC_1BIT_RPT_2,
|
||||
DA7219_AAD_ADC_1BIT_RPT_4,
|
||||
DA7219_AAD_ADC_1BIT_RPT_8,
|
||||
};
|
||||
|
||||
struct da7219_aad_pdata {
|
||||
int irq;
|
||||
|
||||
enum da7219_aad_micbias_pulse_lvl micbias_pulse_lvl;
|
||||
u32 micbias_pulse_time;
|
||||
enum da7219_aad_btn_cfg btn_cfg;
|
||||
enum da7219_aad_mic_det_thr mic_det_thr;
|
||||
enum da7219_aad_jack_ins_deb jack_ins_deb;
|
||||
enum da7219_aad_jack_det_rate jack_det_rate;
|
||||
enum da7219_aad_jack_rem_deb jack_rem_deb;
|
||||
|
||||
u8 a_d_btn_thr;
|
||||
u8 d_b_btn_thr;
|
||||
u8 b_c_btn_thr;
|
||||
u8 c_mic_btn_thr;
|
||||
|
||||
enum da7219_aad_btn_avg btn_avg;
|
||||
enum da7219_aad_adc_1bit_rpt adc_1bit_rpt;
|
||||
};
|
||||
|
||||
#endif /* __DA7219_AAD_PDATA_H */
|
||||
55
include/sound/da7219.h
Normal file
55
include/sound/da7219.h
Normal file
@@ -0,0 +1,55 @@
|
||||
/*
|
||||
* da7219.h - DA7219 ASoC Codec Driver Platform Data
|
||||
*
|
||||
* Copyright (c) 2015 Dialog Semiconductor
|
||||
*
|
||||
* Author: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*/
|
||||
|
||||
#ifndef __DA7219_PDATA_H
|
||||
#define __DA7219_PDATA_H
|
||||
|
||||
/* LDO */
|
||||
enum da7219_ldo_lvl_sel {
|
||||
DA7219_LDO_LVL_SEL_1_05V = 0,
|
||||
DA7219_LDO_LVL_SEL_1_10V,
|
||||
DA7219_LDO_LVL_SEL_1_20V,
|
||||
DA7219_LDO_LVL_SEL_1_40V,
|
||||
};
|
||||
|
||||
/* Mic Bias */
|
||||
enum da7219_micbias_voltage {
|
||||
DA7219_MICBIAS_1_8V = 1,
|
||||
DA7219_MICBIAS_2_0V,
|
||||
DA7219_MICBIAS_2_2V,
|
||||
DA7219_MICBIAS_2_4V,
|
||||
DA7219_MICBIAS_2_6V,
|
||||
};
|
||||
|
||||
/* Mic input type */
|
||||
enum da7219_mic_amp_in_sel {
|
||||
DA7219_MIC_AMP_IN_SEL_DIFF = 0,
|
||||
DA7219_MIC_AMP_IN_SEL_SE_P,
|
||||
DA7219_MIC_AMP_IN_SEL_SE_N,
|
||||
};
|
||||
|
||||
struct da7219_aad_pdata;
|
||||
|
||||
struct da7219_pdata {
|
||||
/* Internal LDO */
|
||||
enum da7219_ldo_lvl_sel ldo_lvl_sel;
|
||||
|
||||
/* Mic */
|
||||
enum da7219_micbias_voltage micbias_lvl;
|
||||
enum da7219_mic_amp_in_sel mic_amp_in_sel;
|
||||
|
||||
/* AAD */
|
||||
struct da7219_aad_pdata *aad_pdata;
|
||||
};
|
||||
|
||||
#endif /* __DA7219_PDATA_H */
|
||||
@@ -217,6 +217,13 @@
|
||||
.get = xhandler_get, .put = xhandler_put, \
|
||||
.private_value = \
|
||||
SOC_DOUBLE_VALUE(reg, shift_left, shift_right, max, invert, 0) }
|
||||
#define SOC_DOUBLE_R_EXT(xname, reg_left, reg_right, xshift, xmax, xinvert,\
|
||||
xhandler_get, xhandler_put) \
|
||||
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
|
||||
.info = snd_soc_info_volsw, \
|
||||
.get = xhandler_get, .put = xhandler_put, \
|
||||
.private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \
|
||||
xmax, xinvert) }
|
||||
#define SOC_SINGLE_EXT_TLV(xname, xreg, xshift, xmax, xinvert,\
|
||||
xhandler_get, xhandler_put, tlv_array) \
|
||||
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
|
||||
|
||||
Reference in New Issue
Block a user