diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-02-15 16:01:28 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-02-15 16:01:49 +0300 |
| commit | 116ca499a136c3cabc89f0d6e3d86cd475b6f0ed (patch) | |
| tree | 2b0e12a6d07799ff9345c71c7d3c8433a7015d6d /arch/arm/boot/dts/da850-lcdk.dts | |
| parent | 791ff5a935ae66bd37195a58bf520ab97da90032 (diff) | |
| parent | 7dd2e8f8a5dc6266a4df4ed6f269ab7bacae596c (diff) | |
| download | linux-116ca499a136c3cabc89f0d6e3d86cd475b6f0ed.tar.xz | |
Merge tag 'davinci-for-v5.1/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into arm/dt
DaVinci device-tree updates for v5.1 contains a patch to enable analog
mic input on da850 LCDK board.
* tag 'davinci-for-v5.1/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: dts: da850-lcdk: Enable the analog mic input
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/da850-lcdk.dts')
| -rw-r--r-- | arch/arm/boot/dts/da850-lcdk.dts | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts index 3a2fa6e035a3..26f453dc8370 100644 --- a/arch/arm/boot/dts/da850-lcdk.dts +++ b/arch/arm/boot/dts/da850-lcdk.dts @@ -74,12 +74,16 @@ simple-audio-card,name = "DA850-OMAPL138 LCDK"; simple-audio-card,widgets = "Line", "Line In", - "Line", "Line Out"; + "Line", "Line Out", + "Microphone", "Mic Jack"; simple-audio-card,routing = "LINE1L", "Line In", "LINE1R", "Line In", "Line Out", "LLOUT", - "Line Out", "RLOUT"; + "Line Out", "RLOUT", + "MIC3L", "Mic Jack", + "MIC3R", "Mic Jack", + "Mic Jack", "Mic Bias"; simple-audio-card,format = "dsp_b"; simple-audio-card,bitclock-master = <&link0_codec>; simple-audio-card,frame-master = <&link0_codec>; @@ -250,6 +254,8 @@ #sound-dai-cells = <0>; compatible = "ti,tlv320aic3106"; reg = <0x18>; + adc-settle-ms = <40>; + ai3x-micbias-vg = <1>; /* 2.0V */ status = "okay"; /* Regulators */ |