Merge branch 'ib-extcon-phy-4.9' of... (33692e3c) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/extcon/extcon-adc-jack.c

+15 −12

Original line number	Diff line number	Diff line
		@@ -3,6 +3,9 @@
		*
		* Analog Jack extcon driver with ADC-based detection capability.
		*
		* Copyright (C) 2016 Samsung Electronics
		* Chanwoo Choi <cw00.choi@samsung.com>
		*
		* Copyright (C) 2012 Samsung Electronics
		* MyungJoo Ham <myungjoo.ham@samsung.com>
		*
		@@ -58,7 +61,7 @@ static void adc_jack_handler(struct work_struct *work)
		struct adc_jack_data *data = container_of(to_delayed_work(work),
		struct adc_jack_data,
		handler);
		u32 state = 0;
		struct adc_jack_cond *def;
		int ret, adc_val;
		int i;

		@@ -70,17 +73,18 @@ static void adc_jack_handler(struct work_struct *work)

		/* Get state from adc value with adc_conditions */
		for (i = 0; i < data->num_conditions; i++) {
		struct adc_jack_cond *def = &data->adc_conditions[i];
		if (!def->state)
		break;
		def = &data->adc_conditions[i];
		if (def->min_adc <= adc_val && def->max_adc >= adc_val) {
		state = def->state;
		break;
		extcon_set_cable_state_(data->edev, def->id, true);
		return;
		}
		}
		/* if no def has met, it means state = 0 (no cables attached) */

		extcon_set_state(data->edev, state);
		/* Set the detached state if adc value is not included in the range */
		for (i = 0; i < data->num_conditions; i++) {
		def = &data->adc_conditions[i];
		extcon_set_cable_state_(data->edev, def->id, false);
		}
		}

		static irqreturn_t adc_jack_irq_thread(int irq, void *_data)
		@@ -114,16 +118,14 @@ static int adc_jack_probe(struct platform_device *pdev)
		return -ENOMEM;
		}

		if (!pdata->adc_conditions \|\|
		!pdata->adc_conditions[0].state) {
		if (!pdata->adc_conditions) {
		dev_err(&pdev->dev, "error: adc_conditions not defined.\n");
		return -EINVAL;
		}
		data->adc_conditions = pdata->adc_conditions;

		/* Check the length of array and set num_conditions */
		for (i = 0; data->adc_conditions[i].state; i++)
		;
		for (i = 0; data->adc_conditions[i].id != EXTCON_NONE; i++);
		data->num_conditions = i;

		data->chan = iio_channel_get(&pdev->dev, pdata->consumer_channel);
		@@ -158,6 +160,7 @@ static int adc_jack_probe(struct platform_device *pdev)
		if (data->wakeup_source)
		device_init_wakeup(&pdev->dev, 1);

		adc_jack_handler(&data->handler.work);
		return 0;
		}

drivers/extcon/extcon-arizona.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -183,7 +183,7 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info,
		if (clamp)
		val = ARIZONA_RMV_SHRT_HP1L;
		break;
		};
		}

		snd_soc_dapm_mutex_lock(arizona->dapm);

		@@ -1149,10 +1149,13 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
		info->micd_ranges[i].key, 0);
		input_sync(info->input);

		ret = extcon_update_state(info->edev, 0xffffffff, 0);
		for (i = 0; i < ARRAY_SIZE(arizona_cable) - 1; i++) {
		ret = extcon_set_cable_state_(info->edev,
		arizona_cable[i], false);
		if (ret != 0)
		dev_err(arizona->dev, "Removal report failed: %d\n",
		ret);
		dev_err(arizona->dev,
		"Removal report failed: %d\n", ret);
		}

		regmap_update_bits(arizona->regmap,
		ARIZONA_JACK_DETECT_DEBOUNCE,

drivers/extcon/extcon-gpio.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ static void gpio_extcon_work(struct work_struct *work)
		state = gpiod_get_value_cansleep(data->id_gpiod);
		if (data->pdata->gpio_active_low)
		state = !state;
		extcon_set_state(data->edev, state);
		extcon_set_cable_state_(data->edev, data->pdata->extcon_id, state);
		}

		static irqreturn_t gpio_irq_handler(int irq, void *dev_id)

drivers/extcon/extcon.c

+625 −149

File changed.

Preview size limit exceeded, changes collapsed.

include/linux/extcon.h

+158 −23

