Re: [PATCH 1/2] i2c: i2c-mv64xxx: use BIT() macro for register value definitions

2014-12-17 Thread Wolfram Sang
On Thu, Dec 11, 2014 at 05:33:45PM +0100, Thomas Petazzoni wrote:
> Signed-off-by: Thomas Petazzoni 

Applied to for-current, thanks!



signature.asc
Description: Digital signature


[PATCH 1/2] i2c: i2c-mv64xxx: use BIT() macro for register value definitions

2014-12-11 Thread Thomas Petazzoni
Signed-off-by: Thomas Petazzoni 
---
 drivers/i2c/busses/i2c-mv64xxx.c | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 2f64273..7f57d1f 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -30,12 +30,12 @@
 #define MV64XXX_I2C_BAUD_DIV_N(val)(val & 0x7)
 #define MV64XXX_I2C_BAUD_DIV_M(val)((val & 0xf) << 3)
 
-#defineMV64XXX_I2C_REG_CONTROL_ACK 0x0004
-#defineMV64XXX_I2C_REG_CONTROL_IFLG0x0008
-#defineMV64XXX_I2C_REG_CONTROL_STOP0x0010
-#defineMV64XXX_I2C_REG_CONTROL_START   0x0020
-#defineMV64XXX_I2C_REG_CONTROL_TWSIEN  0x0040
-#defineMV64XXX_I2C_REG_CONTROL_INTEN   0x0080
+#defineMV64XXX_I2C_REG_CONTROL_ACK BIT(2)
+#defineMV64XXX_I2C_REG_CONTROL_IFLGBIT(3)
+#defineMV64XXX_I2C_REG_CONTROL_STOPBIT(4)
+#defineMV64XXX_I2C_REG_CONTROL_START   BIT(5)
+#defineMV64XXX_I2C_REG_CONTROL_TWSIEN  BIT(6)
+#defineMV64XXX_I2C_REG_CONTROL_INTEN   BIT(7)
 
 /* Ctlr status values */
 #defineMV64XXX_I2C_STATUS_BUS_ERR  0x00
@@ -68,16 +68,16 @@
 #defineMV64XXX_I2C_REG_BRIDGE_TIMING   0xe0
 
 /* Bridge Control values */
-#defineMV64XXX_I2C_BRIDGE_CONTROL_WR   0x0001
-#defineMV64XXX_I2C_BRIDGE_CONTROL_RD   0x0002
+#defineMV64XXX_I2C_BRIDGE_CONTROL_WR   BIT(0)
+#defineMV64XXX_I2C_BRIDGE_CONTROL_RD   BIT(1)
 #defineMV64XXX_I2C_BRIDGE_CONTROL_ADDR_SHIFT   2
-#defineMV64XXX_I2C_BRIDGE_CONTROL_ADDR_EXT 0x1000
+#defineMV64XXX_I2C_BRIDGE_CONTROL_ADDR_EXT BIT(12)
 #defineMV64XXX_I2C_BRIDGE_CONTROL_TX_SIZE_SHIFT13
 #defineMV64XXX_I2C_BRIDGE_CONTROL_RX_SIZE_SHIFT16
-#defineMV64XXX_I2C_BRIDGE_CONTROL_ENABLE   0x0008
+#defineMV64XXX_I2C_BRIDGE_CONTROL_ENABLE   BIT(19)
 
 /* Bridge Status values */
-#defineMV64XXX_I2C_BRIDGE_STATUS_ERROR 0x0001
+#defineMV64XXX_I2C_BRIDGE_STATUS_ERROR BIT(0)
 #defineMV64XXX_I2C_STATUS_OFFLOAD_ERROR0xf001
 #defineMV64XXX_I2C_STATUS_OFFLOAD_OK   0xf000
 
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html