Merge tag 'pm+acpi-4.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[sfrench/cifs-2.6.git] / drivers / extcon / extcon-max8997.c

diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index b2b13b3dce14743d1a977c0fa760325d15b6969b..9a89320d09a8b6e08660cadca6abd6b79e23c24d 100644 (file)
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -148,6 +148,7 @@ struct max8997_muic_info {
 static const unsigned int max8997_extcon_cable[] = {
        EXTCON_USB,
        EXTCON_USB_HOST,
+       EXTCON_CHG_USB_SDP,
        EXTCON_CHG_USB_DCP,
        EXTCON_CHG_USB_FAST,
        EXTCON_CHG_USB_SLOW,
@@ -334,6 +335,8 @@ static int max8997_muic_handle_usb(struct max8997_muic_info *info,
                break;
        case MAX8997_USB_DEVICE:
                extcon_set_cable_state_(info->edev, EXTCON_USB, attached);
+               extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,
+                                       attached);
                break;
        default:
                dev_err(info->dev, "failed to detect %s usb cable\n",