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 -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEEsSpuqBtbWtRe4rLGnM3fLN7rz1MFAmLQ1jUWHGN3MDAuY2hv aUBzYW1zdW5nLmNvbQAKCRCczd8s3uvPUw/wD/968h0OZaGcm3ToDVBnahTUqbY9 BNTPnPeIC+HugI5fBr+ecB9KLjgqhK4Qt1EGEYIs8eqHji00MBHRuOyfP++lvLQe XcApXQIVyoaBzi5HMUqrJw/aAayZnbQRi4X+oBaPzgx9pAyWQfruVJbndxlxj9a7 xAM0yPECMMRuq22GTkrdVZwT0AX5GH/Ds4j7s1vOKRBapwEuDPRBOY4MAP3cbh4u AQRFk6Y+uQPocWwYluc+U1C71KgUmmp1d8TJzcgWPGH2kXJtWeI8bGeiPND360q0 +2VxxzK94518oR0wngrQlhTkyy09vm4Jxu09CvU2C1GAx6zC3q1S52KI8/zHlI7K LP5c2r5GBPik4a6EO+rO5uFrA6JCjwlolFSoNCnjjfAGSctsCkoTKXZuNrcVp6Y/ SPQ9Ji+oygppvfVLO7GMEwKTM+g+NBn+gscmM2XLVcSHAtAJWkz0a882zgPnW/Yc T8Kjpa/mPcG7718dEy7h4/KBXTlXVmroIATHcSHCfJ9ZoLsQMoQHf5it0N90Er7L 2L7ikDe9ee9hUtUOMrDU/6mbKy8VRMMQMQhUexkrkPW2KKEbxBj0e8bezSqFB0k2 ztfXv6uC2b/naAKOO7uVs319mxACCGAtFR1ZAikuFHwZueobTOeXznhODoMk/qm8 nacNwJKUN4MPTnu7nw== =ISAl -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
e0e1824bf6
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
@ -107,7 +107,7 @@ static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
|
|||
(id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) {
|
||||
palmas_usb->linkstat = PALMAS_USB_STATE_ID;
|
||||
extcon_set_state_sync(edev, EXTCON_USB_HOST, true);
|
||||
dev_dbg(palmas_usb->dev, " USB-HOST cable is attached\n");
|
||||
dev_dbg(palmas_usb->dev, "USB-HOST cable is attached\n");
|
||||
}
|
||||
|
||||
return IRQ_HANDLED;
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue