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

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

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

Chanwoo writes:

Update extcon next for v5.20

Detailed description for this pull request:
1. Add new connector type of both EXTCON_DISP_CVBS and EXTCON_DISP_EDP
- Add both EXTCON_DISP_CVBS for Composite Video Broadcast Signal[1] and
  EXTCON_DISP_EDP for Embedded Display Port[2].
  [1] https://en.wikipedia.org/wiki/Composite_video
  [2] https://en.wikipedia.org/wiki/DisplayPort#eDP

2. Fix the minor issues of extcon provider driver
- Drop unused remove function on extcon-fsa9480.c
- Remove extraneous space before a debug message on extcon-palmas.c
- Remove duplicate word in the comment
- Drop useless mask_invert flag on irqchip on extcon-sm5502.c
- Drop useless mask_invert flag on irqchip on extcon-rt8973a.c

* tag 'extcon-next-for-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon:
  extcon: Add EXTCON_DISP_CVBS and EXTCON_DISP_EDP
  extcon: rt8973a: Drop useless mask_invert flag on irqchip
  extcon: sm5502: Drop useless mask_invert flag on irqchip
  extcon: Drop unexpected word "the" in the comments
  extcon: Remove extraneous space before a debug message
  extcon: fsa9480: Drop no-op remove function
parents 6598a382 3a06ed80

drivers/extcon/extcon-fsa9480.c

+0 −6
Original line number Diff line number Diff line
@@ -324,11 +324,6 @@ static int fsa9480_probe(struct i2c_client *client, 
	return 0;

}



static int fsa9480_remove(struct i2c_client *client)

{

	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int fsa9480_suspend(struct device *dev)

{
@@ -376,7 +371,6 @@ static struct i2c_driver fsa9480_i2c_driver = { 
		.of_match_table = fsa9480_of_match,

	},

	.probe			= fsa9480_probe,

	.remove			= fsa9480_remove,

	.id_table		= fsa9480_id,

};

drivers/extcon/extcon-rt8973a.c

+0 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ static const struct regmap_irq_chip rt8973a_muic_irq_chip = { 
	.name			= "rt8973a",

	.status_base		= RT8973A_REG_INT1,

	.mask_base		= RT8973A_REG_INTM1,

	.mask_invert		= false,

	.num_regs		= 2,

	.irqs			= rt8973a_irqs,

	.num_irqs		= ARRAY_SIZE(rt8973a_irqs),

drivers/extcon/extcon-sm5502.c

+0 −2
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ static const struct regmap_irq_chip sm5502_muic_irq_chip = { 
	.name			= "sm5502",

	.status_base		= SM5502_REG_INT1,

	.mask_base		= SM5502_REG_INTMASK1,

	.mask_invert		= false,

	.num_regs		= 2,

	.irqs			= sm5502_irqs,

	.num_irqs		= ARRAY_SIZE(sm5502_irqs),
@@ -276,7 +275,6 @@ static const struct regmap_irq_chip sm5504_muic_irq_chip = { 
	.name			= "sm5504",

	.status_base		= SM5502_REG_INT1,

	.mask_base		= SM5502_REG_INTMASK1,

	.mask_invert		= false,

	.num_regs		= 2,

	.irqs			= sm5504_irqs,

	.num_irqs		= ARRAY_SIZE(sm5504_irqs),

drivers/extcon/extcon.c

+11 −1
Original line number Diff line number Diff line
@@ -167,6 +167,16 @@ static const struct __extcon_info { 
		.id = EXTCON_DISP_HMD,

		.name = "HMD",

	},

	[EXTCON_DISP_CVBS] = {

		.type = EXTCON_TYPE_DISP,

		.id = EXTCON_DISP_CVBS,

		.name = "CVBS",

	},

	[EXTCON_DISP_EDP] = {

		.type = EXTCON_TYPE_DISP,

		.id = EXTCON_DISP_EDP,

		.name = "EDP",

	},



	/* Miscellaneous external connector */

	[EXTCON_DOCK] = {
@@ -247,7 +257,7 @@ static int find_cable_index_by_id(struct extcon_dev *edev, const unsigned int id 
{

	int i;



	/* Find the the index of extcon cable in edev->supported_cable */

	/* Find the index of extcon cable in edev->supported_cable */

	for (i = 0; i < edev->max_supported; i++) {

		if (edev->supported_cable[i] == id)

			return i;

include/linux/extcon.h

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ 
#define EXTCON_DISP_VGA		43	/* Video Graphics Array */

#define EXTCON_DISP_DP		44	/* Display Port */

#define EXTCON_DISP_HMD		45	/* Head-Mounted Display */

#define EXTCON_DISP_CVBS	46	/* Composite Video Broadcast Signal */

#define EXTCON_DISP_EDP		47	/* Embedded Display Port */



/* Miscellaneous external connector */

#define EXTCON_DOCK		60

drivers/extcon/extcon-palmas.c

+1 −1

File changed.

Contains only whitespace changes.