Commit f2ad904e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-drivers-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull SoC driver updates from Arnd Bergmann:
 "These are changes to SoC specific drivers and DT bindings that don't
  have a separate subsystem tree, or that get grouped here for
  simplicity.

  Nothing out of the ordinary for the 6.14 release here:

   - Most of the updates are for Qualcomm specific drivers, adding
     support for additional SoCs in the exssting drivers, and support
     for wrapped encryption key access in the SCM firmware.

   - The Arm SCMI firmware code gains support for having multiple
     instances of firmware running, and better module auto loading.

   - A few minor updates for litex, samsung, ti, tegra, mediatek, imx
     and renesas platforms.

   - Reset controller updates for amlogic, to add support for the A1 soc
     and clean up the existing code.

   - Memory controller updates for ti davinci aemif, refactoring the
     code and adding a few interfaces to other drivers"

* tag 'soc-drivers-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (58 commits)
  drivers/soc/litex: Use devm_register_restart_handler()
  reset: amlogic: aux: drop aux registration helper
  reset: amlogic: aux: get regmap through parent device
  reset: amlogic: add support for A1 SoC in auxiliary reset driver
  dt-bindings: reset: add bindings for A1 SoC audio reset controller
  soc/tegra: fuse: Update Tegra234 nvmem keepout list
  soc/tegra: Fix spelling error in tegra234_lookup_slave_timeout()
  soc/tegra: cbb: Drop unnecessary debugfs error handling
  firmware: qcom: scm: add calls for wrapped key support
  soc: qcom: pd_mapper: Add SM7225 compatible
  dt-bindings: firmware: qcom,scm: Document ipq5424 SCM
  soc: qcom: llcc: Update configuration data for IPQ5424
  dt-bindings: cache: qcom,llcc: Add IPQ5424 compatible
  soc: mediatek: mtk-devapc: Fix leaking IO map on driver remove
  soc: mediatek: mtk-devapc: Fix leaking IO map on error paths
  firmware: qcom: scm: smc: Narrow 'mempool' variable scope
  firmware: qcom: scm: smc: Handle missing SCM device
  firmware: qcom: scm: Cleanup global '__scm' on probe failures
  firmware: qcom: scm: Fix missing read barrier in qcom_scm_get_tzmem_pool()
  firmware: qcom: scm: Fix missing read barrier in qcom_scm_is_available()
  ...
parents f1020392 9ec80025

Documentation/devicetree/bindings/cache/qcom,llcc.yaml

+18 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ description: | 
properties:

  compatible:

    enum:

      - qcom,ipq5424-llcc

      - qcom,qcs615-llcc

      - qcom,qcs8300-llcc

      - qcom,qdu1000-llcc
@@ -42,11 +43,11 @@ properties: 
      - qcom,x1e80100-llcc



  reg:

    minItems: 2

    minItems: 1

    maxItems: 10



  reg-names:

    minItems: 2

    minItems: 1

    maxItems: 10



  interrupts:
@@ -66,6 +67,21 @@ required: 
  - reg-names



allOf:

  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,ipq5424-llcc

    then:

      properties:

        reg:

          items:

            - description: LLCC0 base register region

        reg-names:

          items:

            - const: llcc0_base



  - if:

      properties:

        compatible:

Documentation/devicetree/bindings/firmware/qcom,scm.yaml

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
          - qcom,scm-ipq4019

          - qcom,scm-ipq5018

          - qcom,scm-ipq5332

          - qcom,scm-ipq5424

          - qcom,scm-ipq6018

          - qcom,scm-ipq806x

          - qcom,scm-ipq8074
@@ -42,6 +43,7 @@ properties: 
          - qcom,scm-msm8996

          - qcom,scm-msm8998

          - qcom,scm-qcm2290

          - qcom,scm-qcs615

          - qcom,scm-qcs8300

          - qcom,scm-qdu1000

          - qcom,scm-sa8255p

Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
      - items:

          - enum:

              - qcom,qcm2290-cpu-bwmon

              - qcom,qcs615-cpu-bwmon

              - qcom,qcs8300-cpu-bwmon

              - qcom,sa8775p-cpu-bwmon

              - qcom,sc7180-cpu-bwmon
@@ -41,6 +42,7 @@ properties: 
          - const: qcom,sdm845-bwmon    # BWMON v4, unified register space

      - items:

          - enum:

              - qcom,qcs615-llcc-bwmon

              - qcom,qcs8300-llcc-bwmon

              - qcom,sa8775p-llcc-bwmon

              - qcom,sc7180-llcc-bwmon

Documentation/devicetree/bindings/soc/qcom/qcom,aoss-qmp.yaml

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ properties: 
  compatible:

    items:

      - enum:

          - qcom,qcs615-aoss-qmp

          - qcom,qcs8300-aoss-qmp

          - qcom,qdu1000-aoss-qmp

          - qcom,sa8255p-aoss-qmp

Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ properties: 


  samsung,mode:

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

    enum: [0, 1, 2, 3]

    description:

      Selects USI function (which serial protocol to use). Refer to

      <include/dt-bindings/soc/samsung,exynos-usi.h> for valid USI mode values.