Merge tag 'extcon-next-for-6.12' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next

Chanwoo writes:

Update extcon next for v6.12

Detailed description for this pull request:
- Add missing child node port on exttcon-ptn5150 binding document

- Convert extcon-usb-gpio.txt to yaml format for binding document

- Add new LC824206XA microUSB switch driver
 : Add a new driver for the ON Semiconductor LC824206XA microUSB switch and
   accessory detector chip. It has been tested on a Lenovo Yoga Tablet 2 Pro
   1380. And this driver is only used on x86/ACPI (non devicetree) devices,
   Therefor there is no devicetree bindings documentation.

- Apply immutable branch between power_supply and extcon tree for extcon-lc824206xa.c

* tag 'extcon-next-for-6.12' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon:
  extcon: lc824206xa: Fix build error of POWER_SUPPLY_PROP_USB_TYPE
  dt-bindings: extcon: convert extcon-usb-gpio.txt to yaml format
  dt-bindings: extcon: ptn5150: add child node port
  extcon: Add LC824206XA microUSB switch driver
  power: supply: Change usb_types from an array into a bitmask
  power: supply: sysfs: Move power_supply_show_enum_with_available() up
  power: supply: sysfs: Add power_supply_show_enum_with_available() helper
  power: supply: rt9467-charger: Remove "usb_type" property write support
  power: supply: ucs1002: Adjust ucs1002_set_usb_type() to accept string values
  power: supply: "usb_type" property may be written to

1 files changed, 1 insertions, 2 deletions

diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 72dc7e45c90c..910d407ebe63 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -243,8 +243,7 @@ struct power_supply_desc {
 	const char *name;
 	enum power_supply_type type;
 	u8 charge_behaviours;
-	const enum power_supply_usb_type *usb_types;
-	size_t num_usb_types;
+	u32 usb_types;
 	const enum power_supply_property *properties;
 	size_t num_properties;