Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 449a97d0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'extcon-next-for-4.6' of... 

Merge tag 'extcon-next-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-testing

Chanwoo writes:

Update extcon for 4.6

Detailed description for patchset:
1. Add new EXTCON_CHG_USB_SDP type
- SDP (Standard Downstream Port) USB Charging Port
  means the charging connector.a

2. Add the VBUS detection by using GPIO on extcon-palmas
- Beaglex15 board uses the extcon-palmas driver
  But, beaglex15 board need the GPIO support for VBUS
  detection.

3. Fix the minor issue of extcon drivers
parents 523462df ae64e42c

arch/arm/boot/dts/am57xx-beagle-x15.dts

+1 −2
Original line number Diff line number Diff line
@@ -562,8 +562,7 @@ 
		extcon_usb2: tps659038_usb {

			compatible = "ti,palmas-usb-vid";

			ti,enable-vbus-detection;

			ti,enable-id-detection;

			id-gpios = <&gpio7 24 GPIO_ACTIVE_HIGH>;

			vbus-gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>;

		};



	};

drivers/extcon/extcon-arizona.c

+2 −2
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info, 
		break;

	};



	mutex_lock(&arizona->dapm->card->dapm_mutex);

	snd_soc_dapm_mutex_lock(arizona->dapm);



	arizona->hpdet_clamp = clamp;
@@ -227,7 +227,7 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info, 
				 ret);

	}



	mutex_unlock(&arizona->dapm->card->dapm_mutex);

	snd_soc_dapm_mutex_unlock(arizona->dapm);

}



static void arizona_extcon_set_mode(struct arizona_extcon_info *info, int mode)

drivers/extcon/extcon-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static int gpio_extcon_probe(struct platform_device *pdev) 
	INIT_DELAYED_WORK(&data->work, gpio_extcon_work);



	/*

	 * Request the interrput of gpio to detect whether external connector

	 * Request the interrupt of gpio to detect whether external connector

	 * is attached or detached.

	 */

	ret = devm_request_any_context_irq(&pdev->dev, data->irq,

drivers/extcon/extcon-max14577.c

+3 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ enum max14577_muic_acc_type { 


static const unsigned int max14577_extcon_cable[] = {

	EXTCON_USB,

	EXTCON_CHG_USB_SDP,

	EXTCON_CHG_USB_DCP,

	EXTCON_CHG_USB_FAST,

	EXTCON_CHG_USB_SLOW,
@@ -454,6 +455,8 @@ static int max14577_muic_chg_handler(struct max14577_muic_info *info) 
			return ret;



		extcon_set_cable_state_(info->edev, EXTCON_USB, attached);

		extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,

					attached);

		break;

	case MAX14577_CHARGER_TYPE_DEDICATED_CHG:

		extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,

drivers/extcon/extcon-max77693.c

+11 −1
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ enum max77693_muic_acc_type { 
static const unsigned int max77693_extcon_cable[] = {

	EXTCON_USB,

	EXTCON_USB_HOST,

	EXTCON_CHG_USB_SDP,

	EXTCON_CHG_USB_DCP,

	EXTCON_CHG_USB_FAST,

	EXTCON_CHG_USB_SLOW,
@@ -512,8 +513,11 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info, 
		break;

	case MAX77693_MUIC_ADC_AV_CABLE_NOLOAD:		/* Dock-Audio */

		dock_id = EXTCON_DOCK;

		if (!attached)

		if (!attached) {

			extcon_set_cable_state_(info->edev, EXTCON_USB, false);

			extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,

						false);

		}

		break;

	default:

		dev_err(info->dev, "failed to detect %s dock device\n",
@@ -601,6 +605,8 @@ static int max77693_muic_adc_ground_handler(struct max77693_muic_info *info) 
		if (ret < 0)

			return ret;

		extcon_set_cable_state_(info->edev, EXTCON_USB, attached);

		extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,

					attached);

		break;

	case MAX77693_MUIC_GND_MHL:

	case MAX77693_MUIC_GND_MHL_VB:
@@ -830,6 +836,8 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info) 
			 */

			extcon_set_cable_state_(info->edev, EXTCON_USB,

						attached);

			extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,

						attached);



			if (!cable_attached)

				extcon_set_cable_state_(info->edev, EXTCON_DOCK,
@@ -899,6 +907,8 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info) 


			extcon_set_cable_state_(info->edev, EXTCON_USB,

						attached);

			extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SDP,

						attached);

			break;

		case MAX77693_CHARGER_TYPE_DEDICATED_CHG:

			/* Only TA cable */