From 19b49b382fd00a4d6cdb505670feeb9fe40076da Mon Sep 17 00:00:00 2001
From: Benjamin Perseghetti <bperseghetti@rudislabs.com>
Date: Tue, 6 Jun 2023 00:37:45 -0400
Subject: [PATCH] MIMXRT1062-FMURT6: Fix PWM and RAM size.

Enable PWM to use unique names in pwm_shell application.

Fix RAM size to correct value.

Signed-off-by: Benjamin Perseghetti <bperseghetti@rudislabs.com>
---
 .../mimxrt1062_fmurt6/mimxrt1062_fmurt6.dts   |  1 -
 .../mimxrt1062_fmurt6/mimxrt1062_fmurt6.yaml  |  2 +-
 dts/arm/nxp/nxp_rt10xx.dtsi                   | 32 +++++++++----------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/boards/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6.dts b/boards/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6.dts
index 37bc9c8c127d699..156c79c917ce1e6 100644
--- a/boards/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6.dts
+++ b/boards/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6.dts
@@ -20,7 +20,6 @@
 		led1 = &red_led;
 		watchdog0 = &wdog0;
 		sdhc0 = &usdhc1;
-		pwm-0 = &flexpwm2_pwm0;
 		gps1 = &lpuart2;
 		telem1 = &lpuart3;
 		telem4-gps2 = &lpuart5;
diff --git a/boards/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6.yaml b/boards/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6.yaml
index 35732dd66b48c19..b1a9809b6e7dcd2 100644
--- a/boards/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6.yaml
+++ b/boards/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6.yaml
@@ -12,7 +12,7 @@ toolchain:
   - zephyr
   - gnuarmemb
   - xtools
-ram: 768
+ram: 32768
 flash: 65536
 supported:
   - counter
diff --git a/dts/arm/nxp/nxp_rt10xx.dtsi b/dts/arm/nxp/nxp_rt10xx.dtsi
index ca642495df8a906..696ad4a372f541d 100644
--- a/dts/arm/nxp/nxp_rt10xx.dtsi
+++ b/dts/arm/nxp/nxp_rt10xx.dtsi
@@ -564,7 +564,7 @@
 			reg = <0x403dc000 0x4000>;
 			interrupts = <106 0>;
 
-			flexpwm1_pwm0: pwm0 {
+			flexpwm1_pwm0: pwm1_0 {
 				compatible = "nxp,imx-pwm";
 				index = <0>;
 				interrupts = <102 0>;
@@ -574,7 +574,7 @@
 				status = "disabled";
 			};
 
-			flexpwm1_pwm1: pwm1 {
+			flexpwm1_pwm1: pwm1_1 {
 				compatible = "nxp,imx-pwm";
 				index = <1>;
 				interrupts = <103 0>;
@@ -584,7 +584,7 @@
 				status = "disabled";
 			};
 
-			flexpwm1_pwm2: pwm2 {
+			flexpwm1_pwm2: pwm1_2 {
 				compatible = "nxp,imx-pwm";
 				index = <2>;
 				interrupts = <104 0>;
@@ -594,7 +594,7 @@
 				status = "disabled";
 			};
 
-			flexpwm1_pwm3: pwm3 {
+			flexpwm1_pwm3: pwm1_3 {
 				compatible = "nxp,imx-pwm";
 				index = <3>;
 				interrupts = <105 0>;
@@ -610,7 +610,7 @@
 			reg = <0x403e0000 0x4000>;
 			interrupts =  <141 0>;
 
-			flexpwm2_pwm0: pwm0 {
+			flexpwm2_pwm0: pwm2_0 {
 				compatible = "nxp,imx-pwm";
 				index = <0>;
 				interrupts = <137 0>;
@@ -620,7 +620,7 @@
 				status = "disabled";
 			};
 
-			flexpwm2_pwm1: pwm1 {
+			flexpwm2_pwm1: pwm2_1 {
 				compatible = "nxp,imx-pwm";
 				index = <1>;
 				interrupts = <138 0>;
@@ -630,7 +630,7 @@
 				status = "disabled";
 			};
 
-			flexpwm2_pwm2: pwm2 {
+			flexpwm2_pwm2: pwm2_2 {
 				compatible = "nxp,imx-pwm";
 				index = <2>;
 				interrupts = <139 0>;
@@ -640,7 +640,7 @@
 				status = "disabled";
 			};
 
-			flexpwm2_pwm3: pwm3 {
+			flexpwm2_pwm3: pwm2_3 {
 				compatible = "nxp,imx-pwm";
 				index = <3>;
 				interrupts = <140 0>;
@@ -656,7 +656,7 @@
 			reg = <0x403e4000 0x4000>;
 			interrupts =  <146 0>;
 
-			flexpwm3_pwm0: pwm0 {
+			flexpwm3_pwm0: pwm3_0 {
 				compatible = "nxp,imx-pwm";
 				index = <0>;
 				interrupts = <142 0>;
@@ -666,7 +666,7 @@
 				status = "disabled";
 			};
 
-			flexpwm3_pwm1: pwm1 {
+			flexpwm3_pwm1: pwm3_1 {
 				compatible = "nxp,imx-pwm";
 				index = <1>;
 				interrupts = <143 0>;
@@ -676,7 +676,7 @@
 				status = "disabled";
 			};
 
-			flexpwm3_pwm2: pwm2 {
+			flexpwm3_pwm2: pwm3_2 {
 				compatible = "nxp,imx-pwm";
 				index = <2>;
 				interrupts = <144 0>;
@@ -686,7 +686,7 @@
 				status = "disabled";
 			};
 
-			flexpwm3_pwm3: pwm3 {
+			flexpwm3_pwm3: pwm3_3 {
 				compatible = "nxp,imx-pwm";
 				index = <3>;
 				interrupts = <145 0>;
@@ -702,7 +702,7 @@
 			reg = <0x403e8000 0x4000>;
 			interrupts = <151 0>;
 
-			flexpwm4_pwm0: pwm0 {
+			flexpwm4_pwm0: pwm4_0 {
 				compatible = "nxp,imx-pwm";
 				index = <0>;
 				interrupts = <147 0>;
@@ -712,7 +712,7 @@
 				status = "disabled";
 			};
 
-			flexpwm4_pwm1: pwm1 {
+			flexpwm4_pwm1: pwm4_1 {
 				compatible = "nxp,imx-pwm";
 				index = <1>;
 				interrupts = <148 0>;
@@ -722,7 +722,7 @@
 				status = "disabled";
 			};
 
-			flexpwm4_pwm2: pwm2 {
+			flexpwm4_pwm2: pwm4_2 {
 				compatible = "nxp,imx-pwm";
 				index = <2>;
 				interrupts = <149 0>;
@@ -732,7 +732,7 @@
 				status = "disabled";
 			};
 
-			flexpwm4_pwm3: pwm3 {
+			flexpwm4_pwm3: pwm4_3 {
 				compatible = "nxp,imx-pwm";
 				index = <3>;
 				interrupts = <150 0>;