Commit f382b1fe authored by Thierry Reding's avatar Thierry Reding
Browse files

Merge branch 'for-6.5/dt-bindings' into for-6.5/memory

parents ac9a7868 b0dae3df

Documentation/devicetree/bindings/arm/tegra.yaml

+5 −0
Original line number Diff line number Diff line
@@ -167,6 +167,11 @@ properties: 
          - const: nvidia,p3737-0000+p3701-0000

          - const: nvidia,p3701-0000

          - const: nvidia,tegra234

      - description: NVIDIA IGX Orin Development Kit

        items:

          - const: nvidia,p3740-0002+p3701-0008

          - const: nvidia,p3701-0008

          - const: nvidia,tegra234

      - description: Jetson Orin NX

        items:

          - const: nvidia,p3767-0000

include/dt-bindings/memory/tegra234-mc.h

+5 −0
Original line number Diff line number Diff line
@@ -536,4 +536,9 @@ 
#define TEGRA234_MEMORY_CLIENT_NVJPG1SRD 0x123

#define TEGRA234_MEMORY_CLIENT_NVJPG1SWR 0x124



/* ICC ID's for dummy MC clients used to represent CPU Clusters */

#define TEGRA_ICC_MC_CPU_CLUSTER0       1003

#define TEGRA_ICC_MC_CPU_CLUSTER1       1004

#define TEGRA_ICC_MC_CPU_CLUSTER2       1005



#endif