Merge branches 'ib-mfd-4.19', 'ib-mfd-gpio-pinctrl-4.19', 'ib-mfd-i915-media-platform...

Immutable branch (mfd, chrome) due for the v4.19 window

Immutable Branch which moves the cros_ec_i2c and cros_ec_spi
transport drivers from mfd to platform/chrome. Changes in arm are a simple
rename in defconfigs. Change in input is a rename in help text.

diff --cc MAINTAINERS
index 9d5eeff,fecfbd9,9d5eeff,9d5eeff,07d1576..2c1c6ae
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@ -4360,12 -4344,11 -4360,12 -4360,12 -4364,7 +4380,7 @@@@@@ L:    iommu@lists.linux-foundation.or
     T: git git://git.infradead.org/users/hch/dma-mapping.git
     W: http://git.infradead.org/users/hch/dma-mapping.git
     S: Supported
---- F: lib/dma-debug.c
---- F: lib/dma-direct.c
- -- F: lib/dma-noncoherent.c
---- F: lib/dma-virt.c
---- F: drivers/base/dma-mapping.c
---- F: drivers/base/dma-coherent.c
++++ F: kernel/dma/
     F: include/asm-generic/dma-mapping.h
     F: include/linux/dma-direct.h
     F: include/linux/dma-mapping.h
@@@@@@ -11800,17 -11670,10 -11800,17 -11800,17 -11814,17 +11830,17 @@@@@@ F:    Documentation/devicetree/bindings/me
     F: Documentation/media/v4l-drivers/qcom_camss.rst
     F: drivers/media/platform/qcom/camss-8x16/
     
 +   QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
 +   M:  Ilia Lin <ilia.lin@gmail.com>
 +   L:  linux-pm@vger.kernel.org
 +   S:  Maintained
 +   F:  Documentation/devicetree/bindings/opp/kryo-cpufreq.txt
 +   F:  drivers/cpufreq/qcom-cpufreq-kryo.c
 +   
     QUALCOMM EMAC GIGABIT ETHERNET DRIVER
---- M: Timur Tabi <timur@codeaurora.org>
++++ M: Timur Tabi <timur@kernel.org>
     L: netdev@vger.kernel.org
---- S: Supported
++++ S: Maintained
     F: drivers/net/ethernet/qualcomm/emac/
     
     QUALCOMM HEXAGON ARCHITECTURE

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpu/drm/i915/intel_hdmi.c
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/mfd/Makefile
index e9fd20d,4d0dfd0,e9fd20d,e9fd20d,d13e859..2852a60
--- 1/drivers/mfd/Makefile
--- 2/drivers/mfd/Makefile
--- 3/drivers/mfd/Makefile
--- 4/drivers/mfd/Makefile
--- 5/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@@@@@ -13,9 -13,10 -13,9 -13,9 -13,7 +13,7 @@@@@@ obj-$(CONFIG_MFD_ASIC3)              += asic3.o tmi
     obj-$(CONFIG_MFD_BCM590XX) += bcm590xx.o
     obj-$(CONFIG_MFD_BD9571MWV)        += bd9571mwv.o
     cros_ec_core-objs          := cros_ec.o
 -   cros_ec_core-$(CONFIG_ACPI)        += cros_ec_acpi_gpe.o
     obj-$(CONFIG_MFD_CROS_EC)  += cros_ec_core.o
---- obj-$(CONFIG_MFD_CROS_EC_I2C)      += cros_ec_i2c.o
---- obj-$(CONFIG_MFD_CROS_EC_SPI)      += cros_ec_spi.o
     obj-$(CONFIG_MFD_CROS_EC_CHARDEV) += cros_ec_dev.o
     obj-$(CONFIG_MFD_EXYNOS_LPASS)     += exynos-lpass.o
     

diff --cc drivers/mfd/cros_ec_dev.c
index 1dd0033,eafd06f,1e2049f,306e1fd,306e1fd..5502bcc
--- 1/drivers/mfd/cros_ec_dev.c
--- 2/drivers/mfd/cros_ec_dev.c
--- 3/drivers/mfd/cros_ec_dev.c
--- 4/drivers/mfd/cros_ec_dev.c
--- 5/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@@@@@ -377,14 -383,6 -377,14 -377,10 -377,10 +377,18 @@@@@@ error
        kfree(msg);
     }
     
++ ++static const struct mfd_cell cros_ec_cec_cells[] = {
++ ++   { .name = "cros-ec-cec" }
++ ++};
++ ++
 +   static const struct mfd_cell cros_ec_rtc_cells[] = {
 +      { .name = "cros-ec-rtc" }
 +   };
 +   
 ++++static const struct mfd_cell cros_usbpd_charger_cells[] = {
 ++++   { .name = "cros-usbpd-charger" }
 ++++};
 ++++
     static int ec_device_probe(struct platform_device *pdev)
     {
        int retval = -ENOMEM;
@@@@@@ -423,30 -422,6 -423,30 -419,18 -419,18 +427,42 @@@@@@
        if (cros_ec_check_features(ec, EC_FEATURE_MOTION_SENSE))
                cros_ec_sensors_register(ec);
     
++ ++   /* Check whether this EC instance has CEC host command support */
++ ++   if (cros_ec_check_features(ec, EC_FEATURE_CEC)) {
++ ++           retval = mfd_add_devices(ec->dev, PLATFORM_DEVID_AUTO,
++ ++                                    cros_ec_cec_cells,
++ ++                                    ARRAY_SIZE(cros_ec_cec_cells),
++ ++                                    NULL, 0, NULL);
++ ++           if (retval)
++ ++                   dev_err(ec->dev,
++ ++                           "failed to add cros-ec-cec device: %d\n",
++ ++                           retval);
++ ++   }
++ ++
 +      /* Check whether this EC instance has RTC host command support */
 +      if (cros_ec_check_features(ec, EC_FEATURE_RTC)) {
 +              retval = mfd_add_devices(ec->dev, PLATFORM_DEVID_AUTO,
 +                                       cros_ec_rtc_cells,
 +                                       ARRAY_SIZE(cros_ec_rtc_cells),
 +                                       NULL, 0, NULL);
 +              if (retval)
 +                      dev_err(ec->dev,
 +                              "failed to add cros-ec-rtc device: %d\n",
 +                              retval);
 +      }
 +   
 ++++   /* Check whether this EC instance has the PD charge manager */
 ++++   if (cros_ec_check_features(ec, EC_FEATURE_USB_PD)) {
 ++++           retval = mfd_add_devices(ec->dev, PLATFORM_DEVID_AUTO,
 ++++                                    cros_usbpd_charger_cells,
 ++++                                    ARRAY_SIZE(cros_usbpd_charger_cells),
 ++++                                    NULL, 0, NULL);
 ++++           if (retval)
 ++++                   dev_err(ec->dev,
 ++++                           "failed to add cros-usbpd-charger device: %d\n",
 ++++                           retval);
 ++++   }
 ++++
        /* Take control of the lightbar from the EC. */
        lb_manual_suspend_ctrl(ec, 1);
     

diff --cc drivers/pinctrl/Kconfig
Simple merge

diff --cc drivers/pinctrl/Makefile
Simple merge

diff --cc include/linux/mfd/cros_ec_commands.h
Simple merge