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

Merge 5.15-rc5 into usb-next 



We need the USB fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents c326d3ed 64570fbc

CREDITS

+1 −0
Original line number Diff line number Diff line
@@ -971,6 +971,7 @@ D: PowerPC 
N: Daniel Drake

E: dsd@gentoo.org

D: USBAT02 CompactFlash support in usb-storage

D: ZD1211RW wireless driver

S: UK



N: Oleg Drokin

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -1266,7 +1266,7 @@ 
			The VGA and EFI output is eventually overwritten by

			the real console.



			The xen output can only be used by Xen PV guests.

			The xen option can only be used in Xen domains.



			The sclp output can only be used on s390.

Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml

+0 −2
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ properties: 
              data-lanes:

                description: array of physical DSI data lane indexes.

                minItems: 1

                maxItems: 4

                items:

                  - const: 1

                  - const: 2
@@ -71,7 +70,6 @@ properties: 
              data-lanes:

                description: array of physical DSI data lane indexes.

                minItems: 1

                maxItems: 4

                items:

                  - const: 1

                  - const: 2

Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ properties: 
    const: ti,sn65dsi86



  reg:

    const: 0x2d

    enum: [ 0x2c, 0x2d ]



  enable-gpios:

    maxItems: 1

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

+42 −4
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ properties: 


  clocks:

    minItems: 1

    maxItems: 3

    maxItems: 7



  clock-names:

    minItems: 1

    maxItems: 3

    maxItems: 7



required:

  - compatible
@@ -72,6 +72,32 @@ allOf: 
          contains:

            enum:

              - qcom,sdm660-a2noc

    then:

      properties:

        clocks:

          items:

            - description: Bus Clock.

            - description: Bus A Clock.

            - description: IPA Clock.

            - description: UFS AXI Clock.

            - description: Aggregate2 UFS AXI Clock.

            - description: Aggregate2 USB3 AXI Clock.

            - description: Config NoC USB2 AXI Clock.

        clock-names:

          items:

            - const: bus

            - const: bus_a

            - const: ipa

            - const: ufs_axi

            - const: aggre2_ufs_axi

            - const: aggre2_usb3_axi

            - const: cfg_noc_usb2_axi



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sdm660-bimc

              - qcom,sdm660-cnoc

              - qcom,sdm660-gnoc
@@ -91,6 +117,7 @@ examples: 
  - |

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

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

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



      bimc: interconnect@1008000 {

              compatible = "qcom,sdm660-bimc";
@@ -123,9 +150,20 @@ examples: 
              compatible = "qcom,sdm660-a2noc";

              reg = <0x01704000 0xc100>;

              #interconnect-cells = <1>;

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

              clock-names = "bus",

                            "bus_a",

                            "ipa",

                            "ufs_axi",

                            "aggre2_ufs_axi",

                            "aggre2_usb3_axi",

                            "cfg_noc_usb2_axi";

              clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>,

                       <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>;

                       <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>,

                       <&rpmcc RPM_SMD_IPA_CLK>,

                       <&gcc GCC_UFS_AXI_CLK>,

                       <&gcc GCC_AGGRE2_UFS_AXI_CLK>,

                       <&gcc GCC_AGGRE2_USB3_AXI_CLK>,

                       <&gcc GCC_CFG_NOC_USB2_AXI_CLK>;

      };



      mnoc: interconnect@1745000 {