Commit 0714ccb5 authored by Thierry Reding's avatar Thierry Reding
Browse files

ARM: tegra: Clean up external memory controller nodes 



The external memory controller should be sorted after the memory
controller to keep the ordering by unit-address intact.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent fa55b7dc

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

+221 −211
Original line number Diff line number Diff line
@@ -15,66 +15,77 @@ 
				clocks = <&tegra_car TEGRA124_CLK_PLL_P>;

				clock-names = "emc-parent";

			};



			timing-20400000 {

				clock-frequency = <20400000>;

				nvidia,parent-clock-frequency = <408000000>;

				clocks = <&tegra_car TEGRA124_CLK_PLL_P>;

				clock-names = "emc-parent";

			};



			timing-40800000 {

				clock-frequency = <40800000>;

				nvidia,parent-clock-frequency = <408000000>;

				clocks = <&tegra_car TEGRA124_CLK_PLL_P>;

				clock-names = "emc-parent";

			};



			timing-68000000 {

				clock-frequency = <68000000>;

				nvidia,parent-clock-frequency = <408000000>;

				clocks = <&tegra_car TEGRA124_CLK_PLL_P>;

				clock-names = "emc-parent";

			};



			timing-102000000 {

				clock-frequency = <102000000>;

				nvidia,parent-clock-frequency = <408000000>;

				clocks = <&tegra_car TEGRA124_CLK_PLL_P>;

				clock-names = "emc-parent";

			};



			timing-204000000 {

				clock-frequency = <204000000>;

				nvidia,parent-clock-frequency = <408000000>;

				clocks = <&tegra_car TEGRA124_CLK_PLL_P>;

				clock-names = "emc-parent";

			};



			timing-300000000 {

				clock-frequency = <300000000>;

				nvidia,parent-clock-frequency = <600000000>;

				clocks = <&tegra_car TEGRA124_CLK_PLL_C>;

				clock-names = "emc-parent";

			};



			timing-396000000 {

				clock-frequency = <396000000>;

				nvidia,parent-clock-frequency = <792000000>;

				clocks = <&tegra_car TEGRA124_CLK_PLL_M>;

				clock-names = "emc-parent";

			};



			timing-528000000 {

				clock-frequency = <528000000>;

				nvidia,parent-clock-frequency = <528000000>;

				clocks = <&tegra_car TEGRA124_CLK_PLL_M_UD>;

				clock-names = "emc-parent";

			};



			timing-600000000 {

				clock-frequency = <600000000>;

				nvidia,parent-clock-frequency = <600000000>;

				clocks = <&tegra_car TEGRA124_CLK_PLL_C_UD>;

				clock-names = "emc-parent";

			};



			timing-792000000 {

				clock-frequency = <792000000>;

				nvidia,parent-clock-frequency = <792000000>;

				clocks = <&tegra_car TEGRA124_CLK_PLL_M_UD>;

				clock-names = "emc-parent";

			};



			timing-924000000 {

				clock-frequency = <924000000>;

				nvidia,parent-clock-frequency = <924000000>;
@@ -84,6 +95,216 @@ 
		};

	};



	memory-controller@70019000 {

		emc-timings-1 {

			nvidia,ram-code = <1>;



			timing-12750000 {

				clock-frequency = <12750000>;



				nvidia,emem-configuration = <

					0x40040001 0x8000000a

					0x00000001 0x00000001

					0x00000002 0x00000000

					0x00000002 0x00000001

					0x00000003 0x00000008

					0x00000003 0x00000002

					0x00000003 0x00000006

					0x06030203 0x000a0502

					0x77e30303 0x70000f03

					0x001f0000

				>;

			};



			timing-20400000 {

				clock-frequency = <20400000>;



				nvidia,emem-configuration = <

					0x40020001 0x80000012

					0x00000001 0x00000001

					0x00000002 0x00000000

					0x00000002 0x00000001

					0x00000003 0x00000008

					0x00000003 0x00000002

					0x00000003 0x00000006

					0x06030203 0x000a0502

					0x76230303 0x70000f03

					0x001f0000

				>;

			};



			timing-40800000 {

				clock-frequency = <40800000>;



				nvidia,emem-configuration = <

					0xa0000001 0x80000017

					0x00000001 0x00000001

					0x00000002 0x00000000

					0x00000002 0x00000001

					0x00000003 0x00000008

					0x00000003 0x00000002

					0x00000003 0x00000006

					0x06030203 0x000a0502

					0x74a30303 0x70000f03

					0x001f0000

				>;

			};



			timing-68000000 {

				clock-frequency = <68000000>;



				nvidia,emem-configuration = <

					0x00000001 0x8000001e

					0x00000001 0x00000001

					0x00000002 0x00000000

					0x00000002 0x00000001

					0x00000003 0x00000008

					0x00000003 0x00000002

					0x00000003 0x00000006

					0x06030203 0x000a0502

					0x74230403 0x70000f03

					0x001f0000

				>;

			};



			timing-102000000 {

				clock-frequency = <102000000>;



				nvidia,emem-configuration = <

					0x08000001 0x80000026

					0x00000001 0x00000001

					0x00000003 0x00000000

					0x00000002 0x00000001

					0x00000003 0x00000008

					0x00000003 0x00000002

					0x00000003 0x00000006

					0x06030203 0x000a0503

					0x73c30504 0x70000f03

					0x001f0000

				>;

			};



			timing-204000000 {

				clock-frequency = <204000000>;



				nvidia,emem-configuration = <

					0x01000003 0x80000040

					0x00000001 0x00000001

					0x00000004 0x00000002

					0x00000003 0x00000001

					0x00000003 0x00000008

					0x00000003 0x00000002

					0x00000004 0x00000006

					0x06040203 0x000a0504

					0x73840a05 0x70000f03

					0x001f0000

				>;

			};



			timing-300000000 {

				clock-frequency = <300000000>;



				nvidia,emem-configuration = <

					0x08000004 0x80000040

					0x00000001 0x00000002

					0x00000007 0x00000004

					0x00000004 0x00000001

					0x00000002 0x00000007

					0x00000002 0x00000002

					0x00000004 0x00000006

					0x06040202 0x000b0607

					0x77450e08 0x70000f03

					0x001f0000

				>;

			};



			timing-396000000 {

				clock-frequency = <396000000>;



				nvidia,emem-configuration = <

					0x0f000005 0x80000040

					0x00000001 0x00000002

					0x00000009 0x00000005

					0x00000006 0x00000001

					0x00000002 0x00000008

					0x00000002 0x00000002

					0x00000004 0x00000006

					0x06040202 0x000d0709

					0x7586120a 0x70000f03

					0x001f0000

				>;

			};



			timing-528000000 {

				clock-frequency = <528000000>;



				nvidia,emem-configuration = <

					0x0f000007 0x80000040

					0x00000002 0x00000003

					0x0000000c 0x00000007

					0x00000008 0x00000001

					0x00000002 0x00000009

					0x00000002 0x00000002

					0x00000005 0x00000006

					0x06050202 0x0010090c

					0x7428180d 0x70000f03

					0x001f0000

				>;

			};



			timing-600000000 {

				clock-frequency = <600000000>;



				nvidia,emem-configuration = <

					0x00000009 0x80000040

					0x00000003 0x00000004

					0x0000000e 0x00000009

					0x0000000a 0x00000001

					0x00000003 0x0000000b

					0x00000002 0x00000002

					0x00000005 0x00000007

					0x07050202 0x00130b0e

					0x73a91b0f 0x70000f03

					0x001f0000

				>;

			};



			timing-792000000 {

				clock-frequency = <792000000>;



				nvidia,emem-configuration = <

					0x0e00000b 0x80000040

					0x00000004 0x00000005

					0x00000013 0x0000000c

					0x0000000d 0x00000002

					0x00000003 0x0000000c

					0x00000002 0x00000002

					0x00000006 0x00000008

					0x08060202 0x00170e13

					0x736c2414 0x70000f02

					0x001f0000

				>;

			};



			timing-924000000 {

				clock-frequency = <924000000>;



				nvidia,emem-configuration = <

					0x0e00000d 0x80000040

					0x00000005 0x00000006

					0x00000016 0x0000000e

					0x0000000f 0x00000002

					0x00000004 0x0000000e

					0x00000002 0x00000002

					0x00000006 0x00000009

					0x09060202 0x001a1016

					0x734e2a17 0x70000f02

					0x001f0000

				>;

			};

		};

	};



	external-memory-controller@7001b000 {

		emc-timings-1 {

			nvidia,ram-code = <1>;
@@ -1251,217 +1472,6 @@ 
					0x00000011

				>;

			};



		};

	};



	memory-controller@70019000 {

		emc-timings-1 {

			nvidia,ram-code = <1>;



			timing-12750000 {

				clock-frequency = <12750000>;



				nvidia,emem-configuration = <

					0x40040001 0x8000000a

					0x00000001 0x00000001

					0x00000002 0x00000000

					0x00000002 0x00000001

					0x00000003 0x00000008

					0x00000003 0x00000002

					0x00000003 0x00000006

					0x06030203 0x000a0502

					0x77e30303 0x70000f03

					0x001f0000

				>;

			};



			timing-20400000 {

				clock-frequency = <20400000>;



				nvidia,emem-configuration = <

					0x40020001 0x80000012

					0x00000001 0x00000001

					0x00000002 0x00000000

					0x00000002 0x00000001

					0x00000003 0x00000008

					0x00000003 0x00000002

					0x00000003 0x00000006

					0x06030203 0x000a0502

					0x76230303 0x70000f03

					0x001f0000

				>;

			};



			timing-40800000 {

				clock-frequency = <40800000>;



				nvidia,emem-configuration = <

					0xa0000001 0x80000017

					0x00000001 0x00000001

					0x00000002 0x00000000

					0x00000002 0x00000001

					0x00000003 0x00000008

					0x00000003 0x00000002

					0x00000003 0x00000006

					0x06030203 0x000a0502

					0x74a30303 0x70000f03

					0x001f0000

				>;

			};



			timing-68000000 {

				clock-frequency = <68000000>;



				nvidia,emem-configuration = <

					0x00000001 0x8000001e

					0x00000001 0x00000001

					0x00000002 0x00000000

					0x00000002 0x00000001

					0x00000003 0x00000008

					0x00000003 0x00000002

					0x00000003 0x00000006

					0x06030203 0x000a0502

					0x74230403 0x70000f03

					0x001f0000

				>;

			};



			timing-102000000 {

				clock-frequency = <102000000>;



				nvidia,emem-configuration = <

					0x08000001 0x80000026

					0x00000001 0x00000001

					0x00000003 0x00000000

					0x00000002 0x00000001

					0x00000003 0x00000008

					0x00000003 0x00000002

					0x00000003 0x00000006

					0x06030203 0x000a0503

					0x73c30504 0x70000f03

					0x001f0000

				>;

			};



			timing-204000000 {

				clock-frequency = <204000000>;



				nvidia,emem-configuration = <

					0x01000003 0x80000040

					0x00000001 0x00000001

					0x00000004 0x00000002

					0x00000003 0x00000001

					0x00000003 0x00000008

					0x00000003 0x00000002

					0x00000004 0x00000006

					0x06040203 0x000a0504

					0x73840a05 0x70000f03

					0x001f0000

				>;

			};



			timing-300000000 {

				clock-frequency = <300000000>;



				nvidia,emem-configuration = <

					0x08000004 0x80000040

					0x00000001 0x00000002

					0x00000007 0x00000004

					0x00000004 0x00000001

					0x00000002 0x00000007

					0x00000002 0x00000002

					0x00000004 0x00000006

					0x06040202 0x000b0607

					0x77450e08 0x70000f03

					0x001f0000

				>;

			};



			timing-396000000 {

				clock-frequency = <396000000>;



				nvidia,emem-configuration = <

					0x0f000005 0x80000040

					0x00000001 0x00000002

					0x00000009 0x00000005

					0x00000006 0x00000001

					0x00000002 0x00000008

					0x00000002 0x00000002

					0x00000004 0x00000006

					0x06040202 0x000d0709

					0x7586120a 0x70000f03

					0x001f0000

				>;

			};



			timing-528000000 {

				clock-frequency = <528000000>;



				nvidia,emem-configuration = <

					0x0f000007 0x80000040

					0x00000002 0x00000003

					0x0000000c 0x00000007

					0x00000008 0x00000001

					0x00000002 0x00000009

					0x00000002 0x00000002

					0x00000005 0x00000006

					0x06050202 0x0010090c

					0x7428180d 0x70000f03

					0x001f0000

				>;

			};



			timing-600000000 {

				clock-frequency = <600000000>;



				nvidia,emem-configuration = <

					0x00000009 0x80000040

					0x00000003 0x00000004

					0x0000000e 0x00000009

					0x0000000a 0x00000001

					0x00000003 0x0000000b

					0x00000002 0x00000002

					0x00000005 0x00000007

					0x07050202 0x00130b0e

					0x73a91b0f 0x70000f03

					0x001f0000

				>;

			};



			timing-792000000 {

				clock-frequency = <792000000>;



				nvidia,emem-configuration = <

					0x0e00000b 0x80000040

					0x00000004 0x00000005

					0x00000013 0x0000000c

					0x0000000d 0x00000002

					0x00000003 0x0000000c

					0x00000002 0x00000002

					0x00000006 0x00000008

					0x08060202 0x00170e13

					0x736c2414 0x70000f02

					0x001f0000

				>;

			};



			timing-924000000 {

				clock-frequency = <924000000>;



				nvidia,emem-configuration = <

					0x0e00000d 0x80000040

					0x00000005 0x00000006

					0x00000016 0x0000000e

					0x0000000f 0x00000002

					0x00000004 0x0000000e

					0x00000002 0x00000002

					0x00000006 0x00000009

					0x09060202 0x001a1016

					0x734e2a17 0x70000f02

					0x001f0000

				>;

			};

		};

	};

};

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

+1306 −1296

File changed.

Preview size limit exceeded, changes collapsed.

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

+5670 −5640

File changed.

Preview size limit exceeded, changes collapsed.

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

+379 −371

File changed.

Preview size limit exceeded, changes collapsed.