Commit 701a9c80 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-5.6-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/whatever driver changes for 5.6-rc1

  Included in here are loads of things from a variety of different
  driver subsystems:
   - soundwire updates
   - binder updates
   - nvmem updates
   - firmware drivers updates
   - extcon driver updates
   - various misc driver updates
   - fpga driver updates
   - interconnect subsystem and driver updates
   - bus driver updates
   - uio driver updates
   - mei driver updates
   - w1 driver cleanups
   - various other small driver updates

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (86 commits)
  mei: me: add jasper point DID
  char: hpet: Use flexible-array member
  binder: fix log spam for existing debugfs file creation.
  mei: me: add comet point (lake) H device ids
  nvmem: add QTI SDAM driver
  dt-bindings: nvmem: add binding for QTI SPMI SDAM
  dt-bindings: imx-ocotp: Add i.MX8MP compatible
  dt-bindings: soundwire: fix example
  soundwire: cadence: fix kernel-doc parameter descriptions
  soundwire: intel: report slave_ids for each link to SOF driver
  siox: Use the correct style for SPDX License Identifier
  w1: omap-hdq: Simplify driver with PM runtime autosuspend
  firmware: stratix10-svc: Remove unneeded semicolon
  firmware: google: Probe for a GSMI handler in firmware
  firmware: google: Unregister driver_info on failure and exit in gsmi
  firmware: google: Release devices before unregistering the bus
  slimbus: qcom: add missed clk_disable_unprepare in remove
  slimbus: Use the correct style for SPDX License Identifier
  slimbus: qcom-ngd-ctrl: Use dma_request_chan() instead dma_request_slave_channel()
  dt-bindings: SLIMBus: add slim devices optional properties
  ...
parents 975f9ce9 0db4a15d

Documentation/devicetree/bindings/interconnect/qcom,msm8916.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/interconnect/qcom,msm8916.yaml#

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



title: Qualcomm MSM8916 Network-On-Chip interconnect



maintainers:

  - Georgi Djakov <georgi.djakov@linaro.org>



description: |

   The Qualcomm MSM8916 interconnect providers support adjusting the

   bandwidth requirements between the various NoC fabrics.



properties:

  compatible:

    enum:

      - qcom,msm8916-bimc

      - qcom,msm8916-pcnoc

      - qcom,msm8916-snoc



  reg:

    maxItems: 1



  '#interconnect-cells':

    const: 1



  clock-names:

    items:

      - const: bus

      - const: bus_a



  clocks:

    items:

      - description: Bus Clock

      - description: Bus A Clock



required:

  - compatible

  - reg

  - '#interconnect-cells'

  - clock-names

  - clocks



additionalProperties: false



examples:

  - |

      #include <dt-bindings/clock/qcom,rpmcc.h>



      bimc: interconnect@400000 {

              compatible = "qcom,msm8916-bimc";

              reg = <0x00400000 0x62000>;

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a";

              clocks = <&rpmcc RPM_SMD_BIMC_CLK>,

                       <&rpmcc RPM_SMD_BIMC_A_CLK>;

      };



      pcnoc: interconnect@500000 {

              compatible = "qcom,msm8916-pcnoc";

              reg = <0x00500000 0x11000>;

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a";

              clocks = <&rpmcc RPM_SMD_PCNOC_CLK>,

                       <&rpmcc RPM_SMD_PCNOC_A_CLK>;

      };



      snoc: interconnect@580000 {

              compatible = "qcom,msm8916-snoc";

              reg = <0x00580000 0x14000>;

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a";

              clocks = <&rpmcc RPM_SMD_SNOC_CLK>,

                       <&rpmcc RPM_SMD_SNOC_A_CLK>;

      };

Documentation/devicetree/bindings/nvmem/imx-ocotp.txt

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Freescale i.MX6 On-Chip OTP Controller (OCOTP) device tree bindings 


This binding represents the on-chip eFuse OTP controller found on

i.MX6Q/D, i.MX6DL/S, i.MX6SL, i.MX6SX, i.MX6UL, i.MX6ULL/ULZ, i.MX6SLL,

i.MX7D/S, i.MX7ULP, i.MX8MQ, i.MX8MM and i.MX8MN SoCs.

i.MX7D/S, i.MX7ULP, i.MX8MQ, i.MX8MM, i.MX8MN and i.MX8MP SoCs.



