Merge tag 'ib-mfd-watchdog-v5.13' into ibs-for-mfd-merged
authorLee Jones <lee.jones@linaro.org>
Wed, 14 Apr 2021 15:01:10 +0000 (16:01 +0100)
committerLee Jones <lee.jones@linaro.org>
Wed, 14 Apr 2021 15:01:10 +0000 (16:01 +0100)
Immutable branch between MFD and Watchdog due for the v5.13 merge window

1  2 
MAINTAINERS
drivers/mfd/Kconfig
drivers/mfd/Makefile
include/linux/mfd/rohm-generic.h

diff --combined MAINTAINERS
@@@ -261,8 -261,8 +261,8 @@@ ABI/AP
  L:    linux-api@vger.kernel.org
  F:    include/linux/syscalls.h
  F:    kernel/sys_ni.c
 -F:    include/uapi/
 -F:    arch/*/include/uapi/
 +X:    include/uapi/
 +X:    arch/*/include/uapi/
  
  ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
@@@ -1181,7 -1181,7 +1181,7 @@@ M:      Joel Fernandes <joel@joelfernandes.o
  M:    Christian Brauner <christian@brauner.io>
  M:    Hridya Valsaraju <hridya@google.com>
  M:    Suren Baghdasaryan <surenb@google.com>
 -L:    devel@driverdev.osuosl.org
 +L:    linux-kernel@vger.kernel.org
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
  F:    drivers/android/
