From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 15 Feb 2019 13:01:28 +0000 (+0100)
Subject: Merge tag 'davinci-for-v5.1/dt' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.4-rc1~1522^2~50
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=116ca499a136c3cabc89f0d6e3d86cd475b6f0ed;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'davinci-for-v5.1/dt' of git://git./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>
---

116ca499a136c3cabc89f0d6e3d86cd475b6f0ed
diff --cc arch/arm/boot/dts/da850-lcdk.dts
index 3a2fa6e,320ae9d..26f453d
--- a/arch/arm/boot/dts/da850-lcdk.dts
+++ b/arch/arm/boot/dts/da850-lcdk.dts
@@@ -39,42 -39,13 +39,43 @@@
  		};
  	};
  
 +	vcc_5vd: fixedregulator-vcc_5vd {
 +		compatible = "regulator-fixed";
 +		regulator-name = "vcc_5vd";
 +		regulator-min-microvolt = <5000000>;
 +		regulator-max-microvolt = <5000000>;
 +		regulator-boot-on;
 +	};
 +
 +	vcc_3v3d: fixedregulator-vcc_3v3d {
 +		/* TPS650250 - VDCDC1 */
 +		compatible = "regulator-fixed";
 +		regulator-name = "vcc_3v3d";
 +		regulator-min-microvolt = <3300000>;
 +		regulator-max-microvolt = <3300000>;
 +		vin-supply = <&vcc_5vd>;
 +		regulator-always-on;
 +		regulator-boot-on;
 +	};
 +
 +	vcc_1v8d: fixedregulator-vcc_1v8d {
 +		/* TPS650250 - VDCDC2 */
 +		compatible = "regulator-fixed";
 +		regulator-name = "vcc_1v8d";
 +		regulator-min-microvolt = <1800000>;
 +		regulator-max-microvolt = <1800000>;
 +		vin-supply = <&vcc_5vd>;
 +		regulator-always-on;
 +		regulator-boot-on;
 +	};
 +
  	sound {
  		compatible = "simple-audio-card";
 -		simple-audio-card,name = "DA850/OMAP-L138 LCDK";
 +		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",
@@@ -250,13 -224,9 +254,15 @@@
  		#sound-dai-cells = <0>;
  		compatible = "ti,tlv320aic3106";
  		reg = <0x18>;
+ 		adc-settle-ms = <40>;
+ 		ai3x-micbias-vg = <1>;		/* 2.0V */
  		status = "okay";
 +
 +		/* Regulators */
 +		IOVDD-supply = <&vcc_3v3d>;
 +		AVDD-supply = <&vcc_3v3d>;
 +		DRVDD-supply = <&vcc_3v3d>;
 +		DVDD-supply = <&vcc_1v8d>;
  	};
  };