Facilitate using SPI_soc.h instead of v0/v1

diff --git a/package.xs b/package.xs
index 8ba7ead9d6777bee72f5e7992e716b09e3db1c9c..b077fec656ecd779881a81f857b5284c7af0c42f 100755 (executable)
--- a/package.xs
+++ b/package.xs
@@ -64,7 +64,8 @@ function getLibs(prog)
                      'omapl138',                     \r
                      'c6678',\r
                      'c6657',\r
-                     'am65xx'\r
+                     'am65xx',\r
+                     'j721e'\r
                    ];\r
 \r
     /* Get the SOC */\r

diff --git a/soc/SPI_soc.h b/soc/SPI_soc.h
index 34b9df30c056008e7238717ca93adf25f21e7055..23242525a10614fe52dedd9dced8fa7042201f20 100644 (file)
--- a/soc/SPI_soc.h
+++ b/soc/SPI_soc.h
@@ -47,6 +47,13 @@
 #if defined(SOC_DRA78x) || defined(SOC_TDA3XX) || defined(SOC_TDA2XX) || defined(SOC_TDA2PX) || defined(SOC_TDA2EX) || defined (SOC_DRA72x) || defined (SOC_DRA75x) || defined (SOC_AM574x) || defined (SOC_AM572x) || defined (SOC_AM571x) || defined (SOC_AM437x) || defined (SOC_AM335x) || defined(SOC_AM65XX) || defined(SOC_J721E)
 #include <ti/drv/spi/MCSPI.h>
 #include <ti/drv/spi/soc/SPI_v1.h>
+#include <ti/csl/src/ip/mcspi/V0/hw_mcspi.h>
+#include <ti/csl/src/ip/mcspi/V0/mcspi.h>
+
+#if !(defined(SOC_AM65XX) || defined(SOC_J721E))
+#include <ti/drv/spi/soc/QSPI_v1.h>
+#endif
+
 #define SPI_HWAttrs    SPI_v1_HWAttrs
 #endif
 

diff --git a/soc/am335x/SPI_soc.c b/soc/am335x/SPI_soc.c
index 588117a3f266a8525b476598c7cd93a21d53b57b..ec3b332ea3223e792bbbfc0db35e3a4f442cce94 100644 (file)
--- a/soc/am335x/SPI_soc.c
+++ b/soc/am335x/SPI_soc.c
@@ -40,10 +40,7 @@
 
 #include <ti/drv/spi/MCSPI.h>
 #include <ti/starterware/include/hw/soc_am335x.h>
-#include <ti/drv/spi/soc/QSPI_v1.h>
-#include <ti/drv/spi/soc/SPI_v1.h>
-#include <ti/csl/src/ip/mcspi/V0/hw_mcspi.h>
-#include <ti/csl/src/ip/mcspi/V0/mcspi.h>
+#include <ti/drv/spi/soc/SPI_soc.h>
 
 #ifdef PRU_ICSS_FW
 #include <ti/drv/spi/soc/ESPI_v2.h>

diff --git a/soc/am437x/SPI_soc.c b/soc/am437x/SPI_soc.c
index e809f6b8c0a727962024a35cf1dda4686cc8ede6..dfe5720b22206c89599579c535563b667b30a430 100644 (file)
--- a/soc/am437x/SPI_soc.c
+++ b/soc/am437x/SPI_soc.c
@@ -40,10 +40,7 @@
 
 #include <ti/drv/spi/MCSPI.h>
 #include <ti/starterware/include/hw/am437x.h>
-#include <ti/drv/spi/soc/QSPI_v1.h>
-#include <ti/drv/spi/soc/SPI_v1.h>
-#include <ti/csl/src/ip/mcspi/V0/hw_mcspi.h>
-#include <ti/csl/src/ip/mcspi/V0/mcspi.h>
+#include <ti/drv/spi/soc/SPI_soc.h>
 
 #ifdef PRU_ICSS_FW
 #include <ti/drv/spi/soc/ESPI_v2.h>

diff --git a/soc/am571x/SPI_soc.c b/soc/am571x/SPI_soc.c
index 6ae5b173dbee665afa9194848d7f25addb7276d2..a56ce26ea3fa95ea1ffd7401f33a4575d4294f48 100644 (file)
--- a/soc/am571x/SPI_soc.c
+++ b/soc/am571x/SPI_soc.c
@@ -40,8 +40,6 @@
 
 #include <ti/csl/soc/am571x/src/cslr_soc.h>
 #include <ti/drv/spi/soc/SPI_soc.h>
