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

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

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
parents 5bb5117b d20a3a8a

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

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 


  connector:

    $ref: /schemas/connector/usb-connector.yaml#

    unevaluatedProperties: false



  ports:

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

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

+4 −0
Original line number Diff line number Diff line
@@ -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

drivers/extcon/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

include/linux/extcon.h

+0 −12
Original line number Diff line number Diff line
@@ -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__ */