@@@ -2856,18 -2856,6 +2856,18 @@@ W:    http://www.openaoe.org
  F:    Documentation/admin-guide/aoe/
  F:    drivers/block/aoe/
  
 +ATC260X PMIC MFD DRIVER
 +M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 +M:    Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
 +L:    linux-actions@lists.infradead.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mfd/actions,atc260x.yaml
 +F:    drivers/input/misc/atc260x-onkey.c
 +F:    drivers/mfd/atc260*
 +F:    drivers/power/reset/atc260x-poweroff.c
 +F:    drivers/regulator/atc260x-regulator.c
 +F:    include/linux/mfd/atc260x/*
 +
  ATHEROS 71XX/9XXX GPIO DRIVER
  M:    Alban Bedel <albeu@free.fr>
  S:    Maintained
@@@ -5847,7 -5835,7 +5847,7 @@@ M:      David Airlie <airlied@linux.ie
  M:    Daniel Vetter <daniel@ffwll.ch>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
 -B:    https://bugs.freedesktop.org/
 +B:    https://gitlab.freedesktop.org/drm
  C:    irc://chat.freenode.net/dri-devel
  T:    git git://anongit.freedesktop.org/drm/drm
  F:    Documentation/devicetree/bindings/display/
@@@ -8128,6 -8116,7 +8128,6 @@@ F:      drivers/crypto/hisilicon/sec2/sec_ma
  
  HISILICON STAGING DRIVERS FOR HIKEY 960/970
  M:    Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
 -L:    devel@driverdev.osuosl.org
  S:    Maintained
  F:    drivers/staging/hikey9xx/
  
@@@ -10727,8 -10716,7 +10727,8 @@@ F:   drivers/net/ethernet/marvell/mvpp2
  
  MARVELL MWIFIEX WIRELESS DRIVER
  M:    Amitkumar Karwar <amitkarwar@gmail.com>
 -M:    Ganapathi Bhat <ganapathi.bhat@nxp.com>
 +M:    Ganapathi Bhat <ganapathi017@gmail.com>
 +M:    Sharvari Harisangam <sharvari.harisangam@nxp.com>
  M:    Xinming Hu <huxinming820@gmail.com>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
@@@ -12397,15 -12385,6 +12397,15 @@@ F: include/net/netrom.
  F:    include/uapi/linux/netrom.h
  F:    net/netrom/
  
 +NETRONIX EMBEDDED CONTROLLER
 +M:    Jonathan Neuschäfer <j.neuschaefer@gmx.net>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mfd/netronix,ntxec.yaml
 +F:    drivers/mfd/ntxec.c
 +F:    drivers/pwm/pwm-ntxec.c
 +F:    drivers/rtc/rtc-ntxec.c
 +F:    include/linux/mfd/ntxec.h
 +
  NETRONOME ETHERNET DRIVERS
  M:    Simon Horman <simon.horman@netronome.com>
  R:    Jakub Kicinski <kuba@kernel.org>
@@@ -15473,23 -15452,24 +15473,27 @@@ F:        Documentation/devicetree/bindings/mf
  F:    Documentation/devicetree/bindings/regulator/rohm,bd70528-regulator.txt
  F:    drivers/clk/clk-bd718x7.c
  F:    drivers/gpio/gpio-bd70528.c
 +F:    drivers/gpio/gpio-bd71815.c
  F:    drivers/gpio/gpio-bd71828.c
  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
  
@@@ -17063,7 -17043,7 +17067,7 @@@ F:   drivers/staging/vt665?
  
  STAGING SUBSYSTEM
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -L:    devel@driverdev.osuosl.org
 +L:    linux-staging@lists.linux.dev
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
  F:    drivers/staging/
@@@ -19158,7 -19138,7 +19162,7 @@@ VME SUBSYSTE
  M:    Martyn Welch <martyn@welchs.me.uk>
  M:    Manohar Vanga <manohar.vanga@gmail.com>
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -L:    devel@driverdev.osuosl.org
 +L:    linux-kernel@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
  F:    Documentation/driver-api/vme.rst
@@@ -19189,7 -19169,7 +19193,7 @@@ S:   Maintaine
  F:    drivers/infiniband/hw/vmw_pvrdma/
  
  VMware PVSCSI driver
 -M:    Jim Gill <jgill@vmware.com>
 +M:    Vishal Bhakta <vbhakta@vmware.com>
  M:    VMware PV-Drivers <pv-drivers@vmware.com>
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
@@@ -19402,6 -19382,7 +19406,6 @@@ F:   Documentation/devicetree/bindings/so
  F:    Documentation/hwmon/wm83??.rst
  F:    arch/arm/mach-s3c/mach-crag6410*
  F:    drivers/clk/clk-wm83*.c
 -F:    drivers/extcon/extcon-arizona.c
  F:    drivers/gpio/gpio-*wm*.c
  F:    drivers/gpio/gpio-arizona.c
  F:    drivers/hwmon/wm83??-hwmon.c
@@@ -19425,7 -19406,7 +19429,7 @@@ F:   include/linux/mfd/wm8400
  F:    include/linux/regulator/arizona*
  F:    include/linux/wm97xx.h
  F:    include/sound/wm????.h
 -F:    sound/soc/codecs/arizona.?
 +F:    sound/soc/codecs/arizona*
  F:    sound/soc/codecs/cs47l24*
  F:    sound/soc/codecs/wm*
  
diff --combined drivers/mfd/Kconfig
@@@ -967,17 -967,6 +967,17 @@@ config MFD_VIPERBOAR
          You need to select the mfd cell drivers separately.
          The drivers do not support all features the board exposes.
  
 +config MFD_NTXEC
 +      tristate "Netronix embedded controller (EC)"
 +      depends on OF || COMPILE_TEST
 +      depends on I2C
 +      select REGMAP_I2C
 +      select MFD_CORE
 +      help
 +        Say yes here if you want to support the embedded controller found in
 +        certain e-book readers designed by the original design manufacturer
 +        Netronix.
 +
  config MFD_RETU
        tristate "Nokia Retu and Tahvo multi-function device"
        select MFD_CORE
@@@ -1986,21 -1975,31 +1986,32 @@@ config MFD_ROHM_BD7052
          charger.
  
  config MFD_ROHM_BD71828
 -      tristate "ROHM BD71828 Power Management IC"
 +      tristate "ROHM BD71828 and BD71815 Power Management IC"
        depends on I2C=y
        depends on OF
        select REGMAP_I2C
        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
@@@ -2067,24 -2066,6 +2078,24 @@@ config MFD_WCD934
          This driver provides common support WCD934x audio codec and its
          associated Pin Controller, Soundwire Controller and Audio codec.
  
 +config MFD_ATC260X
 +      tristate
 +      select MFD_CORE
 +      select REGMAP
 +      select REGMAP_IRQ
 +
 +config MFD_ATC260X_I2C
 +      tristate "Actions Semi ATC260x PMICs with I2C"
 +      select MFD_ATC260X
 +      select REGMAP_I2C
 +      depends on I2C
 +      help
 +        Support for the Actions Semi ATC260x PMICs controlled via I2C.
 +
 +        This driver provides common support for accessing the ATC2603C
 +        and ATC2609A chip variants, additional drivers must be enabled
 +        in order to use the functionality of the device.
 +
  config MFD_KHADAS_MCU
        tristate "Support for Khadas System control Microcontroller"
        depends on I2C
diff --combined drivers/mfd/Makefile
@@@ -218,7 -218,6 +218,7 @@@ obj-$(CONFIG_MFD_INTEL_PMC_BXT)    += inte
  obj-$(CONFIG_MFD_INTEL_PMT)   += intel_pmt.o
  obj-$(CONFIG_MFD_PALMAS)      += palmas.o
  obj-$(CONFIG_MFD_VIPERBOARD)    += viperboard.o
 +obj-$(CONFIG_MFD_NTXEC)               += ntxec.o
  obj-$(CONFIG_MFD_RC5T583)     += rc5t583.o rc5t583-irq.o
  obj-$(CONFIG_MFD_RK808)               += rk808.o
  obj-$(CONFIG_MFD_RN5T618)     += rn5t618.o
@@@ -262,6 -261,7 +262,7 @@@ obj-$(CONFIG_RAVE_SP_CORE) += rave-sp.
  obj-$(CONFIG_MFD_ROHM_BD70528)        += rohm-bd70528.o
  obj-$(CONFIG_MFD_ROHM_BD71828)        += rohm-bd71828.o
  obj-$(CONFIG_MFD_ROHM_BD718XX)        += rohm-bd718x7.o
+ obj-$(CONFIG_MFD_ROHM_BD957XMUF)      += rohm-bd9576.o
  obj-$(CONFIG_MFD_STMFX)       += stmfx.o
  obj-$(CONFIG_MFD_KHADAS_MCU)  += khadas-mcu.o
  obj-$(CONFIG_MFD_ACER_A500_EC)        += acer-ec-a500.o
  obj-$(CONFIG_SGI_MFD_IOC3)    += ioc3.o
  obj-$(CONFIG_MFD_SIMPLE_MFD_I2C)      += simple-mfd-i2c.o
  obj-$(CONFIG_MFD_INTEL_M10_BMC)   += intel-m10-bmc.o
 +
 +obj-$(CONFIG_MFD_ATC260X)     += atc260x-core.o
 +obj-$(CONFIG_MFD_ATC260X_I2C) += atc260x-i2c.o
@@@ -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
  };
  
@@@ -27,8 -28,7 +29,8 @@@ struct rohm_regmap_dev 
  #define ROHM_DVS_LEVEL_IDLE           BIT(1)
  #define ROHM_DVS_LEVEL_SUSPEND                BIT(2)
  #define ROHM_DVS_LEVEL_LPSR           BIT(3)
 -#define ROHM_DVS_LEVEL_VALID_AMOUNT   4
 +#define ROHM_DVS_LEVEL_SNVS           BIT(4)
 +#define ROHM_DVS_LEVEL_VALID_AMOUNT   5
  #define ROHM_DVS_LEVEL_UNKNOWN                0
  
  /**
@@@ -67,9 -67,6 +69,9 @@@ struct rohm_dvs_config 
        unsigned int lpsr_reg;
        unsigned int lpsr_mask;
        unsigned int lpsr_on_mask;
 +      unsigned int snvs_reg;
 +      unsigned int snvs_mask;
 +      unsigned int snvs_on_mask;
  };
  
  #if IS_ENABLED(CONFIG_REGULATOR_ROHM)