-#include <ti/drv/spi/soc/QSPI_v1.h>
-#include <ti/csl/src/ip/mcspi/V0/mcspi.h>
 
 #define CSL_QSPI_PER_CNT    1U
 #define CSL_SPI_PER_CNT     (CSL_MCSPI_PER_CNT + CSL_QSPI_PER_CNT)

diff --git a/soc/am572x/SPI_soc.c b/soc/am572x/SPI_soc.c
index 6ad0337d0131d784b6dcca5930798f88a4a6bb6a..ffa1b95489b22024e61970d5c757ec3b41649f93 100644 (file)
--- a/soc/am572x/SPI_soc.c
+++ b/soc/am572x/SPI_soc.c
@@ -40,8 +40,6 @@
 
 #include <ti/csl/soc/am572x/src/cslr_soc.h>
 #include <ti/drv/spi/soc/SPI_soc.h>
-#include <ti/drv/spi/soc/QSPI_v1.h>
-#include <ti/csl/src/ip/mcspi/V0/mcspi.h>
 
 #define CSL_QSPI_PER_CNT    1U
 #define CSL_SPI_PER_CNT     (CSL_MCSPI_PER_CNT + CSL_QSPI_PER_CNT)

diff --git a/soc/am574x/SPI_soc.c b/soc/am574x/SPI_soc.c
index c49e5db4a924680cabd019dc738bdbea171b7999..f49c251cd0ce5532cb7e3b06d43bda4743552396 100644 (file)
--- a/soc/am574x/SPI_soc.c
+++ b/soc/am574x/SPI_soc.c
@@ -40,8 +40,6 @@
 
 #include <ti/csl/soc/am574x/src/cslr_soc.h>
 #include <ti/drv/spi/soc/SPI_soc.h>
-#include <ti/drv/spi/soc/QSPI_v1.h>
-#include <ti/csl/src/ip/mcspi/V0/mcspi.h>
 
 #define CSL_QSPI_PER_CNT    1U
 #define CSL_SPI_PER_CNT     (CSL_MCSPI_PER_CNT + CSL_QSPI_PER_CNT)

diff --git a/soc/dra72x/SPI_soc.c b/soc/dra72x/SPI_soc.c
index c5adf03b6812aca99b859b85ceaf3321949033a1..edb59c895e1593697bcbb7eb8bd3168d785c9213 100644 (file)
--- a/soc/dra72x/SPI_soc.c
+++ b/soc/dra72x/SPI_soc.c
@@ -40,9 +40,7 @@
 
 #include <ti/csl/soc.h>
 #include <ti/drv/spi/MCSPI.h>
-#include <ti/drv/spi/soc/QSPI_v1.h>
-#include <ti/drv/spi/soc/SPI_v1.h>
-#include <ti/csl/src/ip/mcspi/V0/mcspi.h>
+#include <ti/drv/spi/soc/SPI_soc.h>
 
 #define CSL_QSPI_PER_CNT    1U
 

diff --git a/soc/dra75x/SPI_soc.c b/soc/dra75x/SPI_soc.c
index f7afd33431512f3e7b5e2651bef742b62622f283..4af4b003a68b01993995f6bb636f4a44b9632dde 100644 (file)
--- a/soc/dra75x/SPI_soc.c
+++ b/soc/dra75x/SPI_soc.c
@@ -40,9 +40,7 @@
 
 #include <ti/csl/soc/dra75x/cslr_soc.h>
 #include <ti/drv/spi/MCSPI.h>
-#include <ti/drv/spi/soc/QSPI_v1.h>
-#include <ti/drv/spi/soc/SPI_v1.h>
-#include <ti/csl/src/ip/mcspi/V0/mcspi.h>
+#include <ti/drv/spi/soc/SPI_soc.h>
 
 #define CSL_QSPI_PER_CNT    1U
 

diff --git a/soc/dra78x/SPI_soc.c b/soc/dra78x/SPI_soc.c
index 18aa4bbe44af6094123930653ddabfb4c5fd05e2..0f7242913812ed2b02e420199d13a1608c145023 100644 (file)
--- a/soc/dra78x/SPI_soc.c
+++ b/soc/dra78x/SPI_soc.c
@@ -40,9 +40,7 @@
 
 #include <ti/csl/cslr_device.h>
 #include <ti/drv/spi/MCSPI.h>
-#include <ti/drv/spi/soc/QSPI_v1.h>
-#include <ti/drv/spi/soc/SPI_v1.h>
-#include <ti/csl/src/ip/mcspi/V0/mcspi.h>
+#include <ti/drv/spi/soc/SPI_soc.h>
 
 #define CSL_QSPI_PER_CNT    1U
 /* SPI configuration structure */

