Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-watchdog

[thirdparty/u-boot.git] / include / fsl_dspi.h

diff --git a/include/fsl_dspi.h b/include/fsl_dspi.h
index b569b4d2b629a05e21c267dfddf6f3c39714a2d5..ebe1803e4665440c8a0a337df8c9e543f68551ec 100644 (file)
--- a/include/fsl_dspi.h
+++ b/include/fsl_dspi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Freescale DSPI Module Defines
  *
@@ -5,8 +6,6 @@
  * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
  * Chao Fu (B44548@freesacle.com)
  * Haikun Wang (B53464@freescale.com)
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _FSL_DSPI_H_
@@ -22,14 +21,8 @@ struct dspi {
        u32 irsr;       /* 0x30 */
        u32 tfr;        /* 0x34 - PUSHR */
        u32 rfr;        /* 0x38 - POPR */
-#ifdef CONFIG_MCF547x_8x
-       u32 tfdr[4];    /* 0x3C */
-       u8 resv2[0x30]; /* 0x40 */
-       u32 rfdr[4];    /* 0x7C */
-#else
        u32 tfdr[16];   /* 0x3C */
        u32 rfdr[16];   /* 0x7C */
-#endif
 };
 
 /* Module configuration */
@@ -95,6 +88,7 @@ struct dspi {
 #define DSPI_CTAR_ASC(x)               (((x) & 0x0F) << 8)
 #define DSPI_CTAR_DT(x)                        (((x) & 0x0F) << 4)
 #define DSPI_CTAR_BR(x)                        ((x) & 0x0F)
+#define DSPI_CTAR_SCALE_BITS           0xf
 
 /* Status */
 #define DSPI_SR_TCF                    0x80000000