Merge tag 'mfd-next-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

Pull MFD updates from Lee Jones:
 "Core Framework:
   - Document (kerneldoc) core mfd_add_devices() API

  New Drivers:
   - Altera SOCFPGA System Manager
   - Maxim MAX77650/77651 PMIC
   - Maxim MAX77663 PMIC
   - ST Multi-Function eXpander (STMFX)

  New Device Support:
   - LEDs support in Intel Cherry Trail Whiskey Cove PMIC
   - RTC support in SAMSUNG Electronics S2MPA01 PMIC
   - SAM9X60 support in Atmel HLCDC (High-end LCD Controller)
   - USB X-Powers AXP 8xx PMICs
   - Integrated Sensor Hub (ISH) in ChromeOS EC
   - USB PD Logger in ChromeOS EC
   - AXP223 in X-Powers AXP series PMICs
   - Power Supply in X-Powers AXP 803 PMICs
   - Comet Lake in Intel Low Power Subsystem
   - Fingerprint MCU in ChromeOS EC
   - Touchpad MCU in ChromeOS EC
   - Move TI LM3532 support to LED

  New Functionality:
   - max77650, max77620: Add/extend DT support
   - max77620 power-off
   - syscon clocking
   - croc_ec host sleep event

  Fix-ups:
   - Trivial; Formatting, spelling, etc; Kconfig, sec-core, ab8500-debugfs
   - Remove unused functionality; rk808, da9063-*
   - SPDX conversion; da9063-*, atmel-*,
   - Adapt/add new register definitions; cs47l35-tables, cs47l90-tables, imx6q-iomuxc-gpr
   - Fix-up DT bindings; ti-lmu, cirrus,lochnagar
   - Simply obtaining driver data; ssbi, t7l66xb, tc6387xb, tc6393xb

  Bug Fixes:
   - Fix incorrect defined values; max77620, da9063
   - Fix device initialisation; twl6040
   - Reset device on init; intel-lpss
   - Fix build warnings when !OF; sun6i-prcm
   - Register OF match tables; tps65912-spi
   - Fix DMI matching; intel_quark_i2c_gpio"

* tag 'mfd-next-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (65 commits)
  mfd: Use dev_get_drvdata() directly
  mfd: cros_ec: Instantiate properly CrOS Touchpad MCU device
  mfd: cros_ec: Instantiate properly CrOS FP MCU device
  mfd: cros_ec: Update the EC feature codes
  mfd: intel-lpss: Add Intel Comet Lake PCI IDs
  mfd: lochnagar: Add links to binding docs for sound and hwmon
  mfd: ab8500-debugfs: Fix a typo ("deubgfs")
  mfd: imx6sx: Add MQS register definition for iomuxc gpr
  dt-bindings: mfd: LMU: Fix lm3632 dt binding example
  mfd: intel_quark_i2c_gpio: Adjust IOT2000 matching
  mfd: da9063: Fix OTP control register names to match datasheets for DA9063/63L
  mfd: tps65912-spi: Add missing of table registration
  mfd: axp20x: Add USB power supply mfd cell to AXP803
  mfd: sun6i-prcm: Fix build warning for non-OF configurations
  mfd: intel-lpss: Set the device in reset state when init
  platform/chrome: Add support for v1 of host sleep event
  mfd: cros_ec: Add host_sleep_event_v1 command
  mfd: cros_ec: Instantiate the CrOS USB PD logger driver
  mfd: cs47l90: Make DAC_AEC_CONTROL_2 readable
  mfd: cs47l35: Make DAC_AEC_CONTROL_2 readable
  ...

3 files changed, 131 insertions, 0 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 6dfe9e2fe5b1..54d36f98b426 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -190,6 +190,15 @@ config INPUT_M68K_BEEP
         tristate "M68k Beeper support"
         depends on M68K
 
+config INPUT_MAX77650_ONKEY
+        tristate "Maxim MAX77650 ONKEY support"
+        depends on MFD_MAX77650
+        help
+          Support the ONKEY of the MAX77650 PMIC as an input device.
+
+          To compile this driver as a module, choose M here: the module
+          will be called max77650-onkey.
+
 config INPUT_MAX77693_HAPTIC
         tristate "MAXIM MAX77693/MAX77843 haptic controller support"
         depends on (MFD_MAX77693 || MFD_MAX77843) && PWM
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index f38ebbdb05e2..8fd187f314bd 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -44,6 +44,7 @@ obj-$(CONFIG_INPUT_IXP4XX_BEEPER)	+= ixp4xx-beeper.o
 obj-$(CONFIG_INPUT_KEYSPAN_REMOTE)      += keyspan_remote.o
 obj-$(CONFIG_INPUT_KXTJ9)               += kxtj9.o
 obj-$(CONFIG_INPUT_M68K_BEEP)           += m68kspkr.o
