Merge tag 'ib-mfd-watchdog-v5.13' into ibs-for-mfd-merged

Immutable branch between MFD and Watchdog due for the v5.13 merge window

diff --cc MAINTAINERS
index 0386d7f9bc1325eaa97d113e024d6b123619223f,10d5f706c8b1f1de00545bc81131c9138f7c01fe..d45380362cf45a5e27b03328741d4b33ce4df005
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -15478,18 -15456,20 +15478,22 @@@ F:        drivers/gpio/gpio-bd71828.
  F:    drivers/mfd/rohm-bd70528.c
  F:    drivers/mfd/rohm-bd71828.c
  F:    drivers/mfd/rohm-bd718x7.c
+ F:    drivers/mfd/rohm-bd9576.c
  F:    drivers/power/supply/bd70528-charger.c
  F:    drivers/regulator/bd70528-regulator.c
 +F:    drivers/regulator/bd71815-regulator.c
  F:    drivers/regulator/bd71828-regulator.c
  F:    drivers/regulator/bd718x7-regulator.c
+ F:    drivers/regulator/bd9576-regulator.c
  F:    drivers/regulator/rohm-regulator.c
  F:    drivers/rtc/rtc-bd70528.c
  F:    drivers/watchdog/bd70528_wdt.c
+ F:    drivers/watchdog/bd9576_wdt.c
  F:    include/linux/mfd/rohm-bd70528.h
 +F:    include/linux/mfd/rohm-bd71815.h
  F:    include/linux/mfd/rohm-bd71828.h
  F:    include/linux/mfd/rohm-bd718x7.h
+ F:    include/linux/mfd/rohm-bd957x.h
  F:    include/linux/mfd/rohm-generic.h
  F:    include/linux/mfd/rohm-shared.h
  

diff --cc drivers/mfd/Kconfig
index 7605bed6914edbfdc9a053b769b18128c69719ba,f0c9529e7bfd55064a7bd8ea278bc1563e92af99..6e31210915c7e62252cbc3b61b8565089aab4710
--- 1/drivers/mfd/Kconfig
--- 2/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@@ -1993,14 -1982,24 +1993,25 @@@ config MFD_ROHM_BD7182
        select REGMAP_IRQ
        select MFD_CORE
        help
 -        Select this option to get support for the ROHM BD71828 Power
 -        Management IC. BD71828GW is a single-chip power management IC for
 -        battery-powered portable devices. The IC integrates 7 buck
 -        converters, 7 LDOs, and a 1500 mA single-cell linear charger.
 -        Also included is a Coulomb counter, a real-time clock (RTC), and
 -        a 32.768 kHz clock gate.
 +        Select this option to get support for the ROHM BD71828 and BD71815
 +        Power Management ICs. BD71828GW and BD71815AGW are single-chip power
 +        management ICs mainly for battery-powered portable devices.
 +        The BD71828 integrates 7 buck converters and 7 LDOs. The BD71815
 +        has 5 bucks, 7 LDOs, and a boost for driving LEDs. Both ICs provide
 +        also a single-cell linear charger, a Coulomb counter, a real-time
 +        clock (RTC), GPIOs and a 32.768 kHz clock gate.
  
+ config MFD_ROHM_BD957XMUF
+       tristate "ROHM BD9576MUF and BD9573MUF Power Management ICs"
+       depends on I2C=y
+       depends on OF
+       select REGMAP_I2C
+       select MFD_CORE
+       help
+         Select this option to get support for the ROHM BD9576MUF and
+         BD9573MUF Power Management ICs. BD9576 and BD9573 are primarily
+         designed to be used to power R-Car series processors.
+ 
  config MFD_STM32_LPTIMER
        tristate "Support for STM32 Low-Power Timer"
        depends on (ARCH_STM32 && OF) || COMPILE_TEST

diff --cc drivers/mfd/Makefile
Simple merge

diff --cc include/linux/mfd/rohm-generic.h
index a9144284cf6d30f2ce926f8d368264a5f06c1894,ac6787464004e33d8c72e5bc25a316c139981f1a..35b392a0d73a1482ac8129e1f99fb2718579c96d
--- 1/include/linux/mfd/rohm-generic.h
--- 2/include/linux/mfd/rohm-generic.h
+++ b/include/linux/mfd/rohm-generic.h
@@@ -8,13 -8,14 +8,15 @@@
  #include <linux/regulator/driver.h>
  
  enum rohm_chip_type {
 -      ROHM_CHIP_TYPE_BD71837 = 0,
 -      ROHM_CHIP_TYPE_BD71847,
 -      ROHM_CHIP_TYPE_BD70528,
 -      ROHM_CHIP_TYPE_BD71828,
        ROHM_CHIP_TYPE_BD9571,
++      ROHM_CHIP_TYPE_BD9573,
        ROHM_CHIP_TYPE_BD9574,
 -      ROHM_CHIP_TYPE_BD9573,
+       ROHM_CHIP_TYPE_BD9576,
 +      ROHM_CHIP_TYPE_BD70528,
 +      ROHM_CHIP_TYPE_BD71815,
 +      ROHM_CHIP_TYPE_BD71828,
 +      ROHM_CHIP_TYPE_BD71837,
 +      ROHM_CHIP_TYPE_BD71847,
        ROHM_CHIP_TYPE_AMOUNT
  };