Commit 72486eb1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

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
parents ba26342a 2e01ac83

Documentation/ABI/testing/sysfs-class-power

+6 −1
Original line number Diff line number Diff line
@@ -592,7 +592,12 @@ Description: 
		the supply, for example it can show if USB-PD capable source

		is attached.



		Access: Read-Only

		Access: For power-supplies which consume USB power such

		as battery charger chips, this indicates the type of

		the connected USB power source and is Read-Only.



		For power-supplies which act as a USB power-source such as

		e.g. the UCS1002 USB Port Power Controller this is writable.



		Valid values:

			      "Unknown", "SDP", "DCP", "CDP", "ACA", "C", "PD",

Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml

+11 −0
Original line number Diff line number Diff line
@@ -37,6 +37,11 @@ properties: 
      GPIO pin (output) used to control VBUS. If skipped, no such control

      takes place.



  port:

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

    description:

      A port node to link the usb controller for the dual role switch.



required:

  - compatible

  - interrupts
@@ -58,5 +63,11 @@ examples: 
            interrupt-parent = <&msmgpio>;

            interrupts = <78 IRQ_TYPE_LEVEL_HIGH>;

            vbus-gpios = <&msmgpio 148 GPIO_ACTIVE_HIGH>;



            port {

                endpoint {

                    remote-endpoint = <&usb1_drd_sw>;

                };

            };

        };

    };

Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
USB GPIO Extcon device



This is a virtual device used to generate USB cable states from the USB ID pin

connected to a GPIO pin.



Required properties:

- compatible: Should be "linux,extcon-usb-gpio"



Either one of id-gpio or vbus-gpio must be present. Both can be present as well.

- id-gpio: gpio for USB ID pin. See gpio binding.

- vbus-gpio: gpio for USB VBUS pin.



Example: Examples of extcon-usb-gpio node in dra7-evm.dts as listed below:

	extcon_usb1 {

		compatible = "linux,extcon-usb-gpio";

		id-gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>;

	}



	&omap_dwc3_1 {

		extcon = <&extcon_usb1>;

	};

Documentation/devicetree/bindings/extcon/linux,extcon-usb-gpio.yaml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/extcon/linux,extcon-usb-gpio.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: USB GPIO Extcon device



maintainers:

  - Frank Li <Frank.Li@nxp.com>



description:

  This is a virtual device used to generate USB cable states from the USB ID pin

  connected to a GPIO pin.



properties:

  compatible:

    const: linux,extcon-usb-gpio



  id-gpios:

    description: gpio for USB ID pin. See gpio binding.

  vbus-gpios:

    description: gpio for USB VBUS pin.



required:

  - compatible



additionalProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>



    extcon_usb1 {

        compatible = "linux,extcon-usb-gpio";

        id-gpios = <&gpio6 1 GPIO_ACTIVE_HIGH>;

    };

drivers/extcon/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -75,6 +75,17 @@ config EXTCON_INTEL_MRFLD 
	  Say Y here to enable extcon support for charger detection / control

	  on the Intel Merrifield Basin Cove PMIC.



config EXTCON_LC824206XA

	tristate "LC824206XA extcon Support"

	depends on I2C

	depends on POWER_SUPPLY

	help

	  Say Y here to enable support for the ON Semiconductor LC824206XA

	  microUSB switch and accessory detector chip. The LC824206XA is a USB

	  port accessory detector and switch. The LC824206XA is fully controlled

	  using I2C and enables USB data, stereo and mono audio, video,

	  microphone and UART data to use a common connector port.



config EXTCON_MAX14577

	tristate "Maxim MAX14577/77836 EXTCON Support"

	depends on MFD_MAX14577