From: Mark Brown <broonie@kernel.org>
Date: Tue, 18 May 2021 16:24:52 +0000 (+0100)
Subject: Merge tag 'v5.13-rc2' into spi-5.13
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c37fe6aff89cb0d842993fe2f69e48bf3ebe0ab0;p=linux.git

Merge tag 'v5.13-rc2' into spi-5.13

Linux 5.13-rc2
---

c37fe6aff89cb0d842993fe2f69e48bf3ebe0ab0
diff --cc Documentation/devicetree/bindings/spi/spi-mux.yaml
index c2c007260582a,d09c6355e22dc..51c7622dc20b4
--- a/Documentation/devicetree/bindings/spi/spi-mux.yaml
+++ b/Documentation/devicetree/bindings/spi/spi-mux.yaml
@@@ -72,11 -72,9 +72,9 @@@ examples
  
              mux-controls = <&mux>;
  
 -            spi-flash@0 {
 +            flash@0 {
                  compatible = "jedec,spi-nor";
                  reg = <0>;
-                 #address-cells = <1>;
-                 #size-cells = <0>;
                  spi-max-frequency = <40000000>;
              };
  
diff --cc MAINTAINERS
index 528068e318450,008fcad7ac008..49245e9fcb69a
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -16954,12 -17304,13 +17304,19 @@@ L:	linux-i2c@vger.kernel.or
  S:	Maintained
  F:	drivers/i2c/busses/i2c-stm32*
  
 +ST STM32 SPI DRIVER
 +M:	Alain Volmat <alain.volmat@foss.st.com>
 +L:	linux-spi@vger.kernel.org
 +S:	Maintained
 +F:	drivers/spi/spi-stm32.c
 +
+ ST STPDDC60 DRIVER
+ M:	Daniel Nilsson <daniel.nilsson@flex.com>
+ L:	linux-hwmon@vger.kernel.org
+ S:	Maintained
+ F:	Documentation/hwmon/stpddc60.rst
+ F:	drivers/hwmon/pmbus/stpddc60.c
+ 
  ST VL53L0X ToF RANGER(I2C) IIO DRIVER
  M:	Song Qiang <songqiang1304521@gmail.com>
  L:	linux-iio@vger.kernel.org