Merge tag 'ib-mfd-extcon-hid-i2c-iio-input-media-chrome-power-pwm-rtc-sound-v5.4...

Immutable branch between MFD, Extcon, HID, I2C, IIO, Input, Chrome, Power,
PWM, RTC and Sound to allow picking patches that depends on the series
that moves some code from the MFD subsystem to platform/chrome.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>

diff --combined drivers/platform/chrome/cros_ec_rpmsg.c
index 6f34fe629e2ce4564a7403e469cac9ba9f72a241,9633e54176864fbdae66d0f2fa4510db1214a54c..8b6bd775cc9a2208e5b0729e373b9c89a1232eb6
--- 1/drivers/platform/chrome/cros_ec_rpmsg.c
--- 2/drivers/platform/chrome/cros_ec_rpmsg.c
+++ b/drivers/platform/chrome/cros_ec_rpmsg.c
@@@ -6,9 -6,9 +6,9 @@@
  #include <linux/delay.h>
  #include <linux/kernel.h>
  #include <linux/module.h>
- #include <linux/mfd/cros_ec.h>
- #include <linux/mfd/cros_ec_commands.h>
  #include <linux/of.h>
+ #include <linux/platform_data/cros_ec_commands.h>
+ #include <linux/platform_data/cros_ec_proto.h>
  #include <linux/platform_device.h>
  #include <linux/rpmsg.h>
  #include <linux/slab.h>
@@@ -233,28 -233,11 +233,30 @@@ static void cros_ec_rpmsg_remove(struc
        struct cros_ec_device *ec_dev = dev_get_drvdata(&rpdev->dev);
        struct cros_ec_rpmsg *ec_rpmsg = ec_dev->priv;
  
+       cros_ec_unregister(ec_dev);
+ 
        cancel_work_sync(&ec_rpmsg->host_event_work);
  }
  
 +#ifdef CONFIG_PM_SLEEP
 +static int cros_ec_rpmsg_suspend(struct device *dev)
 +{
 +      struct cros_ec_device *ec_dev = dev_get_drvdata(dev);
 +
 +      return cros_ec_suspend(ec_dev);
 +}
 +
 +static int cros_ec_rpmsg_resume(struct device *dev)
 +{
 +      struct cros_ec_device *ec_dev = dev_get_drvdata(dev);
 +
 +      return cros_ec_resume(ec_dev);
 +}
 +#endif
 +
 +static SIMPLE_DEV_PM_OPS(cros_ec_rpmsg_pm_ops, cros_ec_rpmsg_suspend,
 +                       cros_ec_rpmsg_resume);
 +
  static const struct of_device_id cros_ec_rpmsg_of_match[] = {
        { .compatible = "google,cros-ec-rpmsg", },
        { }
@@@ -265,7 -248,6 +267,7 @@@ static struct rpmsg_driver cros_ec_driv
        .drv = {
                .name   = "cros-ec-rpmsg",
                .of_match_table = cros_ec_rpmsg_of_match,
 +              .pm     = &cros_ec_rpmsg_pm_ops,
        },
        .probe          = cros_ec_rpmsg_probe,
        .remove         = cros_ec_rpmsg_remove,