[U-Boot] [PATCH v4 14/24] spi: tegra: Use BIT macro

2015-10-22 Thread Jagan Teki 
Replace numerical bit shift with BIT macro in tegra*.c

:%s/(1 << nr)/BIT(nr)/g
where nr = 0, 1, 2  31

Cc: Stephen Warren 
Cc: Tom Warren 
Signed-off-by: Jagan Teki 
---
 drivers/spi/tegra114_spi.c   | 64 ++--
 drivers/spi/tegra20_sflash.c | 50 +-
 drivers/spi/tegra20_slink.c  | 58 +++
 3 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c
index a965f80..d9edd11 100644
--- a/drivers/spi/tegra114_spi.c
+++ b/drivers/spi/tegra114_spi.c
@@ -33,54 +33,54 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 /* COMMAND1 */
-#define SPI_CMD1_GO(1 << 31)
-#define SPI_CMD1_M_S   (1 << 30)
+#define SPI_CMD1_GOBIT(31)
+#define SPI_CMD1_M_S   BIT(30)
 #define SPI_CMD1_MODE_MASK 0x3
 #define SPI_CMD1_MODE_SHIFT28
 #define SPI_CMD1_CS_SEL_MASK   0x3
 #define SPI_CMD1_CS_SEL_SHIFT  26
-#define SPI_CMD1_CS_POL_INACTIVE3  (1 << 25)
-#define SPI_CMD1_CS_POL_INACTIVE2  (1 << 24)
-#define SPI_CMD1_CS_POL_INACTIVE1  (1 << 23)
-#define SPI_CMD1_CS_POL_INACTIVE0  (1 << 22)
-#define SPI_CMD1_CS_SW_HW  (1 << 21)
-#define SPI_CMD1_CS_SW_VAL (1 << 20)
+#define SPI_CMD1_CS_POL_INACTIVE3  BIT(25)
+#define SPI_CMD1_CS_POL_INACTIVE2  BIT(24)
+#define SPI_CMD1_CS_POL_INACTIVE1  BIT(23)
+#define SPI_CMD1_CS_POL_INACTIVE0  BIT(22)
+#define SPI_CMD1_CS_SW_HW  BIT(21)
+#define SPI_CMD1_CS_SW_VAL BIT(20)
 #define SPI_CMD1_IDLE_SDA_MASK 0x3
 #define SPI_CMD1_IDLE_SDA_SHIFT18
-#define SPI_CMD1_BIDIR (1 << 17)
-#define SPI_CMD1_LSBI_FE   (1 << 16)
-#define SPI_CMD1_LSBY_FE   (1 << 15)
-#define SPI_CMD1_BOTH_EN_BIT   (1 << 14)
-#define SPI_CMD1_BOTH_EN_BYTE  (1 << 13)
-#define SPI_CMD1_RX_EN (1 << 12)
-#define SPI_CMD1_TX_EN (1 << 11)
-#define SPI_CMD1_PACKED(1 << 5)
+#define SPI_CMD1_BIDIR BIT(17)
+#define SPI_CMD1_LSBI_FE   BIT(16)
+#define SPI_CMD1_LSBY_FE   BIT(15)
+#define SPI_CMD1_BOTH_EN_BIT   BIT(14)
+#define SPI_CMD1_BOTH_EN_BYTE  BIT(13)
+#define SPI_CMD1_RX_EN BIT(12)
+#define SPI_CMD1_TX_EN BIT(11)
+#define SPI_CMD1_PACKEDBIT(5)
 #define SPI_CMD1_BIT_LEN_MASK  0x1F
 #define SPI_CMD1_BIT_LEN_SHIFT 0
 
 /* COMMAND2 */
-#define SPI_CMD2_TX_CLK_TAP_DELAY  (1 << 6)
+#define SPI_CMD2_TX_CLK_TAP_DELAY  BIT(6)
 #define SPI_CMD2_TX_CLK_TAP_DELAY_MASK (0x3F << 6)
