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

Linux 5.13-rc2

diff --cc Documentation/devicetree/bindings/spi/spi-mux.yaml
index c2c007260582a1aae03e51b41d27f5f2b3e9987a,d09c6355e22dcecffcbf874cd78fe32432cb3583..51c7622dc20b41675d1138c77aa1c3297e3f7a9d
--- 1/Documentation/devicetree/bindings/spi/spi-mux.yaml
--- 2/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 528068e3184508dc35d051896f18cf5f7cadbc27,008fcad7ac00814a5156e1623dcf6790296ad260..49245e9fcb69a441cf363f7802f7dc3a2bd9784d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -16954,12 -17304,13 +17304,19 @@@ L:        [email protected]
  S:    Maintained
  F:    drivers/i2c/busses/i2c-stm32*
  
 +ST STM32 SPI DRIVER
 +M:    Alain Volmat <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/spi/spi-stm32.c
 +
+ ST STPDDC60 DRIVER
+ M:    Daniel Nilsson <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/hwmon/stpddc60.rst
+ F:    drivers/hwmon/pmbus/stpddc60.c
+ 
  ST VL53L0X ToF RANGER(I2C) IIO DRIVER
  M:    Song Qiang <[email protected]>
  L:    [email protected]