Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB/PHY updates from Greg KH:
 "Here is the big set of USB and PHY driver updates for 4.15-rc1.

  There is the usual amount of gadget and xhci driver updates, along
  with phy and chipidea enhancements. There's also a lot of SPDX tags
  and license boilerplate cleanups as well, which provide some churn in
  the diffstat.

  Other major thing is the typec code that moved out of staging and into
  the "real" part of the drivers/usb/ tree, which was nice to see
  happen.

  All of these have been in linux-next with no reported issues for a
  while"

* tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (263 commits)
  usb: gadget: f_fs: Fix use-after-free in ffs_free_inst
  USB: usbfs: compute urb->actual_length for isochronous
  usb: core: message: remember to reset 'ret' to 0 when necessary
  USB: typec: Remove remaining redundant license text
  USB: typec: add SPDX identifiers to some files
  USB: renesas_usbhs: rcar?.h: add SPDX tags
  USB: chipidea: ci_hdrc_tegra.c: add SPDX line
  USB: host: xhci-debugfs: add SPDX lines
  USB: add SPDX identifiers to all remaining Makefiles
  usb: host: isp1362-hcd: remove a couple of redundant assignments
  USB: adutux: remove redundant variable minor
  usb: core: add a new usb_get_ptm_status() helper
  usb: core: add a 'type' parameter to usb_get_status()
  usb: core: introduce a new usb_get_std_status() helper
  usb: core: rename usb_get_status() 'type' argument to 'recip'
  usb: core: add Status Type definitions
  USB: gadget: Remove redundant license text
  USB: gadget: function: Remove redundant license text
  USB: gadget: udc: Remove redundant license text
  USB: gadget: legacy: Remove redundant license text
  ...

18 files changed, 98 insertions, 33 deletions

diff --git a/drivers/extcon/extcon-adc-jack.c b/drivers/extcon/extcon-adc-jack.c
index 6f6537ab0a79..3877d86c746a 100644
--- a/drivers/extcon/extcon-adc-jack.c
+++ b/drivers/extcon/extcon-adc-jack.c
@@ -26,7 +26,7 @@
 #include <linux/workqueue.h>
 #include <linux/iio/consumer.h>
 #include <linux/extcon/extcon-adc-jack.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 
 /**
  * struct adc_jack_data - internal data for adc_jack device driver
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index f84da4a17724..da0e9bc4262f 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -27,7 +27,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
 #include <linux/regulator/consumer.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 
 #include <sound/soc.h>
 
diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
index f4fd03e58e37..981fba56bc18 100644
--- a/drivers/extcon/extcon-axp288.c
+++ b/drivers/extcon/extcon-axp288.c
@@ -22,7 +22,7 @@
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/notifier.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/regmap.h>
 #include <linux/gpio.h>
 #include <linux/gpio/consumer.h>
diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c
index ebed22f22d75..ab770adcca7e 100644
--- a/drivers/extcon/extcon-gpio.c
+++ b/drivers/extcon/extcon-gpio.c
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/extcon/extcon-gpio.h>
 #include <linux/gpio.h>
 #include <linux/gpio/consumer.h>
diff --git a/drivers/extcon/extcon-intel-cht-wc.c b/drivers/extcon/extcon-intel-cht-wc.c
index 91a0023074af..7c4bc8c44c3f 100644
--- a/drivers/extcon/extcon-intel-cht-wc.c
+++ b/drivers/extcon/extcon-intel-cht-wc.c
@@ -15,7 +15,7 @@
  * more details.
  */
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/mfd/intel_soc_pmic.h>
diff --git a/drivers/extcon/extcon-intel-int3496.c b/drivers/extcon/extcon-intel-int3496.c
index 1a45e745717d..c8691b5a9cb0 100644
--- a/drivers/extcon/extcon-intel-int3496.c
+++ b/drivers/extcon/extcon-intel-int3496.c
@@ -19,7 +19,7 @@
  */
 
 #include <linux/acpi.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
