Merge tag 'davinci-for-v5.1/dt' of... (116ca499) · Commits · 戴 / test

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:

arch/arm/boot/dts/da850-lcdk.dts

+8 −2

Original line number	Diff line number	Diff line
		@@ -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 */