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

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

Merge tag 'extcon-for-3.9' of... 

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

Chanwoo writes:
	extcon: updates for v3.9

	This patchset add a few new feature of extcon-max8997
	and fix minor issue of extcon-max8997/77693.

	Update extcon-max8997 driver
	- Consolidate duplicate code
	- Set default uart/usb path for internal line of muic device
	- Set default ADC debounce time
	- Use wq to check cable state after certain delay
	- Code clean to move defined constant to header file
	- Make max8997_extcon_cable static

	Update extcon-max77693 driver
	- Make max77693_extcon_cable static
parents 19d3243e af5eb1a1

drivers/extcon/extcon-max77693.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ enum { 
	_EXTCON_CABLE_NUM,

};



const char *max77693_extcon_cable[] = {

static const char *max77693_extcon_cable[] = {

	[EXTCON_CABLE_USB]			= "USB",

	[EXTCON_CABLE_USB_HOST]			= "USB-Host",

	[EXTCON_CABLE_TA]			= "TA",

drivers/extcon/extcon-max8997.c

+492 −236

File changed.

Preview size limit exceeded, changes collapsed.

include/linux/mfd/max8997-private.h

+64 −0
Original line number Diff line number Diff line
@@ -194,6 +194,70 @@ enum max8997_muic_reg { 
	MAX8997_MUIC_REG_END		= 0xf,

};



/* MAX8997-MUIC STATUS1 register */

#define STATUS1_ADC_SHIFT		0

#define STATUS1_ADCLOW_SHIFT		5

#define STATUS1_ADCERR_SHIFT		6

#define STATUS1_ADC_MASK		(0x1f << STATUS1_ADC_SHIFT)

#define STATUS1_ADCLOW_MASK		(0x1 << STATUS1_ADCLOW_SHIFT)

#define STATUS1_ADCERR_MASK		(0x1 << STATUS1_ADCERR_SHIFT)



/* MAX8997-MUIC STATUS2 register */

#define STATUS2_CHGTYP_SHIFT		0

#define STATUS2_CHGDETRUN_SHIFT		3

#define STATUS2_DCDTMR_SHIFT		4

#define STATUS2_DBCHG_SHIFT		5

#define STATUS2_VBVOLT_SHIFT		6

#define STATUS2_CHGTYP_MASK		(0x7 << STATUS2_CHGTYP_SHIFT)

#define STATUS2_CHGDETRUN_MASK		(0x1 << STATUS2_CHGDETRUN_SHIFT)

#define STATUS2_DCDTMR_MASK		(0x1 << STATUS2_DCDTMR_SHIFT)

#define STATUS2_DBCHG_MASK		(0x1 << STATUS2_DBCHG_SHIFT)

#define STATUS2_VBVOLT_MASK		(0x1 << STATUS2_VBVOLT_SHIFT)



/* MAX8997-MUIC STATUS3 register */

#define STATUS3_OVP_SHIFT		2

#define STATUS3_OVP_MASK		(0x1 << STATUS3_OVP_SHIFT)



/* MAX8997-MUIC CONTROL1 register */

#define COMN1SW_SHIFT			0

#define COMP2SW_SHIFT			3

#define COMN1SW_MASK			(0x7 << COMN1SW_SHIFT)

#define COMP2SW_MASK			(0x7 << COMP2SW_SHIFT)

#define COMP_SW_MASK		(COMP2SW_MASK | COMN1SW_MASK)



#define CONTROL1_SW_USB			((1 << COMP2SW_SHIFT) \

						| (1 << COMN1SW_SHIFT))

#define CONTROL1_SW_AUDIO		((2 << COMP2SW_SHIFT) \

						| (2 << COMN1SW_SHIFT))

#define CONTROL1_SW_UART		((3 << COMP2SW_SHIFT) \

						| (3 << COMN1SW_SHIFT))

#define CONTROL1_SW_OPEN		((0 << COMP2SW_SHIFT) \

						| (0 << COMN1SW_SHIFT))



#define CONTROL2_LOWPWR_SHIFT		(0)

#define CONTROL2_ADCEN_SHIFT		(1)

#define CONTROL2_CPEN_SHIFT		(2)

#define CONTROL2_SFOUTASRT_SHIFT	(3)

#define CONTROL2_SFOUTORD_SHIFT		(4)

#define CONTROL2_ACCDET_SHIFT		(5)

#define CONTROL2_USBCPINT_SHIFT		(6)

#define CONTROL2_RCPS_SHIFT		(7)

#define CONTROL2_LOWPWR_MASK		(0x1 << CONTROL2_LOWPWR_SHIFT)

#define CONTROL2_ADCEN_MASK		(0x1 << CONTROL2_ADCEN_SHIFT)

#define CONTROL2_CPEN_MASK		(0x1 << CONTROL2_CPEN_SHIFT)

#define CONTROL2_SFOUTASRT_MASK		(0x1 << CONTROL2_SFOUTASRT_SHIFT)

#define CONTROL2_SFOUTORD_MASK		(0x1 << CONTROL2_SFOUTORD_SHIFT)

#define CONTROL2_ACCDET_MASK		(0x1 << CONTROL2_ACCDET_SHIFT)

#define CONTROL2_USBCPINT_MASK		(0x1 << CONTROL2_USBCPINT_SHIFT)

#define CONTROL2_RCPS_MASK		(0x1 << CONTROL2_RCPS_SHIFT)



#define CONTROL3_JIGSET_SHIFT		(0)

#define CONTROL3_BTLDSET_SHIFT		(2)

#define CONTROL3_ADCDBSET_SHIFT		(4)

#define CONTROL3_JIGSET_MASK		(0x3 << CONTROL3_JIGSET_SHIFT)

#define CONTROL3_BTLDSET_MASK		(0x3 << CONTROL3_BTLDSET_SHIFT)

#define CONTROL3_ADCDBSET_MASK		(0x3 << CONTROL3_ADCDBSET_SHIFT)



enum max8997_haptic_reg {

	MAX8997_HAPTIC_REG_GENERAL	= 0x00,

	MAX8997_HAPTIC_REG_CONF1	= 0x01,

include/linux/mfd/max8997.h

+10 −15
Original line number Diff line number Diff line
@@ -78,21 +78,6 @@ struct max8997_regulator_data { 
	struct device_node *reg_node;

};



enum max8997_muic_usb_type {

	MAX8997_USB_HOST,

	MAX8997_USB_DEVICE,

};



enum max8997_muic_charger_type {

	MAX8997_CHARGER_TYPE_NONE = 0,

	MAX8997_CHARGER_TYPE_USB,

	MAX8997_CHARGER_TYPE_DOWNSTREAM_PORT,

	MAX8997_CHARGER_TYPE_DEDICATED_CHG,

	MAX8997_CHARGER_TYPE_500MA,

	MAX8997_CHARGER_TYPE_1A,

	MAX8997_CHARGER_TYPE_DEAD_BATTERY = 7,

};



struct max8997_muic_reg_data {

	u8 addr;

	u8 data;
@@ -107,6 +92,16 @@ struct max8997_muic_reg_data { 
struct max8997_muic_platform_data {

	struct max8997_muic_reg_data *init_data;

	int num_init_data;



	/* Check cable state after certain delay */

	int detcable_delay_ms;



	/*

	 * Default usb/uart path whether UART/USB or AUX_UART/AUX_USB

	 * h/w path of COMP2/COMN1 on CONTROL1 register.

	 */

	int path_usb;

	int path_uart;

};



enum max8997_haptic_motor_type {