Unverified Commit 0c952efa authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-6.17-arm64-dt-v3' of... 

Merge tag 'tegra-for-6.17-arm64-dt-v3' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/fixes

arm64: tegra: Device tree changes for v6.17-rc1

This contains an extra patch that drops numa-node-id properties that
were added to the Tegra264 DT files by mistake.

* tag 'tegra-for-6.17-arm64-dt-v3' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: tegra: Remove numa-node-id properties
  arm64: tegra: Add p3971-0089+p3834-0008 support
  arm64: tegra: Add memory controller on Tegra264
  arm64: tegra: Add Tegra264 support
  dt-bindings: memory: tegra: Add Tegra264 support

Link: https://lore.kernel.org/r/20250731162920.3329820-1-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3dca3d51 c36049da

Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml

+82 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ properties: 
          - nvidia,tegra186-mc

          - nvidia,tegra194-mc

          - nvidia,tegra234-mc

          - nvidia,tegra264-mc



  reg:

    minItems: 6
@@ -42,8 +43,12 @@ properties: 
    maxItems: 18



  interrupts:

    items:

      - description: MC general interrupt

    minItems: 1

    maxItems: 8



  interrupt-names:

    minItems: 1

    maxItems: 8



  "#address-cells":

    const: 2
@@ -74,6 +79,7 @@ patternProperties: 
              - nvidia,tegra186-emc

              - nvidia,tegra194-emc

              - nvidia,tegra234-emc

              - nvidia,tegra264-emc



      reg:

        minItems: 1
@@ -127,6 +133,15 @@ patternProperties: 
            reg:

              minItems: 2



      - if:

          properties:

            compatible:

              const: nvidia,tegra264-emc

        then:

          properties:

            reg:

              minItems: 2



    additionalProperties: false



    required:
@@ -158,6 +173,12 @@ allOf: 
            - const: ch2

            - const: ch3



        interrupts:

          items:

            - description: MC general interrupt



        interrupt-names: false



  - if:

      properties:

        compatible:
@@ -189,6 +210,12 @@ allOf: 
            - const: ch14

            - const: ch15



        interrupts:

          items:

            - description: MC general interrupt



        interrupt-names: false



  - if:

      properties:

        compatible:
@@ -220,6 +247,59 @@ allOf: 
            - const: ch14

            - const: ch15



        interrupts:

          items:

            - description: MC general interrupt



        interrupt-names: false



  - if:

      properties:

        compatible:

          const: nvidia,tegra264-mc

    then:

      properties:

        reg:

          minItems: 17

          maxItems: 17

          description: 17 memory controller channels



        reg-names:

          items:

            - const: broadcast

            - const: ch0

            - const: ch1

            - const: ch2

            - const: ch3

            - const: ch4

            - const: ch5

            - const: ch6

            - const: ch7

            - const: ch8

            - const: ch9

            - const: ch10

            - const: ch11

            - const: ch12

            - const: ch13

            - const: ch14

            - const: ch15



        interrupts:

          minItems: 8

          maxItems: 8

          description: One interrupt line for each MC component



        interrupt-names:

          items:

            - const: mcf

            - const: hub1

            - const: hub2

            - const: hub3

            - const: hub4

            - const: hub5

            - const: sbs

            - const: channel



additionalProperties: false



required:

arch/arm64/boot/dts/nvidia/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ DTC_FLAGS_tegra234-p3737-0000+p3701-0000 := -@ 
DTC_FLAGS_tegra234-p3740-0002+p3701-0008 := -@

DTC_FLAGS_tegra234-p3768-0000+p3767-0000 := -@

DTC_FLAGS_tegra234-p3768-0000+p3767-0005 := -@

DTC_FLAGS_tegra264-p3971-0089+p3834-0008 := -@



dtb-$(CONFIG_ARCH_TEGRA_132_SOC) += tegra132-norrin.dtb

dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-0000.dtb
@@ -31,3 +32,4 @@ dtb-$(CONFIG_ARCH_TEGRA_234_SOC) += tegra234-p3737-0000+p3701-0008.dtb 
dtb-$(CONFIG_ARCH_TEGRA_234_SOC) += tegra234-p3740-0002+p3701-0008.dtb

dtb-$(CONFIG_ARCH_TEGRA_234_SOC) += tegra234-p3768-0000+p3767-0000.dtb

dtb-$(CONFIG_ARCH_TEGRA_234_SOC) += tegra234-p3768-0000+p3767-0005.dtb

dtb-$(CONFIG_ARCH_TEGRA_264_SOC) += tegra264-p3971-0089+p3834-0008.dtb

arch/arm64/boot/dts/nvidia/tegra264-p3834-0008.dtsi

0 → 100644
+7 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause



#include "tegra264-p3834.dtsi"



/ {

	compatible = "nvidia,p3834-0008", "nvidia,tegra264";

};

arch/arm64/boot/dts/nvidia/tegra264-p3834.dtsi

0 → 100644
+30 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause



#include "tegra264.dtsi"



/ {

	compatible = "nvidia,p3834", "nvidia,tegra264";



	aliases {

	};



	bus@0 {

		serial@c4e0000 {

			status = "okay";

		};



		serial@c5a0000 {

			status = "okay";

		};

	};



	bus@8100000000 {

		iommu@5000000 {

			status = "okay";

		};



		iommu@6000000 {

			status = "okay";

		};

	};

};

arch/arm64/boot/dts/nvidia/tegra264-p3971-0089+p3834-0008.dts

0 → 100644
+11 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

/dts-v1/;



// module files must be included first

#include "tegra264-p3834-0008.dtsi"

#include "tegra264-p3971-0089+p3834.dtsi"



/ {

	model = "NVIDIA P3971-0089+P3834-0008 Engineering Reference Platform";

	compatible = "nvidia,p3971-0089+p3834-0008", "nvidia,p3834-0008", "nvidia,tegra264";

};