Required properties:

- compatible: should be one of
@@ -17,6 +17,7 @@ Required properties: 
	"fsl,imx8mq-ocotp" (i.MX8MQ),

	"fsl,imx8mm-ocotp" (i.MX8MM),

	"fsl,imx8mn-ocotp" (i.MX8MN),

	"fsl,imx8mp-ocotp" (i.MX8MP),

	followed by "syscon".

- #address-cells : Should be 1

- #size-cells : Should be 1

Documentation/devicetree/bindings/nvmem/qcom,spmi-sdam.yaml

0 → 100644
+84 −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/nvmem/qcom,spmi-sdam.yaml#

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



title: Qualcomm Technologies, Inc. SPMI SDAM DT bindings



maintainers:

  - Shyam Kumar Thella <sthella@codeaurora.org>



description: |

  The SDAM provides scratch register space for the PMIC clients. This

  memory can be used by software to store information or communicate

  to/from the PBUS.



allOf:

  - $ref: "nvmem.yaml#"



properties:

  compatible:

    enum:

      - qcom,spmi-sdam



  reg:

    maxItems: 1



  "#address-cells":

    const: 1



  "#size-cells":

    const: 1



  ranges: true



required:

  - compatible

  - reg

  - ranges



patternProperties:

  "^.*@[0-9a-f]+$":

    type: object



    properties:

      reg:

        maxItems: 1

        description:

          Offset and size in bytes within the storage device.



      bits:

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

        maxItems: 1

        items:

          items:

            - minimum: 0

              maximum: 7

              description:

                Offset in bit within the address range specified by reg.

            - minimum: 1

              description:

                Size in bit within the address range specified by reg.



    required:

      - reg



    additionalProperties: false



examples:

  - |

      sdam_1: nvram@b000 {

          #address-cells = <1>;

          #size-cells = <1>;

          compatible = "qcom,spmi-sdam";

          reg = <0xb000 0x100>;

          ranges = <0 0xb000 0x100>;



          /* Data cells */

          restart_reason: restart@50 {

              reg = <0x50 0x1>;

              bits = <6 2>;

          };

      };

...

Documentation/devicetree/bindings/slimbus/bus.txt

+10 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ Required property for SLIMbus child node if it is present: 
	 	  Product Code, shall be in lower case hexadecimal with leading

		  zeroes suppressed



Optional property for SLIMbus child node if it is present:

- slim-ifc-dev	- Should be phandle to SLIMBus Interface device.

		  Required for devices which deal with streams.



SLIMbus example for Qualcomm's slimbus manager component:



	slim@28080000 {
@@ -43,8 +47,14 @@ SLIMbus example for Qualcomm's slimbus manager component: 
		#address-cells = <2>;

		#size-cell = <0>;



		codec_ifd: ifd@0,0{

			compatible = "slim217,60";

			reg = <0 0>;

		};



		codec: wcd9310@1,0{

			compatible = "slim217,60";

			reg = <1 0>;

			slim-ifc-dev  = <&codec_ifd>;

		};

	};

Documentation/devicetree/bindings/soundwire/qcom,sdw.txt

0 → 100644
+167 −0
Original line number Diff line number Diff line 
Qualcomm SoundWire Controller Bindings





This binding describes the Qualcomm SoundWire Controller along with its

board specific bus parameters.



- compatible:

	Usage: required

	Value type: <stringlist>

	Definition: must be "qcom,soundwire-v<MAJOR>.<MINOR>.<STEP>",

		    Example:

			"qcom,soundwire-v1.3.0"

			"qcom,soundwire-v1.5.0"

			"qcom,soundwire-v1.6.0"

- reg:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: the base address and size of SoundWire controller

		    address space.



- interrupts:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: should specify the SoundWire Controller IRQ



- clock-names:

	Usage: required

	Value type: <stringlist>

	Definition: should be "iface" for SoundWire Controller interface clock



- clocks:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: should specify the SoundWire Controller interface clock



- #sound-dai-cells:

	Usage: required

	Value type: <u32>

	Definition: must be 1 for digital audio interfaces on the controller.



- qcom,dout-ports:

	Usage: required

	Value type: <u32>

	Definition: must be count of data out ports



