Merge tag 'mfd-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

Pull MFD updates from Lee Jones:
 "Core framework:
   - Add the MFD bindings doc to MAINTAINERS

  New drivers:
   - X-Powers AC100 Audio CODEC and RTC
   - TI LP873x PMIC
   - Rockchip RK808 PMIC
   - Samsung Exynos Low Power Audio

  New device support:
   - Add support for STMPE1600 variant to stmpe
   - Add support for PM8018 PMIC to pm8921-core
   - Add support for AXP806 PMIC in axp20x
   - Add support for AXP209 GPIO in axp20x

  New functionality:
   - Add support for Reset to all STMPE variants
   - Add support for MKBP event support to cros_ec
   - Add support for USB to intel_soc_pmic_bxtwc
   - Add support for IRQs and Power Button to tps65217

  Fix-ups:
   - Clean-up defunct author emails (da9063, max14577)
   - Kconfig fixups (wm8350-i2c, as37220
   - Constify (altera-a10sr, sm501)
   - Supply PCI IDs (intel-lpss-pci)
   - Improve clocking (qcom_rpm)
   - Fix IRQ probing (ucb1x00-core)
   - Ensure fault log is cleared (da9052)
   - Remove NO_IRQ check (ucb1x00-core)
   - Supply I2C properties (intel-lpss-acpi, intel-lpss-pci)
   - Non standard declaration (tps65217, max8997-irq)
   - Remove unused code (lp873x, db8500-prcmu, ab8500-debugfs,
     cros_ec_spi)
   - Make non-modular (altera-a10sr, intel_msic, smsc-ece1099,
     sun6i-prcm, twl-core)
   - OF bindings (ac100, stmpe, qcom-pm8xxx, qcom-rpm, rk808, axp20x,
     lp873x, exynos5433-lpass, act8945a, aspeed-scu, twl6040, arizona)

  Bugfixes:
   - Release OF pointer (qcom_rpm)
   - Avoid double shifting in suspend/resume (88pm80x)
   - Fix 'defined but not used' error (exynos-lpass)
   - Fix 'sleeping whilst attomic' (atmel-hlcdc)"

* tag 'mfd-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (69 commits)
  mfd: arizona: Handle probe deferral for reset GPIO
  mfd: arizona: Remove arizona_of_get_named_gpio helper function
  mfd: arizona: Add DT options for max_channels_clocked and PDM speaker config
  mfd: twl6040: Register child device for twl6040-pdmclk
  mfd: cros_ec_spi: Remove unused variable 'request'
  mfd: omap-usb-host: Return value is not 'const int'
  mfd: ab8500-debugfs: Remove 'weak' function suspend_test_wake_cause_interrupt_is_mine()
  mfd: ab8500-debugfs: Remove ab8500_dump_all_banks_to_mem()
  mfd: db8500-prcmu: Remove unused *prcmu_set_ddr_opp() calls
  mfd: ab8500-debugfs: Prevent initialised field from being over-written
  mfd: max8997-irq: 'inline' should be at the beginning of the declaration
  mfd: rk808: Fix RK818_IRQ_DISCHG_ILIM initializer
  mfd: tps65217: Fix nonstandard declaration
  mfd: lp873x: Remove unused mutex lock from struct lp873x
  mfd: atmel-hlcdc: Do not sleep in atomic context
  mfd: exynos-lpass: Mark PM functions as __maybe_unused
  mfd: intel-lpss: Add default I2C device properties for Apollo Lake
  mfd: twl-core: Make it explicitly non-modular
  mfd: sun6i-prcm: Make it explicitly non-modular
  mfd: smsc-ece1099: Make it explicitly non-modular
  ...

1 files changed, 92 insertions, 0 deletions

diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c
index 6c084b266651..04053fe1e980 100644
--- a/drivers/platform/chrome/cros_ec_proto.c
+++ b/drivers/platform/chrome/cros_ec_proto.c
@@ -19,6 +19,7 @@
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <asm/unaligned.h>
 
 #define EC_COMMAND_RETRIES      50
 
@@ -234,11 +235,44 @@ static int cros_ec_host_command_proto_query_v2(struct cros_ec_device *ec_dev)
         return ret;
 }
 
