Skip to content

Commit 48e3210

Browse files
committed
Merge tag 'extcon-next-for-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next
Chanwoo writes: Update extcon next for v6.6 Detailed description for this pull request: - Remove unused deprecated exported function : extcon_register_interest/extcon_unregister_interest are replaced with extcon_register_notifier/extcon_unregister_notifier. - Add missing property for extcon max77843 / sm5502 devicectree binding doc : max77843 / sm5502 extcon driver uses the 'schemas/connector/usb-connector.yaml' for device binding. So add the missing property information. - Add mising POWER_SUPPLY config depencenty to extcon-intel-cht-wc.c in order to remove build error. * tag 'extcon-next-for-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon: extcon: cht_wc: add POWER_SUPPLY dependency dt-bindings: extcon: siliconmitus,sm5502-muic: document connector dt-bindings: extcon: maxim,max77843: restrict connector properties extcon: Remove unused inline functions
2 parents 5bb5117 + d20a3a8 commit 48e3210

4 files changed

Lines changed: 6 additions & 12 deletions

File tree

Documentation/devicetree/bindings/extcon/maxim,max77843.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ properties:
2323

2424
connector:
2525
$ref: /schemas/connector/usb-connector.yaml#
26+
unevaluatedProperties: false
2627

2728
ports:
2829
$ref: /schemas/graph.yaml#/properties/ports

Documentation/devicetree/bindings/extcon/siliconmitus,sm5502-muic.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ properties:
2727
description: I2C slave address of the device. Usually 0x25 for SM5502
2828
and SM5703, 0x14 for SM5504.
2929

30+
connector:
31+
$ref: /schemas/connector/usb-connector.yaml#
32+
unevaluatedProperties: false
33+
3034
interrupts:
3135
maxItems: 1
3236

drivers/extcon/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ config EXTCON_INTEL_CHT_WC
6262
tristate "Intel Cherrytrail Whiskey Cove PMIC extcon driver"
6363
depends on INTEL_SOC_PMIC_CHTWC
6464
depends on USB_SUPPORT
65+
depends on POWER_SUPPLY
6566
select USB_ROLE_SWITCH
6667
help
6768
Say Y here to enable extcon support for charger detection / control

include/linux/extcon.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -328,16 +328,4 @@ struct extcon_specific_cable_nb {
328328
struct extcon_dev *edev;
329329
unsigned long previous_value;
330330
};
331-
332-
static inline int extcon_register_interest(struct extcon_specific_cable_nb *obj,
333-
const char *extcon_name, const char *cable_name,
334-
struct notifier_block *nb)
335-
{
336-
return -EINVAL;
337-
}
338-
339-
static inline int extcon_unregister_interest(struct extcon_specific_cable_nb *obj)
340-
{
341-
return -EINVAL;
342-
}
343331
#endif /* __LINUX_EXTCON_H__ */

0 commit comments

Comments
 (0)