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

diff --combined Documentation/devicetree/bindings/sound/adi,adau1977.txt
index 87c16e6f2e7c69caef9bbeb8f639a3092c72a267,11acd94b166538e62588dc06666a5b0158dea051..9225472c80b4c4f2c0b049c896b7f34d240cbfa4
--- 1/Documentation/devicetree/bindings/sound/adi,adau1977.txt
--- 2/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>;
  
-               reset_gpio = <&gpio 10 GPIO_ACTIVE_LOW>;
 +              adi,micbias = <3>;
+               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>;
        };