Commit 8e17b16a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC driver updates from Arnd Bergmann:
 "There are few major updates in the SoC specific drivers, mainly the
  usual reworks and support for variants of the existing SoC. While this
  remains Arm centric for the most part, the branch now also contains
  updates to risc-v and loongarch specific code in drivers/soc/.

  Notable changes include:

   - Support for the newly added Qualcomm Snapdragon variants (MSM8956,
     MSM8976, SM6115, SM4250, SM8150, SA8155 and SM8550) in the soc ID,
     rpmh, rpm, spm and powerdomain drivers.

   - Documentation for the somewhat controversial qcom,board-id
     properties that are required for booting a number of machines

   - A new SoC identification driver for the loongson-2 (loongarch)
     platform

   - memory controller updates for stm32, tegra, and renesas.

   - a new DT binding to better describe LPDDR2/3/4/5 chips in the
     memory controller subsystem

   - Updates for Tegra specific drivers across multiple subsystems,
     improving support for newer SoCs and better identification

   - Minor fixes for Broadcom, Freescale, Apple, Renesas, Sifive, TI,
     Mediatek and Marvell SoC drivers"

* tag 'soc-drivers-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (137 commits)
  soc: qcom: socinfo: Add SM6115 / SM4250 SoC IDs to the soc_id table
  dt-bindings: arm: qcom,ids: Add SoC IDs for SM6115 / SM4250 and variants
  soc: qcom: socinfo: Add SM8150 and SA8155 SoC IDs to the soc_id table
  dt-bindings: arm: qcom,ids: Add SoC IDs for SM8150 and SA8155
  dt-bindings: soc: qcom: apr: document generic qcom,apr compatible
  soc: qcom: Select REMAP_MMIO for ICC_BWMON driver
  soc: qcom: Select REMAP_MMIO for LLCC driver
  soc: qcom: rpmpd: Add SM4250 support
  dt-bindings: power: rpmpd: Add SM4250 support
  dt-bindings: soc: qcom: aoss: Add compatible for SM8550
  soc: qcom: llcc: Add configuration data for SM8550
  dt-bindings: arm: msm: Add LLCC compatible for SM8550
  soc: qcom: llcc: Add v4.1 HW version support
  soc: qcom: socinfo: Add SM8550 ID
  soc: qcom: rpmh-rsc: Avoid unnecessary checks on irq-done response
  soc: qcom: rpmh-rsc: Add support for RSC v3 register offsets
  soc: qcom: rpmhpd: Add SM8550 power domains
  dt-bindings: power: rpmpd: Add SM8550 to rpmpd binding
  soc: qcom: socinfo: Add MSM8956/76 SoC IDs to the soc_id table
  dt-bindings: arm: qcom,ids: Add SoC IDs for MSM8956 and MSM8976
  ...
parents 69700db4 9379885d

Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml

+13 −1
Original line number Diff line number Diff line
@@ -32,14 +32,26 @@ properties: 
              - mediatek,mt8183-mmsys

              - mediatek,mt8186-mmsys

              - mediatek,mt8192-mmsys

              - mediatek,mt8195-mmsys

              - mediatek,mt8365-mmsys

          - const: syscon



      - description: vdosys0 and vdosys1 are 2 display HW pipelines,

                     so mt8195 binding should be deprecated.

        deprecated: true

        items:

          - const: mediatek,mt8195-mmsys

          - const: syscon



      - items:

          - const: mediatek,mt7623-mmsys

          - const: mediatek,mt2701-mmsys

          - const: syscon



      - items:

          - const: mediatek,mt8195-vdosys0

          - const: mediatek,mt8195-mmsys

          - const: syscon



  reg:

    maxItems: 1

Documentation/devicetree/bindings/arm/msm/qcom,llcc.yaml

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ properties: 
      - qcom,sm8250-llcc

      - qcom,sm8350-llcc

      - qcom,sm8450-llcc

      - qcom,sm8550-llcc



  reg:

    items:

Documentation/devicetree/bindings/arm/qcom.yaml

