Unverified Commit cda49040 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-5.16-dt-bindings' of... 

Merge tag 'tegra-for-5.16-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt

dt-bindings: Changes for v5.16-rc1

This contains the DT bindings for the NVDEC hardware video decoder found
on Tegra210 and later chips as well as a node name fix for the examples
in the Tegra194 PCIe controller (endpoint mode) DT bindings.

* tag 'tegra-for-5.16-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  dt-bindings: PCI: tegra194: Fix PCIe endpoint node names
  dt-bindings: Add YAML bindings for NVDEC

Link: https://lore.kernel.org/r/20211008201132.1678814-2-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 23410de5 354754f5

Documentation/devicetree/bindings/gpu/host1x/nvidia,tegra210-nvdec.yaml

0 → 100644
+106 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: "http://devicetree.org/schemas/gpu/host1x/nvidia,tegra210-nvdec.yaml#"

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



title: Device tree binding for NVIDIA Tegra NVDEC



description: |

  NVDEC is the hardware video decoder present on NVIDIA Tegra210

  and newer chips. It is located on the Host1x bus and typically

  programmed through Host1x channels.



maintainers:

  - Thierry Reding <treding@gmail.com>

  - Mikko Perttunen <mperttunen@nvidia.com>



properties:

  $nodename:

    pattern: "^nvdec@[0-9a-f]*$"



  compatible:

    enum:

      - nvidia,tegra210-nvdec

      - nvidia,tegra186-nvdec

      - nvidia,tegra194-nvdec



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  clock-names:

    items:

      - const: nvdec



  resets:

    maxItems: 1



  reset-names:

    items:

      - const: nvdec



  power-domains:

    maxItems: 1



  iommus:

    maxItems: 1



  dma-coherent: true



  interconnects:

    items:

      - description: DMA read memory client

      - description: DMA read 2 memory client

      - description: DMA write memory client



  interconnect-names:

    items:

      - const: dma-mem

      - const: read-1

      - const: write



  nvidia,host1x-class:

    description: |

      Host1x class of the engine, used to specify the targeted engine

      when programming the engine through Host1x channels or when

      configuring engine-specific behavior in Host1x.

    default: 0xf0

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



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - resets

  - reset-names

  - power-domains



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/tegra186-clock.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/memory/tegra186-mc.h>

    #include <dt-bindings/power/tegra186-powergate.h>

    #include <dt-bindings/reset/tegra186-reset.h>



    nvdec@15480000 {

            compatible = "nvidia,tegra186-nvdec";

            reg = <0x15480000 0x40000>;

            clocks = <&bpmp TEGRA186_CLK_NVDEC>;

            clock-names = "nvdec";

            resets = <&bpmp TEGRA186_RESET_NVDEC>;

            reset-names = "nvdec";



            power-domains = <&bpmp TEGRA186_POWER_DOMAIN_NVDEC>;

            interconnects = <&mc TEGRA186_MEMORY_CLIENT_NVDECSRD &emc>,

                            <&mc TEGRA186_MEMORY_CLIENT_NVDECSRD1 &emc>,

                            <&mc TEGRA186_MEMORY_CLIENT_NVDECSWR &emc>;

            interconnect-names = "dma-mem", "read-1", "write";

            iommus = <&smmu TEGRA186_SID_NVDEC>;

    };

Documentation/devicetree/bindings/pci/nvidia,tegra194-pcie.txt

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ Tegra194 RC mode: 
Tegra194 EP mode:

-----------------



	pcie_ep@141a0000 {

	pcie-ep@141a0000 {

		compatible = "nvidia,tegra194-pcie-ep", "snps,dw-pcie-ep";

		power-domains = <&bpmp TEGRA194_POWER_DOMAIN_PCIEX8A>;

		reg = <0x00 0x141a0000 0x0 0x00020000   /* appl registers (128K)      */

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -6285,6 +6285,7 @@ L: linux-tegra@vger.kernel.org 
S:	Supported

T:	git git://anongit.freedesktop.org/tegra/linux.git

F:	Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt

F:	Documentation/devicetree/bindings/gpu/host1x/

F:	drivers/gpu/drm/tegra/

F:	drivers/gpu/host1x/

F:	include/linux/host1x.h