+static int cros_ec_get_host_command_version_mask(struct cros_ec_device *ec_dev,
+        u16 cmd, u32 *mask)
+{
+        struct ec_params_get_cmd_versions *pver;
+        struct ec_response_get_cmd_versions *rver;
+        struct cros_ec_command *msg;
+        int ret;
+
+        msg = kmalloc(sizeof(*msg) + max(sizeof(*rver), sizeof(*pver)),
+                      GFP_KERNEL);
+        if (!msg)
+                return -ENOMEM;
+
+        msg->version = 0;
+        msg->command = EC_CMD_GET_CMD_VERSIONS;
+        msg->insize = sizeof(*rver);
+        msg->outsize = sizeof(*pver);
+
+        pver = (struct ec_params_get_cmd_versions *)msg->data;
+        pver->cmd = cmd;
+
+        ret = cros_ec_cmd_xfer(ec_dev, msg);
+        if (ret > 0) {
+                rver = (struct ec_response_get_cmd_versions *)msg->data;
+                *mask = rver->version_mask;
+        }
+
+        kfree(msg);
+
+        return ret;
+}
+
 int cros_ec_query_all(struct cros_ec_device *ec_dev)
 {
         struct device *dev = ec_dev->dev;
         struct cros_ec_command *proto_msg;
         struct ec_response_get_protocol_info *proto_info;
+        u32 ver_mask = 0;
         int ret;
 
         proto_msg = kzalloc(sizeof(*proto_msg) + sizeof(*proto_info),
@@ -328,6 +362,15 @@ int cros_ec_query_all(struct cros_ec_device *ec_dev)
                 goto exit;
         }
 
+        /* Probe if MKBP event is supported */
+        ret = cros_ec_get_host_command_version_mask(ec_dev,
+                                                    EC_CMD_GET_NEXT_EVENT,
+                                                    &ver_mask);
+        if (ret < 0 || ver_mask == 0)
+                ec_dev->mkbp_event_supported = 0;
+        else
+                ec_dev->mkbp_event_supported = 1;
+
 exit:
         kfree(proto_msg);
         return ret;
@@ -397,3 +440,52 @@ int cros_ec_cmd_xfer_status(struct cros_ec_device *ec_dev,
         return ret;
 }
 EXPORT_SYMBOL(cros_ec_cmd_xfer_status);
+
+static int get_next_event(struct cros_ec_device *ec_dev)
+{
+        u8 buffer[sizeof(struct cros_ec_command) + sizeof(ec_dev->event_data)];
+        struct cros_ec_command *msg = (struct cros_ec_command *)&buffer;
+        int ret;
+
+        msg->version = 0;
+        msg->command = EC_CMD_GET_NEXT_EVENT;
+        msg->insize = sizeof(ec_dev->event_data);
+        msg->outsize = 0;
+
+        ret = cros_ec_cmd_xfer(ec_dev, msg);
+        if (ret > 0) {
+                ec_dev->event_size = ret - 1;
+                memcpy(&ec_dev->event_data, msg->data,
+                       sizeof(ec_dev->event_data));
+        }
+
+        return ret;
+}
+
+static int get_keyboard_state_event(struct cros_ec_device *ec_dev)
+{
+        u8 buffer[sizeof(struct cros_ec_command) +
+                  sizeof(ec_dev->event_data.data)];
+        struct cros_ec_command *msg = (struct cros_ec_command *)&buffer;
+
+        msg->version = 0;
+        msg->command = EC_CMD_MKBP_STATE;
+        msg->insize = sizeof(ec_dev->event_data.data);
+        msg->outsize = 0;
+
+        ec_dev->event_size = cros_ec_cmd_xfer(ec_dev, msg);
+        ec_dev->event_data.event_type = EC_MKBP_EVENT_KEY_MATRIX;
+        memcpy(&ec_dev->event_data.data, msg->data,
+               sizeof(ec_dev->event_data.data));
+
+        return ec_dev->event_size;
+}
+
+int cros_ec_get_next_event(struct cros_ec_device *ec_dev)
+{
+        if (ec_dev->mkbp_event_supported)
+                return get_next_event(ec_dev);
+        else
+                return get_keyboard_state_event(ec_dev);
+}
+EXPORT_SYMBOL(cros_ec_get_next_event);