Original line number	Diff line number	Diff line
		@@ -28,6 +28,15 @@

		#include <linux/device.h>

		/*
		* Define the type of supported external connectors
		*/
		#define EXTCON_TYPE_USB BIT(0) /* USB connector */
		#define EXTCON_TYPE_CHG BIT(1) /* Charger connector */
		#define EXTCON_TYPE_JACK BIT(2) /* Jack connector */
		#define EXTCON_TYPE_DISP BIT(3) /* Display connector */
		#define EXTCON_TYPE_MISC BIT(4) /* Miscellaneous connector */

		/*
		* Define the unique id of supported external connectors
		*/
		@@ -44,6 +53,7 @@
		#define EXTCON_CHG_USB_ACA 8 /* Accessory Charger Adapter */
		#define EXTCON_CHG_USB_FAST 9
		#define EXTCON_CHG_USB_SLOW 10
		#define EXTCON_CHG_WPT 11 /* Wireless Power Transfer */

		/* Jack external connector */
		#define EXTCON_JACK_MICROPHONE 20
		@@ -60,6 +70,8 @@
		#define EXTCON_DISP_MHL 41 /* Mobile High-Definition Link */
		#define EXTCON_DISP_DVI 42 /* Digital Visual Interface */
		#define EXTCON_DISP_VGA 43 /* Video Graphics Array */
		#define EXTCON_DISP_DP 44 /* Display Port */
		#define EXTCON_DISP_HMD 45 /* Head-Mounted Display */

		/* Miscellaneous external connector */
		#define EXTCON_DOCK 60
		@@ -68,6 +80,74 @@

		#define EXTCON_NUM 63

		/*
		* Define the property of supported external connectors.
		*
		* When adding the new extcon property, they must have
		* the type/value/default information. Also, you have to
		* modify the EXTCON_PROP_[type]_START/END definitions
		* which mean the range of the supported properties
		* for each extcon type.
		*
		* The naming style of property
		* : EXTCON_PROP_[type]_[property name]
		*
		* EXTCON_PROP_USB_[property name] : USB property
		* EXTCON_PROP_CHG_[property name] : Charger property
		* EXTCON_PROP_JACK_[property name] : Jack property
		* EXTCON_PROP_DISP_[property name] : Display property
		*/

		/*
		* Properties of EXTCON_TYPE_USB.
		*
		* - EXTCON_PROP_USB_VBUS
		* @type: integer (intval)
		* @value: 0 (low) or 1 (high)
		* @default: 0 (low)
		* - EXTCON_PROP_USB_TYPEC_POLARITY
		* @type: integer (intval)
		* @value: 0 (normal) or 1 (flip)
		* @default: 0 (normal)
		* - EXTCON_PROP_USB_SS (SuperSpeed)
		* @type: integer (intval)
		* @value: 0 (USB/USB2) or 1 (USB3)
		* @default: 0 (USB/USB2)
		*
		*/
		#define EXTCON_PROP_USB_VBUS 0
		#define EXTCON_PROP_USB_TYPEC_POLARITY 1
		#define EXTCON_PROP_USB_SS 2

		#define EXTCON_PROP_USB_MIN 0
		#define EXTCON_PROP_USB_MAX 2
		#define EXTCON_PROP_USB_CNT (EXTCON_PROP_USB_MAX - EXTCON_PROP_USB_MIN + 1)

		/* Properties of EXTCON_TYPE_CHG. */
		#define EXTCON_PROP_CHG_MIN 50
		#define EXTCON_PROP_CHG_MAX 50
		#define EXTCON_PROP_CHG_CNT (EXTCON_PROP_CHG_MAX - EXTCON_PROP_CHG_MIN + 1)

		/* Properties of EXTCON_TYPE_JACK. */
		#define EXTCON_PROP_JACK_MIN 100
		#define EXTCON_PROP_JACK_MAX 100
		#define EXTCON_PROP_JACK_CNT (EXTCON_PROP_JACK_MAX - EXTCON_PROP_JACK_MIN + 1)

		/* Properties of EXTCON_TYPE_DISP. */
		#define EXTCON_PROP_DISP_MIN 150
		#define EXTCON_PROP_DISP_MAX 150
		#define EXTCON_PROP_DISP_CNT (EXTCON_PROP_DISP_MAX - EXTCON_PROP_DISP_MIN + 1)

		/*
		* Define the type of property's value.
		*
		* Define the property's value as union type. Because each property
		* would need the different data type to store it.
		*/
		union extcon_property_value {
		int intval; /* type : integer (intval) */
		};

		struct extcon_cable;

		/**
		@@ -150,26 +230,43 @@ extern struct extcon_dev devm_extcon_dev_allocate(struct device dev,
		extern void devm_extcon_dev_free(struct device dev, struct extcon_dev edev);

		/*
		* get/set/update_state access the 32b encoded state value, which represents
		* states of all possible cables of the multistate port. For example, if one
		* calls extcon_set_state(edev, 0x7), it may mean that all the three cables
		* are attached to the port.
		* get/set_state access each bit of the 32b encoded state value.
		* They are used to access the status of each cable based on the cable id.
		*/
		static inline u32 extcon_get_state(struct extcon_dev *edev)
		{
		return edev->state;
		}
		extern int extcon_get_state(struct extcon_dev *edev, unsigned int id);
		extern int extcon_set_state(struct extcon_dev *edev, unsigned int id,
		bool cable_state);
		extern int extcon_set_state_sync(struct extcon_dev *edev, unsigned int id,
		bool cable_state);

		extern int extcon_set_state(struct extcon_dev *edev, u32 state);
		extern int extcon_update_state(struct extcon_dev *edev, u32 mask, u32 state);
		/*
		* Synchronize the state and property data for a specific external connector.
		*/
		extern int extcon_sync(struct extcon_dev *edev, unsigned int id);

		/*
		* get/set_cable_state access each bit of the 32b encoded state value.
		* They are used to access the status of each cable based on the cable id.
		* get/set_property access the property value of each external connector.
		* They are used to access the property of each cable based on the property id.
		*/
		extern int extcon_get_cable_state_(struct extcon_dev *edev, unsigned int id);
		extern int extcon_set_cable_state_(struct extcon_dev *edev, unsigned int id,
		bool cable_state);
		extern int extcon_get_property(struct extcon_dev *edev, unsigned int id,
		unsigned int prop,
		union extcon_property_value *prop_val);
		extern int extcon_set_property(struct extcon_dev *edev, unsigned int id,
		unsigned int prop,
		union extcon_property_value prop_val);
		extern int extcon_set_property_sync(struct extcon_dev *edev, unsigned int id,
		unsigned int prop,
		union extcon_property_value prop_val);

		/*
		* get/set_property_capability set the capability of the property for each
		* external connector. They are used to set the capability of the property
		* of each external connector based on the id and property.
		*/
		extern int extcon_get_property_capability(struct extcon_dev *edev,
		unsigned int id, unsigned int prop);
		extern int extcon_set_property_capability(struct extcon_dev *edev,
		unsigned int id, unsigned int prop);

		/*
		* Following APIs are to monitor every action of a notifier.
		@@ -232,30 +329,57 @@ static inline struct extcon_dev devm_extcon_dev_allocate(struct device dev,

		static inline void devm_extcon_dev_free(struct extcon_dev *edev) { }

		static inline u32 extcon_get_state(struct extcon_dev *edev)

		static inline int extcon_get_state(struct extcon_dev *edev, unsigned int id)
		{
		return 0;
		}

		static inline int extcon_set_state(struct extcon_dev *edev, unsigned int id,
		bool cable_state)
		{
		return 0;
		}

		static inline int extcon_set_state_sync(struct extcon_dev *edev, unsigned int id,
		bool cable_state)
		{
		return 0;
		}

		static inline int extcon_set_state(struct extcon_dev *edev, u32 state)
		static inline int extcon_sync(struct extcon_dev *edev, unsigned int id)
		{
		return 0;
		}

		static inline int extcon_get_property(struct extcon_dev *edev, unsigned int id,
		unsigned int prop,
		union extcon_property_value *prop_val)
		{
		return 0;
		}
		static inline int extcon_set_property(struct extcon_dev *edev, unsigned int id,
		unsigned int prop,
		union extcon_property_value prop_val)
		{
		return 0;
		}

		static inline int extcon_update_state(struct extcon_dev *edev, u32 mask,
		u32 state)
		static inline int extcon_set_property_sync(struct extcon_dev *edev,
		unsigned int id, unsigned int prop,
		union extcon_property_value prop_val)
		{
		return 0;
		}

		static inline int extcon_get_cable_state_(struct extcon_dev *edev,
		unsigned int id)
		static inline int extcon_get_property_capability(struct extcon_dev *edev,
		unsigned int id, unsigned int prop)
		{
		return 0;
		}

		static inline int extcon_set_cable_state_(struct extcon_dev *edev,
		unsigned int id, bool cable_state)
		static inline int extcon_set_property_capability(struct extcon_dev *edev,
		unsigned int id, unsigned int prop)
		{
		return 0;
		}
		@@ -320,4 +444,15 @@ static inline int extcon_unregister_interest(struct extcon_specific_cable_nb
		{
		return -EINVAL;
		}

		static inline int extcon_get_cable_state_(struct extcon_dev *edev, unsigned int id)
		{
		return extcon_get_state(edev, id);
		}

		static inline int extcon_set_cable_state_(struct extcon_dev *edev, unsigned int id,
		bool cable_state)
		{
		return extcon_set_state_sync(edev, id, cable_state);
		}
		#endif /* __LINUX_EXTCON_H__ */