Commit 3df02197 authored by Jacob Wienecke's avatar Jacob Wienecke Committed by Henrik Brix Andersen
Browse files

dts: arm: nxp: Move static ocram configuration to specific soc



RT1160 and RT1170 have different sizes for OCRAM1 and OCRAM2 this PR moves
the static ocram1 and ocram2 labels to the soc specific dtsi and defines
their sizes according to the RM. For RT1160, it combines the OCRAM1,
OCRAM2, and OCRAM M7 (FlexRAM ECC) into 1 node for a better user
experience. 256KB total as opposed to 64KB.

Signed-off-by: default avatarJacob Wienecke <jacob.wienecke@nxp.com>
parent 4f90ec35
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -11,3 +11,16 @@
	clock-mult = <100>;
	clock-div = <4>;
};

/* Set OCRAM regions/sizes for RT1160. Combines OCRAM1/OCRAM2/OCRAM M7 (FlexRAM ECC).
 * ECC must be left disabled for this configuration
 */
/ {
	soc {
		ocram_combined: ocram@20340000 {
			compatible = "zephyr,memory-region", "mmio-sram";
			zephyr,memory-region = "OCRAMCOMBINED";
			reg = <0x20340000 DT_SIZE_K(256)>;
		};
	};
};
+17 −0
Original line number Diff line number Diff line
@@ -11,3 +11,20 @@
	clock-mult = <83>;
	clock-div = <2>;
};

/* Set OCRAM regions/sizes for RT1170 */
/ {
	soc {
		ocram1: ocram@20240000 {
			compatible = "zephyr,memory-region", "mmio-sram";
			zephyr,memory-region = "OCRAM1";
			reg = <0x20240000 DT_SIZE_K(512)>;
		};

		ocram2: ocram@202c0000 {
			compatible = "zephyr,memory-region", "mmio-sram";
			zephyr,memory-region = "OCRAM2";
			reg = <0x202c0000 DT_SIZE_K(512)>;
		};
	};
};
+0 −12
Original line number Diff line number Diff line
@@ -952,18 +952,6 @@
			reg = <0x20200000 DT_SIZE_K(256)>;
		};

		ocram1: ocram@20240000 {
			compatible = "zephyr,memory-region", "mmio-sram";
			zephyr,memory-region = "OCRAM1";
			reg = <0x20240000 DT_SIZE_K(512)>;
		};

		ocram2: ocram@202c0000 {
			compatible = "zephyr,memory-region", "mmio-sram";
			zephyr,memory-region = "OCRAM2";
			reg = <0x202c0000 DT_SIZE_K(512)>;
		};

		lpadc1: adc@40050000 {
			compatible = "nxp,lpc-lpadc";
			reg = <0x40050000 0x304>;