diff --git a/soc/tda2ex/SPI_soc.c b/soc/tda2ex/SPI_soc.c
index 8039df76b0fed65155a88499ac80895bdfab8f7b..5c70162d12ca4672bb28cee199e04fb44dee521a 100644 (file)
--- a/soc/tda2ex/SPI_soc.c
+++ b/soc/tda2ex/SPI_soc.c
@@ -40,8 +40,7 @@
 
 #include <ti/csl/cslr_device.h>
 #include <ti/drv/spi/MCSPI.h>
-#include <ti/drv/spi/soc/SPI_v1.h>
-#include <ti/csl/src/ip/mcspi/V0/mcspi.h>
+#include <ti/drv/spi/soc/SPI_soc.h>
 
 /* NOTE: Interrupt number 25 & 10 Entry not used are used */
 

diff --git a/soc/tda2px/SPI_soc.c b/soc/tda2px/SPI_soc.c
index fab9a439351a91a65221afd7f1771e22d02f44c0..5519d5d53701caf6e1bc783b6435f6a3a6e391f5 100644 (file)
--- a/soc/tda2px/SPI_soc.c
+++ b/soc/tda2px/SPI_soc.c
@@ -40,8 +40,7 @@
 
 #include <ti/csl/cslr_device.h>
 #include <ti/drv/spi/MCSPI.h>
-#include <ti/drv/spi/soc/SPI_v1.h>
-#include <ti/csl/src/ip/mcspi/V0/mcspi.h>
+#include <ti/drv/spi/soc/SPI_soc.h>
 
 /* NOTE: Interrupt number 25 & 10 Entry not used are used */
 

diff --git a/soc/tda2xx/SPI_soc.c b/soc/tda2xx/SPI_soc.c
index 105bfbddc50ba5a0780843390d02eb43386362fc..2674a6d6a3f772029e4f56d5a6912250cfbfd375 100644 (file)
--- a/soc/tda2xx/SPI_soc.c
+++ b/soc/tda2xx/SPI_soc.c
@@ -40,8 +40,7 @@
 
 #include <ti/csl/cslr_device.h>
 #include <ti/drv/spi/MCSPI.h>
-#include <ti/drv/spi/soc/SPI_v1.h>
-#include <ti/csl/src/ip/mcspi/V0/mcspi.h>
+#include <ti/drv/spi/soc/SPI_soc.h>
 
 /* NOTE: Interrupt number 25 & 10 Entry not used are used */
 

diff --git a/src/src_files_common.mk b/src/src_files_common.mk
index 9f15c55883a3eb37553b5712a670cf65cd7ed7ed..a9b1cabb659bfab075bcec56c6e5b81bb3bcb719 100644 (file)
--- a/src/src_files_common.mk
+++ b/src/src_files_common.mk
@@ -42,7 +42,8 @@ PACKAGE_SRCS_COMMON = makefile MCSPI.h SPI.h spi_component.mk \
   SRCDIR = . src src/v1
   INCDIR = . src src/v1
   SRCS_COMMON += SPI_drv.c SPI_v1.c
-  PACKAGE_SRCS_COMMON += src/v1
+  PACKAGE_SRCS_COMMON += src/v1/SPI_v1.c
+  
 ifeq ($(SOC),$(filter $(SOC), am335x, am437x))
   SRCDIR += src/v2
   INCDIR += src/v2
@@ -50,10 +51,16 @@ ifeq ($(SOC),$(filter $(SOC), am335x, am437x))
   PACKAGE_SRCS_COMMON += src/v2
 endif
 # For all non-TDA devices, component contains all source files in library and package
-ifneq ($(SOC),$(filter $(SOC), tda2xx tda2px tda2ex tda3xx))
+ifneq ($(SOC),$(filter $(SOC), tda2xx tda2px tda2ex tda3xx j721e))
   SRCDIR += src/v0
   INCDIR += src/v0
   SRCS_COMMON += SPI_v0.c QSPI_v0.c QSPI_v1.c OSPI_v0.c
   PACKAGE_SRCS_COMMON += src/v0
 endif
 
+ifeq ($(SOC),$(filter $(SOC), j721e))
+  SRCDIR += src/v0
+  INCDIR += src/v0
+  SRCS_COMMON += OSPI_v0.c
+  PACKAGE_SRCS_COMMON += src/v0/OSPI_v0.c src/v0/OSPI_v0.h
+endif