Commit 2911ed9f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char / misc driver updates from Greg KH:
 "Here is the big char/misc driver update for 5.11-rc1.

  Continuing the tradition of previous -rc1 pulls, there seems to be
  more and more tiny driver subsystems flowing through this tree.

  Lots of different things, all of which have been in linux-next for a
  while with no reported issues:

   - extcon driver updates

   - habannalab driver updates

   - mei driver updates

   - uio driver updates

   - binder fixes and features added

   - soundwire driver updates

   - mhi bus driver updates

   - phy driver updates

   - coresight driver updates

   - fpga driver updates

   - speakup driver updates

   - slimbus driver updates

   - various small char and misc driver updates"

* tag 'char-misc-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (305 commits)
  extcon: max77693: Fix modalias string
  extcon: fsa9480: Support TI TSU6111 variant
  extcon: fsa9480: Rewrite bindings in YAML and extend
  dt-bindings: extcon: add binding for TUSB320
  extcon: Add driver for TI TUSB320
  slimbus: qcom: fix potential NULL dereference in qcom_slim_prg_slew()
  siox: Make remove callback return void
  siox: Use bus_type functions for probe, remove and shutdown
  spmi: Add driver shutdown support
  spmi: fix some coding style issues at the spmi core
  spmi: get rid of a warning when built with W=1
  uio: uio_hv_generic: use devm_kzalloc() for private data alloc
  uio: uio_fsl_elbc_gpcm: use device-managed allocators
  uio: uio_aec: use devm_kzalloc() for uio_info object
  uio: uio_cif: use devm_kzalloc() for uio_info object
  uio: uio_netx: use devm_kzalloc() for or uio_info object
  uio: uio_mf624: use devm_kzalloc() for uio_info object
  uio: uio_sercos3: use device-managed functions for simple allocs
  uio: uio_dmem_genirq: finalize conversion of probe to devm_ handlers
  uio: uio_dmem_genirq: convert simple allocations to device-managed
  ...
parents 7240153a 93f99887

Documentation/ABI/testing/sysfs-driver-w1_therm

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ Users: any user space application which wants to communicate with 
		w1_term device





What:		/sys/bus/w1/devices/.../eeprom

What:		/sys/bus/w1/devices/.../eeprom_cmd

Date:		May 2020

Contact:	Akira Shimahara <akira215corp@gmail.com>

Description:

Documentation/admin-guide/spkguide.txt

+1 −0
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ spk key_slash = say_attributes 
spk key_8 = speakup_paste

shift spk key_m = say_first_char

 ctrl spk key_semicolon = say_last_char

spk key_r = read_all_doc



5.  The Speakup Sys System

Documentation/devicetree/bindings/clock/ingenic,cgu.yaml

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ required: 


patternProperties:

  "^usb-phy@[a-f0-9]+$":

    allOf: [ $ref: "../usb/ingenic,jz4770-phy.yaml#" ]

    allOf: [ $ref: "../phy/ingenic,phy-usb.yaml#" ]



additionalProperties: false

Documentation/devicetree/bindings/extcon/extcon-fsa9480.txt

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
FAIRCHILD SEMICONDUCTOR FSA9480 MICROUSB SWITCH



The FSA9480 is a USB port accessory detector and switch. The FSA9480 is fully

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

microphone, and UART data to use a common connector port.



Required properties:

 - compatible : Must be one of

   "fcs,fsa9480"

   "fcs,fsa880"

 - reg : Specifies i2c slave address. Must be 0x25.

 - interrupts : Should contain one entry specifying interrupt signal of

   interrupt parent to which interrupt pin of the chip is connected.



 Example:

	musb@25 {

		compatible = "fcs,fsa9480";

		reg = <0x25>;

		interrupt-parent = <&gph2>;

		interrupts = <7 0>;

	};

Documentation/devicetree/bindings/extcon/extcon-usbc-tusb320.yaml

0 → 100644
+41 −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/extcon-usbc-tusb320.yaml#

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



title: TI TUSB320 USB Type-C CC Logic controller



maintainers:

  - Michael Auchter <michael.auchter@ni.com>



properties:

  compatible:

    const: ti,tusb320



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts



additionalProperties: false



examples:

  - |

    i2c0 {

        #address-cells = <1>;

        #size-cells = <0>;

        tusb320@61 {

            compatible = "ti,tusb320";

            reg = <0x61>;

            interrupt-parent = <&gpio>;

            interrupts = <27 1>;

        };

    };

...

CRA Git | Maintained and supported by SUSTech CRA and CCSE