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

Pull MFD updates from Lee Jones:
 "New Drivers:
   - Add Cirrus Logic Madera Codec (CS47L35, CS47L85 and CS47L90/91) driver
   - Add ChromeOS EC CEC driver
   - Add ROHM BD71837 PMIC driver

  New Device Support:
   - Add support for Dialog Semi DA9063L PMIC variant to DA9063
   - Add support for Intel Ice Lake to Intel-PLSS-PCI
   - Add support for X-Powers AXP806 to AXP20x

  New Functionality:
   - Add support for USB Charging to the ChromeOS Embedded Controller
   - Add support for HDMI CEC to the ChromeOS Embedded Controller
   - Add support for HDMI CEC to Intel HDMI
   - Add support for accessory detection to Madera devices
   - Allow individual pins to be configured via DT' wlf,csnaddr-pd
   - Provide legacy platform specific EEPROM/Watchdog commands; rave-sp

  Fix-upsL
   - Trivial renaming/spelling fixes; cros_ec, da9063-*
   - Convert to Managed Resources (devm_*); da9063-*, ti_am335x_tscadc
   - Transition to helper macros/functions; da9063-*
   - Constify; kempld-core
   - Improve error path/messages; wm8994-core
   - Disable IRQs locally instead of relying on USB subsystem; dln2
   - Remove unused code; rave-sp
   - New exports; sec-core

  Bug Fixes:
   - Fix possible false I2C transaction error; arizona-core
   - Fix declared memory area size; hi655x-pmic
   - Fix checksum type; rave-sp
   - Fix incorrect default serial port configuration: rave-sp
   - Fix incorrect coherent DMA mask for sub-devices; sm501"

* tag 'mfd-next-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (60 commits)
  mfd: madera: Add register definitions for accessory detect
  mfd: sm501: Set coherent_dma_mask when creating subdevices
  mfd: bd71837: Devicetree bindings for ROHM BD71837 PMIC
  mfd: bd71837: Core driver for ROHM BD71837 PMIC
  media: platform: cros-ec-cec: Fix dependency on MFD_CROS_EC
  mfd: sec-core: Export OF module alias table
  mfd: as3722: Disable auto-power-on when AC OK
  mfd: axp20x: Support AXP806 in I2C mode
  mfd: axp20x: Add self-working mode support for AXP806
  dt-bindings: mfd: axp20x: Add "self-working" mode for AXP806
  mfd: wm8994: Allow to configure CS/ADDR Pulldown from dts
  mfd: wm8994: Allow to configure Speaker Mode Pullup from dts
  mfd: rave-sp: Emulate CMD_GET_STATUS on device that don't support it
  mfd: rave-sp: Add legacy watchdog ping command translation
  mfd: rave-sp: Add legacy EEPROM access command translation
  mfd: rave-sp: Initialize flow control and parity of the port
  mfd: rave-sp: Fix incorrectly specified checksum type
  mfd: rave-sp: Remove unused defines
  mfd: hi655x: Fix regmap area declared size for hi655x
  mfd: ti_am335x_tscadc: Fix struct clk memory leak
  ...

diff --cc Documentation/devicetree/bindings/mfd/axp20x.txt
Simple merge

diff --cc MAINTAINERS
index 955463f,2c1c6ae..5df1b36
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3562,11 -3513,23 +3562,27 @@@ M:   Christian Benvenuti <benve@cisco.com
  S:    Supported
  F:    drivers/infiniband/hw/usnic/
  
+ CIRRUS LOGIC MADERA CODEC DRIVERS
+ M:    Charles Keepax <ckeepax@opensource.cirrus.com>
+ M:    Richard Fitzgerald <rf@opensource.cirrus.com>
+ L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
+ L:    patches@opensource.cirrus.com
+ T:    git https://github.com/CirrusLogic/linux-drivers.git
+ W:    https://github.com/CirrusLogic/linux-drivers/wiki
+ S:    Supported
+ F:    Documentation/devicetree/bindings/mfd/madera.txt
+ F:    Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt
+ F:    include/linux/mfd/madera/*
+ F:    drivers/gpio/gpio-madera*
+ F:    drivers/mfd/madera*
+ F:    drivers/mfd/cs47l*
+ F:    drivers/pinctrl/cirrus/*
+ 
 +CLANG-FORMAT FILE
 +M:    Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
 +S:    Maintained
 +F:    .clang-format
 +
  CLEANCACHE API
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  L:    linux-kernel@vger.kernel.org

diff --cc arch/arm64/configs/defconfig
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/Makefile
Simple merge

diff --cc drivers/gpu/drm/i915/Kconfig
index 5c607f2,2d65d56..33a458b
--- 1/drivers/gpu/drm/i915/Kconfig
--- 2/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@@ -23,7 -23,7 +23,8 @@@ config DRM_I91
        select SYNC_FILE
        select IOSF_MBI
        select CRC32
 +      select SND_HDA_I915 if SND_HDA_CORE
+       select CEC_CORE if CEC_NOTIFIER
        help
          Choose this option if you have a system that has "Intel Graphics
          Media Accelerator" or "HD Graphics" integrated graphics,

diff --cc drivers/gpu/drm/i915/intel_display.h
index 9292001,1f176a7..138a1bc
--- 1/drivers/gpu/drm/i915/intel_display.h
--- 2/drivers/gpu/drm/i915/intel_display.h
+++ b/drivers/gpu/drm/i915/intel_display.h
@@@ -126,17 -126,30 +126,41 @@@ enum port 
  
  #define port_name(p) ((p) + 'A')
  
+ /*
+  * Ports identifier referenced from other drivers.
+  * Expected to remain stable over time
+  */
+ static inline const char *port_identifier(enum port port)
+ {
+       switch (port) {
+       case PORT_A:
+               return "Port A";
+       case PORT_B:
+               return "Port B";
+       case PORT_C:
+               return "Port C";
+       case PORT_D:
+               return "Port D";
+       case PORT_E:
+               return "Port E";
+       case PORT_F:
+               return "Port F";
+       default:
+               return "<invalid>";
+       }
+ }
+ 
 +enum tc_port {
 +      PORT_TC_NONE = -1,
 +
 +      PORT_TC1 = 0,
 +      PORT_TC2,
 +      PORT_TC3,
 +      PORT_TC4,
 +
 +      I915_MAX_TC_PORTS
 +};
 +
  enum dpio_channel {
        DPIO_CH0,
        DPIO_CH1

diff --cc drivers/gpu/drm/i915/intel_drv.h
Simple merge

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

diff --cc drivers/media/platform/Kconfig
Simple merge

diff --cc drivers/media/platform/Makefile
Simple merge

diff --cc drivers/mfd/cros_ec_dev.c
Simple merge

diff --cc drivers/pinctrl/Kconfig
Simple merge