diff --git a/drivers/extcon/extcon-max14577.c b/drivers/extcon/extcon-max14577.c
index f6414b7fa5bc..b871836da8a4 100644
--- a/drivers/extcon/extcon-max14577.c
+++ b/drivers/extcon/extcon-max14577.c
@@ -23,7 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/mfd/max14577.h>
 #include <linux/mfd/max14577-private.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 
 #define DELAY_MS_DEFAULT                17000           /* unit: millisecond */
 
@@ -204,8 +204,8 @@ static int max14577_muic_set_debounce_time(struct max14577_muic_info *info,
 static int max14577_muic_set_path(struct max14577_muic_info *info,
                 u8 val, bool attached)
 {
-        int ret = 0;
         u8 ctrl1, ctrl2 = 0;
+        int ret;
 
         /* Set open state to path before changing hw path */
         ret = max14577_update_reg(info->max14577->regmap,
diff --git a/drivers/extcon/extcon-max3355.c b/drivers/extcon/extcon-max3355.c
index 533e16a952b8..0aa410836f4e 100644
--- a/drivers/extcon/extcon-max3355.c
+++ b/drivers/extcon/extcon-max3355.c
@@ -9,7 +9,7 @@
  * may be copied, distributed, and modified under those terms.
  */
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/interrupt.h>
diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
index 7a5856809047..643411066ad9 100644
--- a/drivers/extcon/extcon-max77693.c
+++ b/drivers/extcon/extcon-max77693.c
@@ -26,7 +26,7 @@
 #include <linux/mfd/max77693.h>
 #include <linux/mfd/max77693-common.h>
 #include <linux/mfd/max77693-private.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/regmap.h>
 #include <linux/irqdomain.h>
 
diff --git a/drivers/extcon/extcon-max77843.c b/drivers/extcon/extcon-max77843.c
index 6e722d552cf1..c9fcd6cd41cb 100644
--- a/drivers/extcon/extcon-max77843.c
+++ b/drivers/extcon/extcon-max77843.c
@@ -11,7 +11,7 @@
  * (at your option) any later version.
  */
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
@@ -80,7 +80,7 @@ enum max77843_muic_accessory_type {
         MAX77843_MUIC_ADC_REMOTE_S12_BUTTON,
         MAX77843_MUIC_ADC_RESERVED_ACC_1,
         MAX77843_MUIC_ADC_RESERVED_ACC_2,
-        MAX77843_MUIC_ADC_RESERVED_ACC_3,
+        MAX77843_MUIC_ADC_RESERVED_ACC_3, /* SmartDock */
         MAX77843_MUIC_ADC_RESERVED_ACC_4,
         MAX77843_MUIC_ADC_RESERVED_ACC_5,
         MAX77843_MUIC_ADC_AUDIO_DEVICE_TYPE2,
@@ -119,6 +119,7 @@ enum max77843_muic_charger_type {
         MAX77843_MUIC_CHG_SPECIAL_BIAS,
         MAX77843_MUIC_CHG_RESERVED,
         MAX77843_MUIC_CHG_GND,
+        MAX77843_MUIC_CHG_DOCK,
 };
 
 static const unsigned int max77843_extcon_cable[] = {
@@ -130,6 +131,7 @@ static const unsigned int max77843_extcon_cable[] = {
         EXTCON_CHG_USB_FAST,
         EXTCON_CHG_USB_SLOW,
         EXTCON_DISP_MHL,
+        EXTCON_DOCK,
         EXTCON_JIG,
         EXTCON_NONE,
 };
@@ -200,7 +202,7 @@ static const struct regmap_irq_chip max77843_muic_irq_chip = {
 };
 
 static int max77843_muic_set_path(struct max77843_muic_info *info,
-                u8 val, bool attached)
+                u8 val, bool attached, bool nobccomp)
 {
         struct max77693_dev *max77843 = info->max77843;
         int ret = 0;
@@ -210,10 +212,16 @@ static int max77843_muic_set_path(struct max77843_muic_info *info,
                 ctrl1 = val;
         else
                 ctrl1 = MAX77843_MUIC_CONTROL1_SW_OPEN;
+        if (nobccomp) {
+                /* Disable BC1.2 protocol and force manual switch control */
+                ctrl1 |= MAX77843_MUIC_CONTROL1_NOBCCOMP_MASK;
+        }
 
         ret = regmap_update_bits(max77843->regmap_muic,
                         MAX77843_MUIC_REG_CONTROL1,
-                        MAX77843_MUIC_CONTROL1_COM_SW, ctrl1);
+                        MAX77843_MUIC_CONTROL1_COM_SW |
+                                MAX77843_MUIC_CONTROL1_NOBCCOMP_MASK,
+                        ctrl1);
         if (ret < 0) {
                 dev_err(info->dev, "Cannot switch MUIC port\n");
                 return ret;
@@ -240,6 +248,21 @@ static int max77843_muic_set_path(struct max77843_muic_info *info,
         return 0;
 }
 
+static void max77843_charger_set_otg_vbus(struct max77843_muic_info *info,
+                 bool on)
+{
+        struct max77693_dev *max77843 = info->max77843;
+        unsigned int cnfg00;
+
+        if (on)
+                cnfg00 = MAX77843_CHG_OTG_MASK | MAX77843_CHG_BOOST_MASK;
+        else
+                cnfg00 = MAX77843_CHG_ENABLE | MAX77843_CHG_BUCK_MASK;
+
+        regmap_update_bits(max77843->regmap_chg, MAX77843_CHG_REG_CHG_CNFG_00,
+                           MAX77843_CHG_MODE_MASK, cnfg00);
+}
+
 static int max77843_muic_get_cable_type(struct max77843_muic_info *info,
                 enum max77843_muic_cable_group group, bool *attached)
 {
@@ -288,6 +311,19 @@ static int max77843_muic_get_cable_type(struct max77843_muic_info *info,
                         break;
                 }
 
+                if (adc == MAX77843_MUIC_ADC_RESERVED_ACC_3) { /* SmartDock */
+                        if (chg_type == MAX77843_MUIC_CHG_NONE) {
+                                *attached = false;
+                                cable_type = info->prev_chg_type;
+                                info->prev_chg_type = MAX77843_MUIC_CHG_NONE;
+                        } else {
+                                *attached = true;
+                                cable_type = MAX77843_MUIC_CHG_DOCK;
+                                info->prev_chg_type = MAX77843_MUIC_CHG_DOCK;
+                        }
+                        break;
+                }
+
                 if (chg_type == MAX77843_MUIC_CHG_NONE) {
                         *attached = false;
                         cable_type = info->prev_chg_type;
@@ -350,17 +386,18 @@ static int max77843_muic_adc_gnd_handler(struct max77843_muic_info *info)
         case MAX77843_MUIC_GND_USB_HOST_VB:
                 ret = max77843_muic_set_path(info,
                                              MAX77843_MUIC_CONTROL1_SW_USB,
-                                             attached);
+                                             attached, false);
                 if (ret < 0)
                         return ret;
 
                 extcon_set_state_sync(info->edev, EXTCON_USB_HOST, attached);
+                max77843_charger_set_otg_vbus(info, attached);
                 break;
         case MAX77843_MUIC_GND_MHL_VB:
         case MAX77843_MUIC_GND_MHL:
                 ret = max77843_muic_set_path(info,
                                              MAX77843_MUIC_CONTROL1_SW_OPEN,
-                                             attached);
+                                             attached, false);
                 if (ret < 0)
                         return ret;
 
@@ -396,7 +433,7 @@ static int max77843_muic_jig_handler(struct max77843_muic_info *info,
                 return -EINVAL;
         }
 
-        ret = max77843_muic_set_path(info, path, attached);
+        ret = max77843_muic_set_path(info, path, attached, false);
         if (ret < 0)
                 return ret;
 
@@ -405,6 +442,26 @@ static int max77843_muic_jig_handler(struct max77843_muic_info *info,
         return 0;
 }
 
+static int max77843_muic_dock_handler(struct max77843_muic_info *info,
+                bool attached)
+{
+        int ret;
+
+        dev_dbg(info->dev, "external connector is %s (adc: 0x10)\n",
+                        attached ? "attached" : "detached");
+
+        ret = max77843_muic_set_path(info, MAX77843_MUIC_CONTROL1_SW_USB,
+                                     attached, attached);
+        if (ret < 0)
+                return ret;
+
+        extcon_set_state_sync(info->edev, EXTCON_DISP_MHL, attached);
+        extcon_set_state_sync(info->edev, EXTCON_USB_HOST, attached);
+        extcon_set_state_sync(info->edev, EXTCON_DOCK, attached);
+
+        return 0;
+}
+
 static int max77843_muic_adc_handler(struct max77843_muic_info *info)
 {
         int ret, cable_type;
@@ -419,6 +476,11 @@ static int max77843_muic_adc_handler(struct max77843_muic_info *info)
                 info->prev_cable_type);
 
         switch (cable_type) {
+        case MAX77843_MUIC_ADC_RESERVED_ACC_3: /* SmartDock */
+                ret = max77843_muic_dock_handler(info, attached);
+                if (ret < 0)
+                        return ret;
+                break;
         case MAX77843_MUIC_ADC_GROUND:
                 ret = max77843_muic_adc_gnd_handler(info);
                 if (ret < 0)
@@ -446,7 +508,6 @@ static int max77843_muic_adc_handler(struct max77843_muic_info *info)
         case MAX77843_MUIC_ADC_REMOTE_S12_BUTTON:
         case MAX77843_MUIC_ADC_RESERVED_ACC_1:
         case MAX77843_MUIC_ADC_RESERVED_ACC_2:
-        case MAX77843_MUIC_ADC_RESERVED_ACC_3:
         case MAX77843_MUIC_ADC_RESERVED_ACC_4:
         case MAX77843_MUIC_ADC_RESERVED_ACC_5:
         case MAX77843_MUIC_ADC_AUDIO_DEVICE_TYPE2:
@@ -490,7 +551,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
         case MAX77843_MUIC_CHG_USB:
                 ret = max77843_muic_set_path(info,
                                              MAX77843_MUIC_CONTROL1_SW_USB,
-                                             attached);
+                                             attached, false);
                 if (ret < 0)
                         return ret;
 
@@ -501,7 +562,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
         case MAX77843_MUIC_CHG_DOWNSTREAM:
                 ret = max77843_muic_set_path(info,
                                              MAX77843_MUIC_CONTROL1_SW_OPEN,
-                                             attached);
+                                             attached, false);
                 if (ret < 0)
                         return ret;
 
@@ -511,7 +572,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
         case MAX77843_MUIC_CHG_DEDICATED:
                 ret = max77843_muic_set_path(info,
                                              MAX77843_MUIC_CONTROL1_SW_OPEN,
-                                             attached);
+                                             attached, false);
                 if (ret < 0)
                         return ret;
 
@@ -521,7 +582,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
         case MAX77843_MUIC_CHG_SPECIAL_500MA:
                 ret = max77843_muic_set_path(info,
                                              MAX77843_MUIC_CONTROL1_SW_OPEN,
-                                             attached);
+                                             attached, false);
                 if (ret < 0)
                         return ret;
 
@@ -531,7 +592,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
         case MAX77843_MUIC_CHG_SPECIAL_1A:
                 ret = max77843_muic_set_path(info,
                                              MAX77843_MUIC_CONTROL1_SW_OPEN,
-                                             attached);
+                                             attached, false);
                 if (ret < 0)
                         return ret;
 
@@ -550,6 +611,9 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
                         extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP,
                                                 false);
                 break;
+        case MAX77843_MUIC_CHG_DOCK:
+                extcon_set_state_sync(info->edev, EXTCON_CHG_USB_DCP, attached);
+                break;
         case MAX77843_MUIC_CHG_NONE:
                 break;
         default:
@@ -558,7 +622,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
                         attached ? "attached" : "detached", chg_type);
 
                 max77843_muic_set_path(info, MAX77843_MUIC_CONTROL1_SW_OPEN,
-                                       attached);
+                                       attached, false);
                 return -EINVAL;
         }
 
