Commit 385903a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SoC driver updates from Arnd Bergmann:
 "The highlights for the driver support this time are

   - Qualcomm platforms gain support for the Qualcomm Secure Execution
     Environment firmware interface to access EFI variables on certain
     devices, and new features for multiple platform and firmware
     drivers.

   - Arm FF-A firmware support gains support for v1.1 specification
     features, in particular notification and memory transaction
     descriptor changes.

   - SCMI firmware support now support v3.2 features for clock and DVFS
     configuration and a new transport for Qualcomm platforms.

   - Minor cleanups and bugfixes are added to pretty much all the active
     platforms: qualcomm, broadcom, dove, ti-k3, rockchip, sifive,
     amlogic, atmel, tegra, aspeed, vexpress, mediatek, samsung and
     more.

     In particular, this contains portions of the treewide conversion to
     use __counted_by annotations and the device_get_match_data helper"

* tag 'soc-drivers-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (156 commits)
  soc: qcom: pmic_glink_altmode: Print return value on error
  firmware: qcom: scm: remove unneeded 'extern' specifiers
  firmware: qcom: scm: add a missing forward declaration for struct device
  firmware: qcom: move Qualcomm code into its own directory
  soc: samsung: exynos-chipid: Convert to platform remove callback returning void
  soc: qcom: apr: Add __counted_by for struct apr_rx_buf and use struct_size()
  soc: qcom: pmic_glink: fix connector type to be DisplayPort
  soc: ti: k3-socinfo: Avoid overriding return value
  soc: ti: k3-socinfo: Fix typo in bitfield documentation
  soc: ti: knav_qmss_queue: Use device_get_match_data()
  firmware: ti_sci: Use device_get_match_data()
  firmware: qcom: qseecom: add missing include guards
  soc/pxa: ssp: Convert to platform remove callback returning void
  soc/mediatek: mtk-mmsys: Convert to platform remove callback returning void
  soc/mediatek: mtk-devapc: Convert to platform remove callback returning void
  soc/loongson: loongson2_guts: Convert to platform remove callback returning void
  soc/litex: litex_soc_ctrl: Convert to platform remove callback returning void
  soc/ixp4xx: ixp4xx-qmgr: Convert to platform remove callback returning void
  soc/ixp4xx: ixp4xx-npe: Convert to platform remove callback returning void
  soc/hisilicon: kunpeng_hccs: Convert to platform remove callback returning void
  ...
parents c035f026 dfae9478

Documentation/devicetree/bindings/arm/cpus.yaml

+3 −1
Original line number Diff line number Diff line
@@ -309,7 +309,9 @@ properties: 
      power-domains property.



      For PSCI based platforms, the name corresponding to the index of the PSCI

      PM domain provider, must be "psci".

      PM domain provider, must be "psci". For SCMI based platforms, the name

      corresponding to the index of an SCMI performance domain provider, must be

      "perf".



  qcom,saw:

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

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

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

  compatible:

    enum:

      - qcom,qdu1000-llcc

      - qcom,sc7180-llcc

      - qcom,sc7280-llcc

      - qcom,sc8180x-llcc
@@ -44,6 +45,14 @@ properties: 
  interrupts:

    maxItems: 1



  nvmem-cells:

    items:

      - description: Reference to an nvmem node for multi channel DDR



  nvmem-cell-names:

    items:

      - const: multi-chan-ddr



required:

  - compatible

  - reg
@@ -92,6 +101,7 @@ allOf: 
        compatible:

          contains:

            enum:

              - qcom,qdu1000-llcc

              - qcom,sc8180x-llcc

              - qcom,sc8280xp-llcc

    then:

Documentation/devicetree/bindings/firmware/arm,scmi.yaml

+13 −2
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ properties: 
                     with shmem address(4KB-page, offset) as parameters

        items:

          - const: arm,scmi-smc-param

      - description: SCMI compliant firmware with Qualcomm SMC/HVC transport

        items:

          - const: qcom,scmi-smc

      - description: SCMI compliant firmware with SCMI Virtio transport.

                     The virtio transport only supports a single device.

        items:
@@ -149,9 +152,16 @@ properties: 
      '#clock-cells':

        const: 1



    required:

      '#power-domain-cells':

        const: 1



    oneOf:

      - required:

          - '#clock-cells'



      - required:

          - '#power-domain-cells'



  protocol@14:

    $ref: '#/$defs/protocol-node'

    unevaluatedProperties: false
@@ -306,6 +316,7 @@ else: 
          enum:

            - arm,scmi-smc

            - arm,scmi-smc-param

            - qcom,scmi-smc

  then:

    required:

      - arm,smc-id

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

+10 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties: 
          - qcom,scm-apq8064

          - qcom,scm-apq8084

          - qcom,scm-ipq4019

          - qcom,scm-ipq5018

          - qcom,scm-ipq5332

          - qcom,scm-ipq6018

          - qcom,scm-ipq806x
@@ -56,6 +57,7 @@ properties: 
          - qcom,scm-sm6125

          - qcom,scm-sm6350

          - qcom,scm-sm6375

          - qcom,scm-sm7150

          - qcom,scm-sm8150

          - qcom,scm-sm8250

          - qcom,scm-sm8350
@@ -89,6 +91,14 @@ properties: 
      protocol to handle sleeping SCM calls.

    maxItems: 1



  qcom,sdi-enabled:

    description:

      Indicates that the SDI (Secure Debug Image) has been enabled by TZ

      by default and it needs to be disabled.

      If not disabled WDT assertion or reboot will cause the board to hang

      in the debug mode.

    type: boolean



  qcom,dload-mode:

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

    items:

Documentation/devicetree/bindings/memory-controllers/ingenic,nemc.yaml

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ patternProperties: 
  ".*@[0-9]+$":

    type: object

    $ref: mc-peripheral-props.yaml#

    additionalProperties: true



required:

  - compatible