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

diff --cc 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
@@@ -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 {