@@ -798,7 +862,8 @@ static int max77843_muic_probe(struct platform_device *pdev)
         max77843_muic_set_debounce_time(info, MAX77843_DEBOUNCE_TIME_25MS);
 
         /* Set initial path for UART */
-        max77843_muic_set_path(info, MAX77843_MUIC_CONTROL1_SW_UART, true);
+        max77843_muic_set_path(info, MAX77843_MUIC_CONTROL1_SW_UART, true,
+                               false);
 
         /* Check revision number of MUIC device */
         ret = regmap_read(max77843->regmap_muic, MAX77843_MUIC_REG_ID, &id);
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index 4a0612fb9c07..8152790d72e1 100644
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -25,7 +25,7 @@
 #include <linux/kobject.h>
 #include <linux/mfd/max8997.h>
 #include <linux/mfd/max8997-private.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/irqdomain.h>
 
 #define DEV_NAME                        "max8997-muic"
diff --git a/drivers/extcon/extcon-qcom-spmi-misc.c b/drivers/extcon/extcon-qcom-spmi-misc.c
index b8cde096a808..660bbf163bf5 100644
--- a/drivers/extcon/extcon-qcom-spmi-misc.c
+++ b/drivers/extcon/extcon-qcom-spmi-misc.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
diff --git a/drivers/extcon/extcon-rt8973a.c b/drivers/extcon/extcon-rt8973a.c
index eaa355e7d9e4..e059bd5f2041 100644
--- a/drivers/extcon/extcon-rt8973a.c
+++ b/drivers/extcon/extcon-rt8973a.c
@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 
 #include "extcon-rt8973a.h"
 
