Merge tag 'extcon-next-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git...

Chanwoo writes:

Update extcon for 4.14

Detailed description for this pull request:
1. Add new 'extcon-usbc-cros-ec.c' driver
- ChromeOS Embedded Controller extcon driver supports
  the detection of the Display Port (EXTCON_DISP_DP)
  through USB C-type and contol it.

2. Update extcon core
- Modify the description for both functions and structures
  in order to improve the readability and give the more correct
  guide about the role of functions because there are different
  explanation even if the same arguments.

- Keep the indentation with tab instead of space

- Remove the following deprecated extcon API. The deprecated API
  are exchanged on all of linux tree.
  : extcon_get_cable_state_() -> extcon_get_state()
  : extcon_set_cable_state_() -> extcon_set_state_sync()

3. Include the two immutable branch as following:
- ib-extcon-mfd-4.14 for the 'extcon-ubsc-cros-ec.c' driver
  because the patches of 'extcon-ubsc-cros-ec.c' touch the MFD directory.
- ib-extcon-usb-phy-4.14 for removing the deprecated extcon API
  because the usb/phy driver usese the deprecated extcon API.
  So, this immutable branch alters the extcon API and then
  remove them from extcon.

4. Fix minor issue of extcon driver
- Fix the MHL detection on extcon-max77693.c
- Convert to using %pOF instead of full_name on extcon.c
- Add 'const' kerywod for acpi_device_id on extcon-intel-int3496.c

diff --combined drivers/usb/gadget/udc/snps_udc_plat.c
index f7b4d0f159e4e4492bbfb6d5877370bb9275cda5,0ce7b3ba60ff92c179b27b5a2cca655f06aa3dec..e8a5fdaee37d03564d85371b27bfe55614478f23
--- 1/drivers/usb/gadget/udc/snps_udc_plat.c
--- 2/drivers/usb/gadget/udc/snps_udc_plat.c
+++ b/drivers/usb/gadget/udc/snps_udc_plat.c
@@@ -28,7 -28,7 +28,7 @@@
  /* description */
  #define UDC_MOD_DESCRIPTION     "Synopsys UDC platform driver"
  
 -void start_udc(struct udc *udc)
 +static void start_udc(struct udc *udc)
  {
        if (udc->driver) {
                dev_info(udc->dev, "Connecting...\n");
@@@ -38,7 -38,7 +38,7 @@@
        }
  }
  
 -void stop_udc(struct udc *udc)
 +static void stop_udc(struct udc *udc)
  {
        int tmp;
        u32 reg;
@@@ -76,7 -76,7 +76,7 @@@
        dev_info(udc->dev, "Device disconnected\n");
  }
  
 -void udc_drd_work(struct work_struct *work)
 +static void udc_drd_work(struct work_struct *work)
  {
        struct udc *udc;
  
@@@ -184,7 -184,7 +184,7 @@@ static int udc_plat_probe(struct platfo
                        goto exit_phy;
                }
  
-               ret = extcon_get_cable_state_(udc->edev, EXTCON_USB);
+               ret = extcon_get_state(udc->edev, EXTCON_USB);
                if (ret < 0) {
                        dev_err(dev, "Can't get cable state\n");
                        goto exit_extcon;
@@@ -273,7 -273,7 +273,7 @@@ static int udc_plat_suspend(struct devi
        udc = dev_get_drvdata(dev);
        stop_udc(udc);
  
-       if (extcon_get_cable_state_(udc->edev, EXTCON_USB) > 0) {
+       if (extcon_get_state(udc->edev, EXTCON_USB) > 0) {
                dev_dbg(udc->dev, "device -> idle\n");
                stop_udc(udc);
        }
@@@ -303,7 -303,7 +303,7 @@@ static int udc_plat_resume(struct devic
                return ret;
        }
  
-       if (extcon_get_cable_state_(udc->edev, EXTCON_USB) > 0) {
+       if (extcon_get_state(udc->edev, EXTCON_USB) > 0) {
                dev_dbg(udc->dev, "idle -> device\n");
                start_udc(udc);
        }