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

Commit 73b6ecdb authored by Chanwoo Choi's avatar Chanwoo Choi Committed by Greg Kroah-Hartman
Browse files

extcon: Redefine the unique id of supported external connectors without 'enum extcon' type 



This patch just redefine the unique id of supported external connectors without
'enum extcon' type. Because unique id would be used on devictree file(*.dts) to
indicate the specific external connectors like key number of input framework.
So, I have the plan to move this definitions to following header file which
includes the unique id of supported external connectors.
- include/dt-bindings/extcon/extcon.h

Fixes: 2a9de9c0 ("extcon: Use the unique id for external connector instead of string")
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 03cb0503

drivers/extcon/extcon-adc-jack.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
struct adc_jack_data {

	struct extcon_dev *edev;



	const char **cable_names;

	const unsigned int **cable_names;

	struct adc_jack_cond *adc_conditions;

	int num_conditions;

drivers/extcon/extcon-arizona.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static const int arizona_micd_levels[] = { 
	1257,

};



static const enum extcon arizona_cable[] = {

static const unsigned int arizona_cable[] = {

	EXTCON_MECHANICAL,

	EXTCON_MICROPHONE,

	EXTCON_HEADPHONE,
@@ -552,7 +552,7 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data) 
	struct arizona_extcon_info *info = data;

	struct arizona *arizona = info->arizona;

	int id_gpio = arizona->pdata.hpdet_id_gpio;

	enum extcon report = EXTCON_HEADPHONE;

	unsigned int report = EXTCON_HEADPHONE;

	int ret, reading;

	bool mic = false;

drivers/extcon/extcon-axp288.c

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ enum axp288_extcon_irq { 
	EXTCON_IRQ_END,

};



static const enum extcon axp288_extcon_cables[] = {

static const unsigned int axp288_extcon_cables[] = {

	EXTCON_SLOW_CHARGER,

	EXTCON_CHARGE_DOWNSTREAM,

	EXTCON_FAST_CHARGER,
@@ -157,7 +157,7 @@ static void axp288_extcon_log_rsi(struct axp288_extcon_info *info) 
static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info)

{

	static bool notify_otg, notify_charger;

	static enum extcon cable;

	static unsigned int cable;

	int ret, stat, cfg, pwr_stat;

	u8 chrg_type;

	bool vbus_attach = false;

drivers/extcon/extcon-max14577.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ enum max14577_muic_acc_type { 
	MAX14577_MUIC_ADC_OPEN,

};



static const enum extcon max14577_extcon_cable[] = {

static const unsigned int max14577_extcon_cable[] = {

	EXTCON_USB,

	EXTCON_TA,

	EXTCON_FAST_CHARGER,

drivers/extcon/extcon-max77693.c

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ enum max77693_muic_acc_type { 
/*

 * MAX77693 MUIC device support below list of accessories(external connector)

 */

static const enum extcon max77693_extcon_cable[] = {

static const unsigned int max77693_extcon_cable[] = {

	EXTCON_USB,

	EXTCON_USB_HOST,

	EXTCON_TA,
@@ -457,7 +457,7 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info, 
	int ret = 0;

	int vbvolt;

	bool cable_attached;

	enum extcon dock_id;

	unsigned int dock_id;



	dev_info(info->dev,

		"external connector is %s (adc:0x%02x)\n",