+obj-$(CONFIG_INPUT_MAX77650_ONKEY)      += max77650-onkey.o
 obj-$(CONFIG_INPUT_MAX77693_HAPTIC)     += max77693-haptic.o
 obj-$(CONFIG_INPUT_MAX8925_ONKEY)       += max8925_onkey.o
 obj-$(CONFIG_INPUT_MAX8997_HAPTIC)      += max8997_haptic.o
diff --git a/drivers/input/misc/max77650-onkey.c b/drivers/input/misc/max77650-onkey.c
new file mode 100644
index 000000000000..fbf6caab7217
--- /dev/null
+++ b/drivers/input/misc/max77650-onkey.c
@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (C) 2018 BayLibre SAS
+// Author: Bartosz Golaszewski <bgolaszewski@baylibre.com>
+//
+// ONKEY driver for MAXIM 77650/77651 charger/power-supply.
+
+#include <linux/i2c.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/max77650.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+
+#define MAX77650_ONKEY_MODE_MASK        BIT(3)
+#define MAX77650_ONKEY_MODE_PUSH        0x00
+#define MAX77650_ONKEY_MODE_SLIDE       BIT(3)
+
+struct max77650_onkey {
+        struct input_dev *input;
+        unsigned int code;
+};
+
+static irqreturn_t max77650_onkey_falling(int irq, void *data)
+{
+        struct max77650_onkey *onkey = data;
+
+        input_report_key(onkey->input, onkey->code, 0);
+        input_sync(onkey->input);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t max77650_onkey_rising(int irq, void *data)
+{
+        struct max77650_onkey *onkey = data;
+
+        input_report_key(onkey->input, onkey->code, 1);
+        input_sync(onkey->input);
+
+        return IRQ_HANDLED;
+}
+
+static int max77650_onkey_probe(struct platform_device *pdev)
+{
+        int irq_r, irq_f, error, mode;
+        struct max77650_onkey *onkey;
+        struct device *dev, *parent;
+        struct regmap *map;
+        unsigned int type;
+
+        dev = &pdev->dev;
+        parent = dev->parent;
+
+        map = dev_get_regmap(parent, NULL);
+        if (!map)
+                return -ENODEV;
+
+        onkey = devm_kzalloc(dev, sizeof(*onkey), GFP_KERNEL);
+        if (!onkey)
+                return -ENOMEM;
+
+        error = device_property_read_u32(dev, "linux,code", &onkey->code);
+        if (error)
+                onkey->code = KEY_POWER;
+
+        if (device_property_read_bool(dev, "maxim,onkey-slide")) {
+                mode = MAX77650_ONKEY_MODE_SLIDE;
+                type = EV_SW;
+        } else {
+                mode = MAX77650_ONKEY_MODE_PUSH;
+                type = EV_KEY;
+        }
+
+        error = regmap_update_bits(map, MAX77650_REG_CNFG_GLBL,
+                                   MAX77650_ONKEY_MODE_MASK, mode);
+        if (error)
+                return error;
+
+        irq_f = platform_get_irq_byname(pdev, "nEN_F");
+        if (irq_f < 0)
+                return irq_f;
+
+        irq_r = platform_get_irq_byname(pdev, "nEN_R");
+        if (irq_r < 0)
+                return irq_r;
+
+        onkey->input = devm_input_allocate_device(dev);
+        if (!onkey->input)
+                return -ENOMEM;
+
+        onkey->input->name = "max77650_onkey";
+        onkey->input->phys = "max77650_onkey/input0";
+        onkey->input->id.bustype = BUS_I2C;
+        input_set_capability(onkey->input, type, onkey->code);
+
+        error = devm_request_any_context_irq(dev, irq_f, max77650_onkey_falling,
+                                             IRQF_ONESHOT, "onkey-down", onkey);
+        if (error < 0)
+                return error;
+
+        error = devm_request_any_context_irq(dev, irq_r, max77650_onkey_rising,
+                                             IRQF_ONESHOT, "onkey-up", onkey);
+        if (error < 0)
+                return error;
+
+        return input_register_device(onkey->input);
+}
+
+static struct platform_driver max77650_onkey_driver = {
+        .driver = {
+                .name = "max77650-onkey",
+        },
+        .probe = max77650_onkey_probe,
+};
+module_platform_driver(max77650_onkey_driver);
+
+MODULE_DESCRIPTION("MAXIM 77650/77651 ONKEY driver");
+MODULE_AUTHOR("Bartosz Golaszewski <bgolaszewski@baylibre.com>");
+MODULE_LICENSE("GPL v2");