From: Mark Brown <broonie@kernel.org>
Date: Tue, 19 Feb 2019 15:52:41 +0000 (+0000)
Subject: Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v5.1-rc1~148^2~1^2^2~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19febab6da87995d1eb1a18d1fcbff50e278d7fa;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.1
---

19febab6da87995d1eb1a18d1fcbff50e278d7fa
diff --cc Documentation/devicetree/bindings/sound/adi,adau1977.txt
index 87c16e6f2e7c6,11acd94b16653..9225472c80b4c
--- a/Documentation/devicetree/bindings/sound/adi,adau1977.txt
+++ b/Documentation/devicetree/bindings/sound/adi,adau1977.txt
@@@ -46,8 -40,7 +46,8 @@@ Examples
  		AVDD-supply = <&regulator>;
  		DVDD-supply = <&regulator_digital>;
  
 +		adi,micbias = <3>;
- 		reset_gpio = <&gpio 10 GPIO_ACTIVE_LOW>;
+ 		reset-gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
  	};
  
  	adau1977_i2c: adau1977@11 {