diff --git a/drivers/extcon/extcon-sm5502.c b/drivers/extcon/extcon-sm5502.c
index 106ef0297b53..0cfb5a3efdf6 100644
--- a/drivers/extcon/extcon-sm5502.c
+++ b/drivers/extcon/extcon-sm5502.c
@@ -19,7 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 
 #include "extcon-sm5502.h"
 
diff --git a/drivers/extcon/extcon-usb-gpio.c b/drivers/extcon/extcon-usb-gpio.c
index 9c925b05b7aa..53762864a9f7 100644
--- a/drivers/extcon/extcon-usb-gpio.c
+++ b/drivers/extcon/extcon-usb-gpio.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/gpio.h>
 #include <linux/gpio/consumer.h>
 #include <linux/init.h>
diff --git a/drivers/extcon/extcon-usbc-cros-ec.c b/drivers/extcon/extcon-usbc-cros-ec.c
index 598956f1dcae..6187f731b29d 100644
--- a/drivers/extcon/extcon-usbc-cros-ec.c
+++ b/drivers/extcon/extcon-usbc-cros-ec.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 #include <linux/kernel.h>
 #include <linux/mfd/cros_ec.h>
 #include <linux/module.h>
diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c
index 35e9fb885486..cb38c2747684 100644
--- a/drivers/extcon/extcon.c
+++ b/drivers/extcon/extcon.c
@@ -36,7 +36,7 @@
 
 #define SUPPORTED_CABLE_MAX     32
 
-struct __extcon_info {
+static const struct __extcon_info {
         unsigned int type;
         unsigned int id;
         const char *name;
diff --git a/drivers/extcon/extcon.h b/drivers/extcon/extcon.h
index 61358479bfcc..93b5e0306966 100644
--- a/drivers/extcon/extcon.h
+++ b/drivers/extcon/extcon.h
@@ -2,7 +2,7 @@
 #ifndef __LINUX_EXTCON_INTERNAL_H__
 #define __LINUX_EXTCON_INTERNAL_H__
 
-#include <linux/extcon.h>
+#include <linux/extcon-provider.h>
 
 /**
  * struct extcon_dev - An extcon device represents one external connector.