diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-22 15:55:48 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-22 15:55:48 +0200 |
commit | 48e3210920b953f95737fcdd5bfd467735abe6bd (patch) | |
tree | 3033af182ddd1315803a8ee4b6f1263a4ac6bcf8 | |
parent | 5bb5117b14d9bb820a1f54c33be256c3470c64b3 (diff) | |
parent | d20a3a8a32e3fa564ff25da860c5fc1a97642dfe (diff) |
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
-rw-r--r-- | Documentation/devicetree/bindings/extcon/maxim,max77843.yaml | 1 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/extcon/siliconmitus,sm5502-muic.yaml | 4 | ||||
-rw-r--r-- | drivers/extcon/Kconfig | 1 | ||||
-rw-r--r-- | include/linux/extcon.h | 12 |
4 files changed, 6 insertions, 12 deletions
diff --git a/Documentation/devicetree/bindings/extcon/maxim,max77843.yaml b/Documentation/devicetree/bindings/extcon/maxim,max77843.yaml index 128960545640..55800fb0221d 100644 --- a/Documentation/devicetree/bindings/extcon/maxim,max77843.yaml +++ b/Documentation/devicetree/bindings/extcon/maxim,max77843.yaml @@ -23,6 +23,7 @@ properties: connector: $ref: /schemas/connector/usb-connector.yaml# + unevaluatedProperties: false ports: $ref: /schemas/graph.yaml#/properties/ports diff --git a/Documentation/devicetree/bindings/extcon/siliconmitus,sm5502-muic.yaml b/Documentation/devicetree/bindings/extcon/siliconmitus,sm5502-muic.yaml index 7a224b2f0977..7ef2d9bef72d 100644 --- a/Documentation/devicetree/bindings/extcon/siliconmitus,sm5502-muic.yaml +++ b/Documentation/devicetree/bindings/extcon/siliconmitus,sm5502-muic.yaml @@ -27,6 +27,10 @@ properties: description: I2C slave address of the device. Usually 0x25 for SM5502 and SM5703, 0x14 for SM5504. + connector: + $ref: /schemas/connector/usb-connector.yaml# + unevaluatedProperties: false + interrupts: maxItems: 1 diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig index 0ef1971d22bb..8de9023c2a38 100644 --- a/drivers/extcon/Kconfig +++ b/drivers/extcon/Kconfig @@ -62,6 +62,7 @@ config EXTCON_INTEL_CHT_WC tristate "Intel Cherrytrail Whiskey Cove PMIC extcon driver" depends on INTEL_SOC_PMIC_CHTWC depends on USB_SUPPORT + depends on POWER_SUPPLY select USB_ROLE_SWITCH help Say Y here to enable extcon support for charger detection / control diff --git a/include/linux/extcon.h b/include/linux/extcon.h index 3c45c3846fe9..e596a0abcb27 100644 --- a/include/linux/extcon.h +++ b/include/linux/extcon.h @@ -328,16 +328,4 @@ struct extcon_specific_cable_nb { struct extcon_dev *edev; unsigned long previous_value; }; - -static inline int extcon_register_interest(struct extcon_specific_cable_nb *obj, - const char *extcon_name, const char *cable_name, - struct notifier_block *nb) -{ - return -EINVAL; -} - -static inline int extcon_unregister_interest(struct extcon_specific_cable_nb *obj) -{ - return -EINVAL; -} #endif /* __LINUX_EXTCON_H__ */ |