Commit 12c5beb9 authored Jan 16, 2020 by Olof Johansson

Merge tag 'tegra-for-5.6-arm-dt' of...

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

ARM: tegra: Device tree changes for v5.6-rc1

This adds memory timings for the PAZ100 and does some minor cleanup for
the external memory controller device tree node on Tegra124.

* tag 'tegra-for-5.6-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: dts: tegra20: paz00: Add memory timings
  ARM: tegra: Rename EMC on Tegra124
  ARM: tegra: Let the EMC hardware use the EMC clock

Link: https://lore.kernel.org/r/20200111003553.2411874-6-thierry.reding@gmail.com


Signed-off-by: Olof Johansson <olof@lixom.net>

parents e64d0098 834f1d6c

arch/arm/boot/dts/tegra124-apalis-emc.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ timing-924000000 {
		};
		};

		emc@7001b000 {
		external-memory-controller@7001b000 {
		emc-timings-1 {
		nvidia,ram-code = <1>;

arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ timing-924000000 {
		};
		};

		emc@7001b000 {
		external-memory-controller@7001b000 {
		emc-timings-3 {
		nvidia,ram-code = <3>;

arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -219,7 +219,7 @@ timing-792000000 {
		};
		};

		emc@7001b000 {
		external-memory-controller@7001b000 {
		emc-timings-1 {
		nvidia,ram-code = <1>;

arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ timing-792000000 {
		};
		};

		emc@7001b000 {
		external-memory-controller@7001b000 {
		emc-timings-1 {
		nvidia,ram-code = <1>;

arch/arm/boot/dts/tegra124.dtsi

+3 −1

Original line number	Diff line number	Diff line
		@@ -622,9 +622,11 @@ mc: memory-controller@70019000 {
		#iommu-cells = <1>;
		};

		emc: emc@7001b000 {
		emc: external-memory-controller@7001b000 {
		compatible = "nvidia,tegra124-emc";
		reg = <0x0 0x7001b000 0x0 0x1000>;
		clocks = <&tegra_car TEGRA124_CLK_EMC>;
		clock-names = "emc";

		nvidia,memory-controller = <&mc>;
		};