-#define SPI_CMD2_RX_CLK_TAP_DELAY  (1 << 0)
+#define SPI_CMD2_RX_CLK_TAP_DELAY  BIT(0)
 #define SPI_CMD2_RX_CLK_TAP_DELAY_MASK (0x3F << 0)
 
 /* TRANSFER STATUS */
-#define SPI_XFER_STS_RDY   (1 << 30)
+#define SPI_XFER_STS_RDY   BIT(30)
 
 /* FIFO STATUS */
-#define SPI_FIFO_STS_CS_INACTIVE   (1 << 31)
-#define SPI_FIFO_STS_FRAME_END (1 << 30)
-#define SPI_FIFO_STS_RX_FIFO_FLUSH (1 << 15)
-#define SPI_FIFO_STS_TX_FIFO_FLUSH (1 << 14)
-#define SPI_FIFO_STS_ERR   (1 << 8)
-#define SPI_FIFO_STS_TX_FIFO_OVF   (1 << 7)
-#define SPI_FIFO_STS_TX_FIFO_UNR   (1 << 6)
-#define SPI_FIFO_STS_RX_FIFO_OVF   (1 << 5)
-#define SPI_FIFO_STS_RX_FIFO_UNR   (1 << 4)
-#define SPI_FIFO_STS_TX_FIFO_FULL  (1 << 3)
-#define SPI_FIFO_STS_TX_FIFO_EMPTY (1 << 2)
-#define SPI_FIFO_STS_RX_FIFO_FULL  (1 << 1)
-#define SPI_FIFO_STS_RX_FIFO_EMPTY (1 << 0)
+#define SPI_FIFO_STS_CS_INACTIVE   BIT(31)
+#define SPI_FIFO_STS_FRAME_END BIT(30)
+#define SPI_FIFO_STS_RX_FIFO_FLUSH BIT(15)
+#define SPI_FIFO_STS_TX_FIFO_FLUSH BIT(14)
+#define SPI_FIFO_STS_ERR   BIT(8)
+#define SPI_FIFO_STS_TX_FIFO_OVF   BIT(7)
+#define SPI_FIFO_STS_TX_FIFO_UNR   BIT(6)
+#define SPI_FIFO_STS_RX_FIFO_OVF   BIT(5)
+#define SPI_FIFO_STS_RX_FIFO_UNR   BIT(4)
+#define SPI_FIFO_STS_TX_FIFO_FULL  BIT(3)
+#define SPI_FIFO_STS_TX_FIFO_EMPTY BIT(2)
+#define SPI_FIFO_STS_RX_FIFO_FULL  BIT(1)
+#define SPI_FIFO_STS_RX_FIFO_EMPTY BIT(0)
 
 #define SPI_TIMEOUT1000
 #define TEGRA_SPI_MAX_FREQ 5200
diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c
index afa0848..5dc196b 100644
--- a/drivers/spi/tegra20_sflash.c
+++ b/drivers/spi/tegra20_sflash.c
@@ -20,37 +20,37 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define SPI_CMD_GO (1 << 30)
+#define SPI_CMD_GO BIT(30)
 #define SPI_CMD_ACTIVE_SCLK_SHIFT  26
 #define SPI_CMD_ACTIVE_SCLK_MASK   (3 << SPI_CMD_ACTIVE_SCLK_SHIFT)
-#define SPI_CMD_CK_SDA (1 << 21)
+#define SPI_CMD_CK_SDA

Re: [U-Boot] [PATCH v4 14/24] spi: tegra: Use BIT macro

2015-10-22 Thread Tom Rini 
On Fri, Oct 23, 2015 at 02:20:14AM +0530, Jagan Teki wrote:

> Replace numerical bit shift with BIT macro in tegra*.c
> 
> :%s/(1 << nr)/BIT(nr)/g
> where nr = 0, 1, 2  31
> 
> Cc: Stephen Warren 
> Cc: Tom Warren 
> Signed-off-by: Jagan Teki 

Reviewed-by: Tom Rini 

-- 
Tom


signature.asc
Description: Digital signature
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot