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-rc5~20^2^2~83
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/19febab6da87995d1eb1a18d1fcbff50e278d7fa?hp=-c

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

19febab6da87995d1eb1a18d1fcbff50e278d7fa
diff --combined Documentation/devicetree/bindings/sound/adi,adau1977.txt
index 87c16e6f2e7c,11acd94b1665..9225472c80b4
--- a/Documentation/devicetree/bindings/sound/adi,adau1977.txt
+++ b/Documentation/devicetree/bindings/sound/adi,adau1977.txt
@@@ -17,18 -17,12 +17,18 @@@ Required properties
                  Documentation/devicetree/bindings/regulator/regulator.txt
  
  Optional properties:
-  - reset-gpio:  the reset pin for the chip, for more details consult
+  - reset-gpios: the reset pin for the chip, for more details consult
                  Documentation/devicetree/bindings/gpio/gpio.txt
  
   - DVDD-supply: supply voltage for the digital core, please consult
                  Documentation/devicetree/bindings/regulator/regulator.txt
  
 +- adi,micbias: configures the voltage setting for the MICBIAS pin.
 +		Select 0/1/2/3/4/5/6/7/8 to specify MICBIAS voltage
 +		5V/5.5V/6V/6.5V/7V/7.5V/8V/8.5V/9V
 +		If not specified the default value will be "7" meaning 8.5 Volts.
 +		This property is only valid for the ADAU1977
 +
  For required properties on SPI, please consult
  Documentation/devicetree/bindings/spi/spi-bus.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 {
@@@ -57,5 -50,5 +57,5 @@@
  		AVDD-supply = <&regulator>;
  		DVDD-supply = <&regulator_digital>;
  
- 		reset_gpio = <&gpio 10 GPIO_ACTIVE_LOW>;
+ 		reset-gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
  	};