+120 −0
Original line number Diff line number Diff line
@@ -739,6 +739,126 @@ properties: 
              - sony,pdx223

          - const: qcom,sm8450



  # Board compatibles go above



  qcom,msm-id:

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

    minItems: 1

    maxItems: 8

    items:

      items:

        - description: |

            MSM chipset ID - an exact match value consisting of two bitfields::

             - bits 0-15  - The unique MSM chipset ID

             - bits 16-31 - Reserved; should be 0

        - description: |

            Hardware revision ID - a chipset specific 32-bit ID representing

            the version of the chipset.  It is best a match value - the

            bootloader will look for the closest possible match.

    deprecated: true

    description:

      The MSM chipset and hardware revision used Qualcomm bootloaders.  It

      can optionally be an array of these to indicate multiple hardware that

      use the same device tree.  It is expected that the bootloader will use

      this information at boot-up to decide which device tree to use when given

      multiple device trees, some of which may not be compatible with the

      actual hardware.  It is the bootloader's responsibility to pass the

      correct device tree to the kernel.

      The property is deprecated.



  qcom,board-id:

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

    minItems: 1

    maxItems: 8

    oneOf:

      - items:

          - items:

              - description: |

                  Board ID consisting of three bitfields::

                    - bits 31-24 - Unused

                    - bits 23-16 - Platform Version Major

                    - bits 15-8  - Platform Version Minor

                    - bits 7-0   - Platform Type

                  Platform Type field is an exact match value.  The

                  Platform Major/Minor field is a best match.  The bootloader will

                  look for the closest possible match.

              - description: |

                  Subtype ID unique to a Platform Type/Chipset ID.  For a given

                  Platform Type, there will typically only be a single board and the

                  subtype_id will be 0.  However in some cases board variants may

                  need to be distinguished by different subtype_id values.

      - items:

          # OnePlus uses a variant of board-id with four elements:

          - items:

              - const: 8

              - const: 0

              - description: OnePlus board ID

              - description: OnePlus subtype ID

    deprecated: true

    description:

      The board type and revision information.  It can optionally be an array

      of these to indicate multiple boards that use the same device tree.  It

      is expected that the bootloader will use this information at boot-up to

      decide which device tree to use when given multiple device trees, some of

      which may not be compatible with the actual hardware.  It is the

      bootloader's responsibility to pass the correct device tree to the

      kernel

      The property is deprecated.



allOf:

  # Explicit allow-list for older SoCs. The legacy properties are not allowed

  # on newer SoCs.

  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,apq8026

              - qcom,apq8094

              - qcom,apq8096

              - qcom,msm8992

              - qcom,msm8994

              - qcom,msm8996

              - qcom,msm8998

              - qcom,sdm630

              - qcom,sdm632

              - qcom,sdm845

              - qcom,sdx55

              - qcom,sdx65

              - qcom,sm6125

              - qcom,sm6350

              - qcom,sm7225

              - qcom,sm8150

              - qcom,sm8250

    then:

      properties:

        qcom,board-id: true

        qcom,msm-id: true

    else:

      properties:

        qcom,board-id: false

        qcom,msm-id: false



  - if:

      properties:

        compatible:

          contains:

            enum:

              - oneplus,cheeseburger

              - oneplus,dumpling

              - oneplus,enchilada

              - oneplus,fajita

    then:

      properties:

        qcom,board-id:

          items:

            minItems: 4

    else:

      properties:

        qcom,board-id:

          items:

            maxItems: 2



additionalProperties: true



...

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

+3 −0
Original line number Diff line number Diff line
@@ -41,12 +41,14 @@ properties: 
          - qcom,scm-sc7180

          - qcom,scm-sc7280

          - qcom,scm-sc8280xp

          - qcom,scm-sdm670

          - qcom,scm-sdm845

          - qcom,scm-sdx55

          - qcom,scm-sdx65

          - qcom,scm-sm6115

          - qcom,scm-sm6125

          - qcom,scm-sm6350

          - qcom,scm-sm6375

          - qcom,scm-sm8150

          - qcom,scm-sm8250

          - qcom,scm-sm8350
@@ -88,6 +90,7 @@ allOf: 
              - qcom,scm-apq8064

              - qcom,scm-msm8660

              - qcom,scm-msm8960

              - qcom,scm-sm6375

    then:

      properties:

        clock-names:

Documentation/devicetree/bindings/hwinfo/loongson,ls2k-chipid.yaml

0 → 100644
+38 −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/hwinfo/loongson,ls2k-chipid.yaml#

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



title: Loongson-2 SoC ChipID



maintainers:

  - Yinbo Zhu <zhuyinbo@loongson.cn>



description: |

  Loongson-2 SoC contains many groups of global utilities register

  blocks, of which the ChipID group registers record SoC version,

  feature, vendor and id information.



properties:

  compatible:

    const: loongson,ls2k-chipid



  reg:

    maxItems: 1



  little-endian: true



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    chipid: chipid@1fe00000 {

        compatible = "loongson,ls2k-chipid";

        reg = <0x1fe00000 0x3ffc>;

        little-endian;

    };