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

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

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

Chanwoo writes:

Update extcon next for v6.5

Detailed description for this pull request:
1. Clean-up extcon core without any behavior changes
- Add extcon_alloc_cables/muex/groups to improve the readability
  of extcon_dev_register.

- Fix kernel doc of property and property capability fields to aovid warnings
  and add missing description of struct extcon_dev.

- Use DECLARE_BITMAP macro and sysfs_emit instead of sprintf

- Use device_match_of_node helper instead of accessing the .of_node

- Use ida_alloc/free to get the unique id for extcon device

2. Update extcon-usbc-tusb320.c to support usb_role_switch and accessory detection
- Add usb_role_switch support on extcon-usbsc-tusb320.

- Add additional accessory detection for audio/debug accessory
  and then pass the deteced accessory information to typec subsystem
  on extcon-usbsc-tusb320.c.

- Add the support of unregistration of typec port on both error handling
  and driver removal step on

3. Update extcon provider drivers (apx288/qcom-spmi-misc/palmas)
- Replace put_device with acpi_dev_put on extcon-axp288.c

- Use platform_get_irq_byname_optional for getting irq of
  usb_id and usb_vbus on extcon-qcom-spmi-misc.c.

- Remove unused of_gpio.h on extcon-palmas.c.

4. Fix the devicetree binding document
- Rename misc node name to 'usb-dect@900' on pm8941-misc.yam

- Fix usb-id and usb_vbus defintion on pm8941-misc.yaml

- Drop unneeded quotes from extcon-arizona.c devicetree documentation

* tag 'extcon-next-for-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon: (26 commits)
  dt-bindings: extcon: wlf,arizona: drop unneeded quotes
  extcon: Switch i2c drivers back to use .probe()
  extcon: Drop unneeded assignments
  extcon: Use sizeof(*pointer) instead of sizeof(type)
  extcon: Use unique number for the extcon device ID
  extcon: Remove dup device name in the message and unneeded error check
  extcon: Use dev_of_node(dev) instead of dev->of_node
  extcon: Use device_match_of_node() helper
  extcon: Amend kernel documentation of struct extcon_dev
  extcon: Use sysfs_emit() to instead of sprintf()
  extcon: Use DECLARE_BITMAP() to declare bit arrays
  extcon: Fix kernel doc of property capability fields to avoid warnings
  extcon: Fix kernel doc of property fields to avoid warnings
  extcon: usbc-tusb320: add USB_ROLE_SWITCH dependency
  extcon: usbc-tusb320: add usb_role_switch support
  extcon: usbc-tusb320: add accessory detection support
  extcon: Add extcon_alloc_groups to simplify extcon register function
  extcon: Add extcon_alloc_muex to simplify extcon register function
  extcon: Add extcon_alloc_cables to simplify extcon register function
  extcon: Remove redundant null checking for class
  ...
parents 74a81c48 94da3da9

Documentation/devicetree/bindings/extcon/qcom,pm8941-misc.yaml

+9 −5
Original line number Diff line number Diff line
@@ -27,10 +27,14 @@ properties: 


  interrupt-names:

    minItems: 1

    items:

    anyOf:

      - items:

          - const: usb_id

          - const: usb_vbus



      - items:

          - const: usb_id

      - items:

          - const: usb_vbus

required:

  - compatible

  - reg
@@ -49,7 +53,7 @@ examples: 
            interrupt-controller;

            #interrupt-cells = <4>;



            usb_id: misc@900 {

            usb_id: usb-detect@900 {

                    compatible = "qcom,pm8941-misc";

                    reg = <0x900>;

                    interrupts = <0x0 0x9 0 IRQ_TYPE_EDGE_BOTH>;

Documentation/devicetree/bindings/extcon/wlf,arizona.yaml

+7 −7
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ properties: 
      headphone detect mode to HPDETL, ARIZONA_ACCDET_MODE_HPR/2 sets it

      to HPDETR.  If this node is not included or if the value is unknown,

      then headphone detection mode is set to HPDETL.

    $ref: "/schemas/types.yaml#/definitions/uint32"

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 1

    maximum: 2
@@ -51,7 +51,7 @@ properties: 
    description:

      Additional software microphone detection debounce specified in

      milliseconds.

    $ref: "/schemas/types.yaml#/definitions/uint32"

    $ref: /schemas/types.yaml#/definitions/uint32



  wlf,micd-pol-gpio:

    description:
@@ -63,7 +63,7 @@ properties: 
    description:

      Time allowed for MICBIAS to startup prior to performing microphone

      detection, specified as per the ARIZONA_MICD_TIME_XXX defines.

    $ref: "/schemas/types.yaml#/definitions/uint32"

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 12
@@ -71,7 +71,7 @@ properties: 
    description:

      Delay between successive microphone detection measurements, specified

      as per the ARIZONA_MICD_TIME_XXX defines.

    $ref: "/schemas/types.yaml#/definitions/uint32"

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 12
@@ -79,7 +79,7 @@ properties: 
    description:

      Microphone detection hardware debounces specified as the number of

      measurements to take.

    $ref: "/schemas/types.yaml#/definitions/uint32"

    $ref: /schemas/types.yaml#/definitions/uint32

    enum: [2, 4]



  wlf,micd-timeout-ms:
@@ -97,7 +97,7 @@ properties: 
      CTIA / OMTP headsets), the field can be of variable length but

      should always be a multiple of 3 cells long, each three cell group

      represents one polarity configuration.

    $ref: "/schemas/types.yaml#/definitions/uint32-matrix"

    $ref: /schemas/types.yaml#/definitions/uint32-matrix

    items:

      items:

        - description:
@@ -119,7 +119,7 @@ properties: 
    description:

      Settings for the general purpose switch, set as one of the

      ARIZONA_GPSW_XXX defines.

    $ref: "/schemas/types.yaml#/definitions/uint32"

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 3

drivers/extcon/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ config EXTCON_USBC_TUSB320 
	tristate "TI TUSB320 USB-C extcon support"

	depends on I2C && TYPEC

	select REGMAP_I2C

	depends on USB_ROLE_SWITCH || !USB_ROLE_SWITCH

	help

	  Say Y here to enable support for USB Type C cable detection extcon

	  support using a TUSB320.

drivers/extcon/extcon-axp288.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static int axp288_extcon_probe(struct platform_device *pdev) 
		adev = acpi_dev_get_first_match_dev("INT3496", NULL, -1);

		if (adev) {

			info->id_extcon = extcon_get_extcon_dev(acpi_dev_name(adev));

			put_device(&adev->dev);

			acpi_dev_put(adev);

			if (IS_ERR(info->id_extcon))

				return PTR_ERR(info->id_extcon);

drivers/extcon/extcon-fsa9480.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static struct i2c_driver fsa9480_i2c_driver = { 
		.pm		= &fsa9480_pm_ops,

		.of_match_table = fsa9480_of_match,

	},

	.probe_new		= fsa9480_probe,

	.probe			= fsa9480_probe,

	.id_table		= fsa9480_id,

};