Commit 0d081b16 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branches 'arm/smmu/updates', 'arm/smmu/bindings', 'mediatek',... 

Merge branches 'arm/smmu/updates', 'arm/smmu/bindings', 'mediatek', 'nvidia/tegra', 'intel/vt-d', 'amd/amd-vi' and 'core' into next
parents ac3fd01e 5583a55e fe626291 5a708269 fbcf5398 6b38a108 2381a1b4 1eb0ae6f

.clang-format

+1 −0
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ ForEachMacros: 
  - 'for_each_prop_dlc_cpus'

  - 'for_each_prop_dlc_platforms'

  - 'for_each_property_of_node'

  - 'for_each_pt_level_entry'

  - 'for_each_rdt_resource'

  - 'for_each_reg'

  - 'for_each_reg_filtered'

.mailmap

+2 −1
Original line number Diff line number Diff line
@@ -344,7 +344,8 @@ Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com> 
Jayachandran C <c.jayachandran@gmail.com> <jchandra@broadcom.com>

Jayachandran C <c.jayachandran@gmail.com> <jchandra@digeo.com>

Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com>

<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>

Jean-Philippe Brucker <jpb@kernel.org> <jean-philippe.brucker@arm.com>

Jean-Philippe Brucker <jpb@kernel.org> <jean-philippe@linaro.org>

Jean-Michel Hautbois <jeanmichel.hautbois@yoseli.org> <jeanmichel.hautbois@ideasonboard.com>

Jean Tourrilhes <jt@hpl.hp.com>

Jeevan Shriram <quic_jshriram@quicinc.com> <jshriram@codeaurora.org>

Documentation/devicetree/bindings/iommu/arm,smmu.yaml

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ properties: 
      - description: Qcom SoCs implementing "qcom,smmu-500" and "arm,mmu-500"

        items:

          - enum:

              - qcom,glymur-smmu-500

              - qcom,kaanapali-smmu-500

              - qcom,milos-smmu-500

              - qcom,qcm2290-smmu-500

              - qcom,qcs615-smmu-500

Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml

+8 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ properties: 
          - mediatek,mt8188-iommu-vdo        # generation two

          - mediatek,mt8188-iommu-vpp        # generation two

          - mediatek,mt8188-iommu-infra      # generation two

          - mediatek,mt8189-iommu-apu        # generation two

          - mediatek,mt8189-iommu-infra      # generation two

          - mediatek,mt8189-iommu-mm         # generation two

          - mediatek,mt8192-m4u  # generation two

          - mediatek,mt8195-iommu-vdo        # generation two

          - mediatek,mt8195-iommu-vpp        # generation two
@@ -128,6 +131,7 @@ properties: 
      This is the mtk_m4u_id according to the HW. Specifies the mtk_m4u_id as

      defined in

      dt-binding/memory/mediatek,mt8188-memory-port.h for mt8188,

      dt-binding/memory/mediatek,mt8189-memory-port.h for mt8189,

      dt-binding/memory/mt2701-larb-port.h for mt2701 and mt7623,

      dt-binding/memory/mt2712-larb-port.h for mt2712,

      dt-binding/memory/mt6779-larb-port.h for mt6779,
@@ -164,6 +168,7 @@ allOf: 
              - mediatek,mt8186-iommu-mm

              - mediatek,mt8188-iommu-vdo

              - mediatek,mt8188-iommu-vpp

              - mediatek,mt8189-iommu-mm

              - mediatek,mt8192-m4u

              - mediatek,mt8195-iommu-vdo

              - mediatek,mt8195-iommu-vpp
@@ -180,6 +185,7 @@ allOf: 
            - mediatek,mt8186-iommu-mm

            - mediatek,mt8188-iommu-vdo

            - mediatek,mt8188-iommu-vpp

            - mediatek,mt8189-iommu-mm

            - mediatek,mt8192-m4u

            - mediatek,mt8195-iommu-vdo

            - mediatek,mt8195-iommu-vpp
@@ -208,6 +214,8 @@ allOf: 
            contains:

              enum:

                - mediatek,mt8188-iommu-infra

                - mediatek,mt8189-iommu-apu

                - mediatek,mt8189-iommu-infra

                - mediatek,mt8195-iommu-infra



    then:

Documentation/devicetree/bindings/iommu/qcom,iommu.yaml

+4 −0
Original line number Diff line number Diff line
@@ -32,14 +32,18 @@ properties: 
          - const: qcom,msm-iommu-v2



  clocks:

    minItems: 2

    items:

      - description: Clock required for IOMMU register group access

      - description: Clock required for underlying bus access

      - description: Clock required for Translation Buffer Unit access



  clock-names:

    minItems: 2

    items:

      - const: iface

      - const: bus

      - const: tbu



  power-domains:

    maxItems: 1