Merge branch '2020-06-15-misc-bugfixes'

[oweals/u-boot.git] / drivers / spi / atmel_spi.h

diff --git a/drivers/spi/atmel_spi.h b/drivers/spi/atmel_spi.h
index 057de9adee6e44bb60154adc543d3b19a6f9aaa3..9663cca5e6657107d84223757f8dc9fd3db9f643 100644 (file)
--- a/drivers/spi/atmel_spi.h
+++ b/drivers/spi/atmel_spi.h
@@ -3,6 +3,7 @@
  */
 
 /* Register offsets */
+#include <linux/bitops.h>
 #define ATMEL_SPI_CR                   0x0000
 #define ATMEL_SPI_MR                   0x0004
 #define ATMEL_SPI_RDR                  0x0008
@@ -15,19 +16,19 @@
 #define ATMEL_SPI_VERSION              0x00fc
 
 /* Bits in CR */
-#define ATMEL_SPI_CR_SPIEN             (1 << 0)
-#define ATMEL_SPI_CR_SPIDIS            (1 << 1)
-#define ATMEL_SPI_CR_SWRST             (1 << 7)
-#define ATMEL_SPI_CR_LASTXFER          (1 << 24)
+#define ATMEL_SPI_CR_SPIEN             BIT(0)
+#define ATMEL_SPI_CR_SPIDIS            BIT(1)
+#define ATMEL_SPI_CR_SWRST             BIT(7)
+#define ATMEL_SPI_CR_LASTXFER          BIT(24)
 
 /* Bits in MR */
-#define ATMEL_SPI_MR_MSTR              (1 << 0)
-#define ATMEL_SPI_MR_PS                        (1 << 1)
-#define ATMEL_SPI_MR_PCSDEC            (1 << 2)
-#define ATMEL_SPI_MR_FDIV              (1 << 3)
-#define ATMEL_SPI_MR_MODFDIS           (1 << 4)
-#define ATMEL_SPI_MR_WDRBT             (1 << 5)
-#define ATMEL_SPI_MR_LLB               (1 << 7)
+#define ATMEL_SPI_MR_MSTR              BIT(0)
+#define ATMEL_SPI_MR_PS                        BIT(1)
+#define ATMEL_SPI_MR_PCSDEC            BIT(2)
+#define ATMEL_SPI_MR_FDIV              BIT(3)
+#define ATMEL_SPI_MR_MODFDIS           BIT(4)
+#define ATMEL_SPI_MR_WDRBT             BIT(5)
+#define ATMEL_SPI_MR_LLB               BIT(7)
 #define ATMEL_SPI_MR_PCS(x)            (((x) & 15) << 16)
 #define ATMEL_SPI_MR_DLYBCS(x)         ((x) << 24)
 
@@ -38,33 +39,33 @@
 /* Bits in TDR */
 #define ATMEL_SPI_TDR_TD(x)            (x)
 #define ATMEL_SPI_TDR_PCS(x)           ((x) << 16)
-#define ATMEL_SPI_TDR_LASTXFER         (1 << 24)
+#define ATMEL_SPI_TDR_LASTXFER         BIT(24)
 
 /* Bits in SR/IER/IDR/IMR */
-#define ATMEL_SPI_SR_RDRF              (1 << 0)
-#define ATMEL_SPI_SR_TDRE              (1 << 1)
-#define ATMEL_SPI_SR_MODF              (1 << 2)
-#define ATMEL_SPI_SR_OVRES             (1 << 3)
-#define ATMEL_SPI_SR_ENDRX             (1 << 4)
-#define ATMEL_SPI_SR_ENDTX             (1 << 5)
-#define ATMEL_SPI_SR_RXBUFF            (1 << 6)
-#define ATMEL_SPI_SR_TXBUFE            (1 << 7)
-#define ATMEL_SPI_SR_NSSR              (1 << 8)
-#define ATMEL_SPI_SR_TXEMPTY           (1 << 9)
-#define ATMEL_SPI_SR_SPIENS            (1 << 16)
+#define ATMEL_SPI_SR_RDRF              BIT(0)
+#define ATMEL_SPI_SR_TDRE              BIT(1)
+#define ATMEL_SPI_SR_MODF              BIT(2)
+#define ATMEL_SPI_SR_OVRES             BIT(3)
+#define ATMEL_SPI_SR_ENDRX             BIT(4)
+#define ATMEL_SPI_SR_ENDTX             BIT(5)
+#define ATMEL_SPI_SR_RXBUFF            BIT(6)
+#define ATMEL_SPI_SR_TXBUFE            BIT(7)
+#define ATMEL_SPI_SR_NSSR              BIT(8)
+#define ATMEL_SPI_SR_TXEMPTY           BIT(9)
+#define ATMEL_SPI_SR_SPIENS            BIT(16)
 
 /* Bits in CSRx */
-#define ATMEL_SPI_CSRx_CPOL            (1 << 0)
-#define ATMEL_SPI_CSRx_NCPHA           (1 << 1)
-#define ATMEL_SPI_CSRx_CSAAT           (1 << 3)
+#define ATMEL_SPI_CSRx_CPOL            BIT(0)
+#define ATMEL_SPI_CSRx_NCPHA           BIT(1)
+#define ATMEL_SPI_CSRx_CSAAT           BIT(3)
 #define ATMEL_SPI_CSRx_BITS(x)         ((x) << 4)
 #define ATMEL_SPI_CSRx_SCBR(x)         ((x) << 8)
-#define ATMEL_SPI_CSRx_SCBR_MAX                0xff
+#define ATMEL_SPI_CSRx_SCBR_MAX                GENMASK(7, 0)
 #define ATMEL_SPI_CSRx_DLYBS(x)                ((x) << 16)
 #define ATMEL_SPI_CSRx_DLYBCT(x)       ((x) << 24)
 
 /* Bits in VERSION */
-#define ATMEL_SPI_VERSION_REV(x)       ((x) << 0)
+#define ATMEL_SPI_VERSION_REV(x)       ((x) & 0xfff)
 #define ATMEL_SPI_VERSION_MFN(x)       ((x) << 16)
 
 /* Constants for CSRx:BITS */
@@ -78,17 +79,6 @@
 #define ATMEL_SPI_BITS_15              7
 #define ATMEL_SPI_BITS_16              8
 
-struct atmel_spi_slave {
-       struct spi_slave slave;
-       void            *regs;
-       u32             mr;
-};
-
-static inline struct atmel_spi_slave *to_atmel_spi(struct spi_slave *slave)
-{
-       return container_of(slave, struct atmel_spi_slave, slave);
-}
-
 /* Register access macros */
 #define spi_readl(as, reg)                                     \
        readl(as->regs + ATMEL_SPI_##reg)