Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+14 -11
-6
drivers/extcon/extcon-fsa9480.c
··· 324 324 return 0; 325 325 } 326 326 327 - static int fsa9480_remove(struct i2c_client *client) 328 - { 329 - return 0; 330 - } 331 - 332 327 #ifdef CONFIG_PM_SLEEP 333 328 static int fsa9480_suspend(struct device *dev) 334 329 { ··· 371 376 .of_match_table = fsa9480_of_match, 372 377 }, 373 378 .probe = fsa9480_probe, 374 - .remove = fsa9480_remove, 375 379 .id_table = fsa9480_id, 376 380 }; 377 381
+1 -1
drivers/extcon/extcon-palmas.c
··· 107 107 (id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) { 108 108 palmas_usb->linkstat = PALMAS_USB_STATE_ID; 109 109 extcon_set_state_sync(edev, EXTCON_USB_HOST, true); 110 - dev_dbg(palmas_usb->dev, " USB-HOST cable is attached\n"); 110 + dev_dbg(palmas_usb->dev, "USB-HOST cable is attached\n"); 111 111 } 112 112 113 113 return IRQ_HANDLED;
-1
drivers/extcon/extcon-rt8973a.c
··· 192 192 .name = "rt8973a", 193 193 .status_base = RT8973A_REG_INT1, 194 194 .mask_base = RT8973A_REG_INTM1, 195 - .mask_invert = false, 196 195 .num_regs = 2, 197 196 .irqs = rt8973a_irqs, 198 197 .num_irqs = ARRAY_SIZE(rt8973a_irqs),
-2
drivers/extcon/extcon-sm5502.c
··· 227 227 .name = "sm5502", 228 228 .status_base = SM5502_REG_INT1, 229 229 .mask_base = SM5502_REG_INTMASK1, 230 - .mask_invert = false, 231 230 .num_regs = 2, 232 231 .irqs = sm5502_irqs, 233 232 .num_irqs = ARRAY_SIZE(sm5502_irqs), ··· 275 276 .name = "sm5504", 276 277 .status_base = SM5502_REG_INT1, 277 278 .mask_base = SM5502_REG_INTMASK1, 278 - .mask_invert = false, 279 279 .num_regs = 2, 280 280 .irqs = sm5504_irqs, 281 281 .num_irqs = ARRAY_SIZE(sm5504_irqs),
+11 -1
drivers/extcon/extcon.c
··· 167 167 .id = EXTCON_DISP_HMD, 168 168 .name = "HMD", 169 169 }, 170 + [EXTCON_DISP_CVBS] = { 171 + .type = EXTCON_TYPE_DISP, 172 + .id = EXTCON_DISP_CVBS, 173 + .name = "CVBS", 174 + }, 175 + [EXTCON_DISP_EDP] = { 176 + .type = EXTCON_TYPE_DISP, 177 + .id = EXTCON_DISP_EDP, 178 + .name = "EDP", 179 + }, 170 180 171 181 /* Miscellaneous external connector */ 172 182 [EXTCON_DOCK] = { ··· 257 247 { 258 248 int i; 259 249 260 - /* Find the the index of extcon cable in edev->supported_cable */ 250 + /* Find the index of extcon cable in edev->supported_cable */ 261 251 for (i = 0; i < edev->max_supported; i++) { 262 252 if (edev->supported_cable[i] == id) 263 253 return i;
+2
include/linux/extcon.h
··· 76 76 #define EXTCON_DISP_VGA 43 /* Video Graphics Array */ 77 77 #define EXTCON_DISP_DP 44 /* Display Port */ 78 78 #define EXTCON_DISP_HMD 45 /* Head-Mounted Display */ 79 + #define EXTCON_DISP_CVBS 46 /* Composite Video Broadcast Signal */ 80 + #define EXTCON_DISP_EDP 47 /* Embedded Display Port */ 79 81 80 82 /* Miscellaneous external connector */ 81 83 #define EXTCON_DOCK 60