ASoC: Add support for DA7219 audio codec
Subsystems (4)
v3 cover ASoC: Add support for DA7219 audio codec
This patch set adds support for the DA7219 audio codec with built-in advanced accessory detection functionality. Patch set includes codec driver, associated DT bindings documentation and MAINTAINERS file updates to cover new bindings.
This patch set is baselined against the v4.3-rc3 kernel version.
Changes in v3:
- Actually set clk_src in dai_sysclk() function of codec, so future calls can correctly identify if work is to be done or not.
Changes in v2:
- Add SOC_DOUBLE_R_EXT support to ASoC core.
- Use of upper-case naming for controls, where missing.
- Use of Playback/Capture Digital naming for certain ADC/DAC controls.
- CP mchange and vol_thresh DT bindings removed, now Kcontrols
- Kcontrols and DAPM now locked as part of hptest work, and specific controls affected have had locking introduced.
- Timeout for btn_det work when checking micbias status.
- Added comments to describe reasoning for work use with hptest, btn_det.
- Added comments to tonegen_freq_put/get to clarify endian conversion, and code now uses regmap_raw_read/write calls instead of bulk.
- DT parsing code now prints dev_warn() for invalid settings.
- SOC_VALUE_ENUM_SINGLE now used for hpf_mode handling, instead of customer get/put handlers.
- DTMF key control now a SOC_ENUM to correctly describe supported keys, including non-numeric.
- MIXIN_L_MIX_EN bit set as part of DAPM now (SUPPLY), rather than in probe.
- Fix dai_sysclk() function to correctly check for no change, using clk_id as well as freq.
- Error checking added for clk_set_rate() call.
- Improved error checking for devm_clk_get() call.
- Removed explicit use of device_may_wakeup() and enable/disable_irq_wake(). Now taken care of by I2C core so DT bindings updated accordingly to document this.
- hptest work now uses cache to keep state, instead of reading registers individually. Cache is bypassed, then when test executed and complete, regcache_sync_region() used to restore settings to pre-test values.
- Regulator consumer framework usage added, in particular to determine VDDIO level in use so device can be configured accordingly. DT documents updated to reflect this.
Adam Thomson (4):
ASoC: Add SOC_DOUBLE_R_EXT
ASoC: codecs: Add da7219 codec driver
ASoC: da7219: Add bindings documentation for DA7219 audio codec
MAINTAINERS: da7219: Add entry to cover DA7219 bindings document
Documentation/devicetree/bindings/sound/da7219.txt | 106 ++ MAINTAINERS | 1 + include/sound/da7219-aad.h | 99 + include/sound/da7219.h | 55 + include/sound/soc.h | 7 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/da7219-aad.c | 823 +++++++++ sound/soc/codecs/da7219-aad.h | 212 +++ sound/soc/codecs/da7219.c | 1940 ++++++++++++++++++++ sound/soc/codecs/da7219.h | 820 +++++++++ 11 files changed, 4069 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/da7219.txt create mode 100644 include/sound/da7219-aad.h create mode 100644 include/sound/da7219.h create mode 100644 sound/soc/codecs/da7219-aad.c create mode 100644 sound/soc/codecs/da7219-aad.h create mode 100644 sound/soc/codecs/da7219.c create mode 100644 sound/soc/codecs/da7219.h
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 1/4 ASoC: Add SOC_DOUBLE_R_EXT
_EXT version of SOC_DOUBLE_R required to allow for custom handlers.
--- include/sound/soc.h | 7 +++++++ 1 file changed, 7 insertions(+)
include/sound/soc.h +7 -0
@@ -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, \
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 2/4 ASoC: codecs: Add da7219 codec driver
In reply to Adam ThomsonThis adds support for the DA7219 audio codec with built-in advanced accessory detect features.
--- include/sound/da7219-aad.h | 99 +++ include/sound/da7219.h | 55 ++ sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/da7219-aad.c | 823 +++++++++++++++++ sound/soc/codecs/da7219-aad.h | 212 +++++ sound/soc/codecs/da7219.c | 1940 +++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/da7219.h | 820 +++++++++++++++++ 8 files changed, 3955 insertions(+) create mode 100644 include/sound/da7219-aad.h create mode 100644 include/sound/da7219.h create mode 100644 sound/soc/codecs/da7219-aad.c create mode 100644 sound/soc/codecs/da7219-aad.h create mode 100644 sound/soc/codecs/da7219.c create mode 100644 sound/soc/codecs/da7219.h
include/sound/da7219-aad.h new file +99 -0
@@ -0,0 +1,99 @@ +/* +* da7219-aad.h - DA7322 ASoC Codec AAD Driver Platform Data +* +* Copyright (c) 2015 Dialog Semiconductor Ltd. +* +* Author: Adam Thomson <[email protected]> +* +* 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 */
include/sound/da7219.h new file +55 -0
55 lines not on this page · raw message
sound/soc/codecs/Kconfig +4 -0
@@ -57,6 +57,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_CX20442 if TTY select SND_SOC_DA7210 if SND_SOC_I2C_AND_SPI select SND_SOC_DA7213 if I2C + select SND_SOC_DA7219 if I2C select SND_SOC_DA732X if I2C select SND_SOC_DA9055 if I2C select SND_SOC_DMIC
@@ -430,6 +431,9 @@ config SND_SOC_DA7210 config SND_SOC_DA7213 tristate +config SND_SOC_DA7219 + tristate + config SND_SOC_DA732X tristate
sound/soc/codecs/Makefile +2 -0
@@ -49,6 +49,7 @@ snd-soc-cs4349-objs := cs4349.o snd-soc-cx20442-objs := cx20442.o snd-soc-da7210-objs := da7210.o snd-soc-da7213-objs := da7213.o +snd-soc-da7219-objs := da7219.o da7219-aad.o snd-soc-da732x-objs := da732x.o snd-soc-da9055-objs := da9055.o snd-soc-bt-sco-objs := bt-sco.o
@@ -241,6 +242,7 @@ obj-$(CONFIG_SND_SOC_CS4349) += snd-soc-cs4349.o obj-$(CONFIG_SND_SOC_CX20442) += snd-soc-cx20442.o obj-$(CONFIG_SND_SOC_DA7210) += snd-soc-da7210.o obj-$(CONFIG_SND_SOC_DA7213) += snd-soc-da7213.o +obj-$(CONFIG_SND_SOC_DA7219) += snd-soc-da7219.o obj-$(CONFIG_SND_SOC_DA732X) += snd-soc-da732x.o obj-$(CONFIG_SND_SOC_DA9055) += snd-soc-da9055.o obj-$(CONFIG_SND_SOC_BT_SCO) += snd-soc-bt-sco.o
sound/soc/codecs/da7219-aad.c new file +823 -0
823 lines not on this page · raw message
sound/soc/codecs/da7219-aad.h new file +212 -0
212 lines not on this page · raw message
sound/soc/codecs/da7219.c new file +1940 -0
1,781 lines not on this page · raw message
sound/soc/codecs/da7219.h new file +820 -0
820 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Part of the diff is not shown here. View the raw message.
PATCH v3 3/4 ASoC: da7219: Add bindings documentation for DA7219 audio codec
In reply to Adam Thomson--- Documentation/devicetree/bindings/sound/da7219.txt | 106 +++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/da7219.txt
Documentation/devicetree/bindings/sound/da7219.txt new file +106 -0
@@ -0,0 +1,106 @@ +Dialog Semiconductor DA7219 Audio Codec bindings + +DA7219 is an audio codec with advanced accessory detect features. + +====== + +Required properties: +- compatible : Should be "dlg,da7219" +- reg: Specifies the I2C slave address + +- interrupt-parent : Specifies the phandle of the interrupt controller to which + the IRQs from DA7219 are delivered to. +- interrupts : IRQ line info for DA7219. + (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt for + further information relating to interrupt properties) + +- VDD-supply: VDD power supply for the device +- VDDMIC-supply: VDDMIC power supply for the device +- VDDIO-supply: VDDIO power supply for the device + (See Documentation/devicetree/bindings/regulator/regulator.txt for further + information relating to regulators) + +Optional properties: +- interrupt-names : Name associated with interrupt line. Should be "wakeup" if + interrupt is to be used to wake system, otherwise "irq" should be used. +- wakeup-source: Flag to indicate this device can wake system (suspend/resume). + +- clocks : phandle and clock specifier for codec MCLK. +- clock-names : Clock name string for 'clocks' attribute, should be "mclk". + +- dlg,ldo-lvl : Required internal LDO voltage (mV) level for digital engine + [<1050>, <1100>, <1200>, <1400>] +- dlg,micbias-lvl : Voltage (mV) for Mic Bias + [<1800>, <2000>, <2200>, <2400>, <2600>] +- dlg,mic-amp-in-sel : Mic input source type + ["diff", "se_p", "se_n"] + +====== + +Child node - 'da7219_aad': + +Optional properties: +- dlg,micbias-pulse-lvl : Mic bias higher voltage pulse level (mV). + [<2800>, <2900>] +- dlg,micbias-pulse-time : Mic bias higher voltage pulse duration (ms) +- dlg,btn-cfg : Periodic button press measurements for 4-pole jack (ms) + [<2>, <5>, <10>, <50>, <100>, <200>, <500>] +- dlg,mic-det-thr : Impedance threshold for mic detection measurement (Ohms) + [<200>, <500>, <750>, <1000>] +- dlg,jack-ins-deb : Debounce time for jack insertion (ms) + [<5>, <10>, <20>, <50>, <100>, <200>, <500>, <1000>] +- dlg,jack-det-rate: Jack type detection latency (3/4 pole) + ["32ms_64ms", "64ms_128ms", "128ms_256ms", "256ms_512ms"] +- dlg,jack-rem-deb : Debounce time for jack removal (ms) + [<1>, <5>, <10>, <20>] +- dlg,a-d-btn-thr : Impedance threshold between buttons A and D + [0x0 - 0xFF] +- dlg,d-b-btn-thr : Impedance threshold between buttons D and B + [0x0 - 0xFF] +- dlg,b-c-btn-thr : Impedance threshold between buttons B and C + [0x0 - 0xFF] +- dlg,c-mic-btn-thr : Impedance threshold between button C and Mic + [0x0 - 0xFF] +- dlg,btn-avg : Number of 8-bit readings for averaged button measurement + [<1>, <2>, <4>, <8>] +- dlg,adc-1bit-rpt : Repeat count for 1-bit button measurement + [<1>, <2>, <4>, <8>] + +====== + +Example: + + codec: da7219@1a { + compatible = "dlg,da7219"; + reg = <0x1a>; + + interrupt-parent = <&gpio6>; + interrupts = <11 IRQ_TYPE_LEVEL_HIGH>; + + VDD-supply = <®_audio>; + VDDMIC-supply = <®_audio>; + VDDIO-supply = <®_audio>; + + clocks = <&clks 201>; + clock-names = "mclk"; + + dlg,ldo-lvl = <1200>; + dlg,micbias-lvl = <2600>; + dlg,mic-amp-in-sel = "diff"; + + da7219_aad { + dlg,btn-cfg = <50>; + dlg,mic-det-thr = <500>; + dlg,jack-ins-deb = <20>; + dlg,jack-det-rate = "32ms_64ms"; + dlg,jack-rem-deb = <1>; + + dlg,a-d-btn-thr = <0xa>; + dlg,d-b-btn-thr = <0x16>; + dlg,b-c-btn-thr = <0x21>; + dlg,c-mic-btn-thr = <0x3E>; + + dlg,btn-avg = <4>; + dlg,adc-1bit-rpt = <1>; + }; + };
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 4/4 MAINTAINERS: da7219: Add entry to cover DA7219 bindings document
In reply to Adam ThomsonThis adds an entry to indicate the DA7219 bindings document (and other Dialog codecs bindings documents) are supported.
--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
@@ -3367,6 +3367,7 @@ M: Support Opensource <[email protected]> W: http://www.dialog-semiconductor.com/products S: Supported F: Documentation/hwmon/da90?? +F: Documentation/devicetree/bindings/sound/da[79]*.txt F: drivers/gpio/gpio-da90??.c F: drivers/hwmon/da90??-hwmon.c F: drivers/iio/adc/da91??-*.c
--
1.9.3