From 137d367a4dff729617bbc4cbb6fcddf464e5a603 Mon Sep 17 00:00:00 2001
From: Harsh Sharma <harsh.sharma@multitech.com>
Date: Fri, 24 Jun 2022 16:56:15 -0500
Subject: Combined lora dtso with 003 dtso for cleaner stanzas

---
 mtcpmhs/ap1-003-0.0.dtso  | 34 ----------------------------------
 mtcpmhs/ap1-lora-0.0.dtso | 12 +++++++++++-
 mtcpmhs/ap2-003-0.0.dtso  | 34 ----------------------------------
 mtcpmhs/ap2-lora-0.0.dtso | 12 +++++++++++-
 4 files changed, 22 insertions(+), 70 deletions(-)
 delete mode 100644 mtcpmhs/ap1-003-0.0.dtso
 delete mode 100644 mtcpmhs/ap2-003-0.0.dtso

diff --git a/mtcpmhs/ap1-003-0.0.dtso b/mtcpmhs/ap1-003-0.0.dtso
deleted file mode 100644
index e0580dc..0000000
--- a/mtcpmhs/ap1-003-0.0.dtso
+++ /dev/null
@@ -1,34 +0,0 @@
-/* 
- * DTS overlay for MTCPM 0.0 hardware version.
- */
-
-/dts-v1/;
-
-/*
- * Location(s):
- * Put: MTCDT3/0.0/lora/ap1-003.dtbo
- */
-
-#include "am4372.dtsi"
-#include <dt-bindings/pinctrl/am43xx.h>
-#include <dt-bindings/pwm/pwm.h>
-#include <dt-bindings/gpio/gpio.h>
-
-/ {
-    compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43";
-    fragment@0 {
-        target-path = "/ocp@44000000/spi@48030000";
-        __overlay__ {
-	    ap1-spi@0 {
-		compatible = "mts,mtac";
-		spi-max-frequency = <0x1e8480>;
-		reg = <0x0>;
-	    };/*ap1-spi0*/
-            ap1-spi@1 {
-                compatible = "mts,mtac";
-                spi-max-frequency = <0x1e8480>;
-                reg = <0x1>;
-            }; /*ap1-spi1*/
-        }; /*overlay*/
-    }; /*fragment@0*/
-};
diff --git a/mtcpmhs/ap1-lora-0.0.dtso b/mtcpmhs/ap1-lora-0.0.dtso
index 7f7b839..0dd7d3a 100644
--- a/mtcpmhs/ap1-lora-0.0.dtso
+++ b/mtcpmhs/ap1-lora-0.0.dtso
@@ -19,11 +19,21 @@
     fragment@0 {
         target-path = "/ocp@44000000/spi@48030000";
         __overlay__ {
+            ap1-spi@0 {
+                compatible = "mts,mtac";
+                spi-max-frequency = <0x1e8480>;
+                reg = <0x0>;
+            }; /*ap1-spi0*/
+            ap1-spi@1 {
+                compatible = "mts,mtac";
+                spi-max-frequency = <0x1e8480>;
+                reg = <0x1>;
+            }; /*ap1-spi1*/
             ap1-spi@2 {
                 compatible = "mts,mtac";
                 spi-max-frequency = <0x1e8480>;
                 reg = <0x2>;
-            }; /*ap1-spi*/
+            }; /*ap1-spi2*/
         }; /*overlay*/
     }; /*fragment@0*/
 };
diff --git a/mtcpmhs/ap2-003-0.0.dtso b/mtcpmhs/ap2-003-0.0.dtso
deleted file mode 100644
index bb7652e..0000000
--- a/mtcpmhs/ap2-003-0.0.dtso
+++ /dev/null
@@ -1,34 +0,0 @@
-/* 
- * DTS overlay for MTCPM 0.0 hardware version.
- */
-
-/dts-v1/;
-
-/*
- * Location(s):
- * Put: MTCDT3/0.0/lora/ap2-003.dtbo
- */
-
-#include "am4372.dtsi"
-#include <dt-bindings/pinctrl/am43xx.h>
-#include <dt-bindings/pwm/pwm.h>
-#include <dt-bindings/gpio/gpio.h>
-
-/ {
-    compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43";
-    fragment@0 {
-        target-path = "/ocp@44000000/spi@481a2000";
-        __overlay__ {
-            ap2-spi@0 {
-                compatible = "mts,mtac";
-                spi-max-frequency = <0x1e8480>;
-                reg = <0x0>;
-            }; /*ap2-spi0*/
-            ap2-spi@1 {
-                compatible = "mts,mtac";
-                spi-max-frequency = <0x1e8480>;
-                reg = <0x1>;
-            }; /*ap2-spi1*/
-        }; /*overlay*/
-    }; /*fragment@0*/
-};
diff --git a/mtcpmhs/ap2-lora-0.0.dtso b/mtcpmhs/ap2-lora-0.0.dtso
index f5a1157..63506f6 100644
--- a/mtcpmhs/ap2-lora-0.0.dtso
+++ b/mtcpmhs/ap2-lora-0.0.dtso
@@ -19,11 +19,21 @@
     fragment@0 {
         target-path = "/ocp@44000000/spi@481a2000";
         __overlay__ {
+            ap2-spi@0 {
+                compatible = "mts,mtac";
+                spi-max-frequency = <0x1e8480>;
+                reg = <0x0>;
+            }; /*ap2-spi0*/
+            ap2-spi@1 {
+                compatible = "mts,mtac";
+                spi-max-frequency = <0x1e8480>;
+                reg = <0x1>;
+            }; /*ap2-spi1*/
             ap2-spi@2 {
                 compatible = "mts,mtac";
                 spi-max-frequency = <0x1e8480>;
                 reg = <0x2>;
-            }; /*ap2-spi*/
+            }; /*ap2-spi2*/
         }; /*overlay*/
     }; /*fragment@0*/
 };
-- 
cgit v1.2.3