- qcom,din-ports:

	Usage: required

	Value type: <u32>

	Definition: must be count of data in ports



- qcom,ports-offset1:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: should specify payload transport window offset1 of each

		    data port. Out ports followed by In ports.

		    More info in MIPI Alliance SoundWire 1.0 Specifications.



- qcom,ports-offset2:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: should specify payload transport window offset2 of each

		    data port. Out ports followed by In ports.

		    More info in MIPI Alliance SoundWire 1.0 Specifications.



- qcom,ports-sinterval-low:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: should be sample interval low of each data port.

		    Out ports followed by In ports. Used for Sample Interval

		    calculation.

		    More info in MIPI Alliance SoundWire 1.0 Specifications.



- qcom,ports-word-length:

	Usage: optional

	Value type: <prop-encoded-array>

	Definition: should be size of payload channel sample.

		    More info in MIPI Alliance SoundWire 1.0 Specifications.



- qcom,ports-block-pack-mode:

	Usage: optional

	Value type: <prop-encoded-array>

	Definition: should be 0 or 1 to indicate the block packing mode.

		    0 to indicate Blocks are per Channel

		    1 to indicate Blocks are per Port.

		    Out ports followed by In ports.

		    More info in MIPI Alliance SoundWire 1.0 Specifications.



- qcom,ports-block-group-count:

	Usage: optional

	Value type: <prop-encoded-array>

	Definition: should be in range 1 to 4 to indicate how many sample

		    intervals are combined into a payload.

		    Out ports followed by In ports.

		    More info in MIPI Alliance SoundWire 1.0 Specifications.



- qcom,ports-lane-control:

	Usage: optional

	Value type: <prop-encoded-array>

	Definition: should be in range 0 to 7 to identify which	data lane

		    the data port uses.

		    Out ports followed by In ports.

		    More info in MIPI Alliance SoundWire 1.0 Specifications.



- qcom,ports-hstart:

	Usage: optional

	Value type: <prop-encoded-array>

	Definition: should be number identifying lowerst numbered coloum in

		    SoundWire Frame, i.e. left edge of the Transport sub-frame

		    for each port. Values between 0 and 15 are valid.

		    Out ports followed by In ports.

		    More info in MIPI Alliance SoundWire 1.0 Specifications.



- qcom,ports-hstop:

	Usage: optional

	Value type: <prop-encoded-array>

	Definition: should be number identifying highest numbered coloum in

		    SoundWire Frame, i.e. the right edge of the Transport

		    sub-frame for each port. Values between 0 and 15 are valid.

		    Out ports followed by In ports.

		    More info in MIPI Alliance SoundWire 1.0 Specifications.



- qcom,dports-type:

	Usage: optional

	Value type: <prop-encoded-array>

	Definition: should be one of the following types

		    0 for reduced port

		    1 for simple ports

		    2 for full port

		    Out ports followed by In ports.

		    More info in MIPI Alliance SoundWire 1.0 Specifications.



Note:

	More Information on detail of encoding of these fields can be

found in MIPI Alliance SoundWire 1.0 Specifications.



= SoundWire devices

Each subnode of the bus represents SoundWire device attached to it.

The properties of these nodes are defined by the individual bindings.



= EXAMPLE

The following example represents a SoundWire controller on DB845c board

which has controller integrated inside WCD934x codec on SDM845 SoC.



soundwire: soundwire@c85 {

	compatible = "qcom,soundwire-v1.3.0";

	reg = <0xc85 0x20>;

	interrupts = <20 IRQ_TYPE_EDGE_RISING>;

	clocks = <&wcc>;

	clock-names = "iface";

	#sound-dai-cells = <1>;

	qcom,dports-type = <0>;

	qcom,dout-ports	= <6>;

	qcom,din-ports	= <2>;

	qcom,ports-sinterval-low = /bits/ 8  <0x07 0x1F 0x3F 0x7 0x1F 0x3F 0x0F 0x0F>;

	qcom,ports-offset1 = /bits/ 8 <0x01 0x02 0x0C 0x6 0x12 0x0D 0x07 0x0A >;

	qcom,ports-offset2 = /bits/ 8 <0x00 0x00 0x1F 0x00 0x00 0x1F 0x00 0x00>;



	/* Left Speaker */

	left{

		....

	};



	/* Right Speaker */

	right{

		....

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE