diff options
author | Jon Hunter <jonathanh@nvidia.com> | 2016-08-26 09:08:58 -0400 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2016-08-30 15:57:32 -0400 |
commit | 2929be29e09b789f0e6c61549e3426c439d78c58 (patch) | |
tree | 3e8e1a8a99e548a5ca8f89773aaab321c1e1425c /drivers/i2c/busses | |
parent | c7ae44e8aadafec41eb7a5dcdeebc9022bf6c1ce (diff) |
i2c: tegra: Use BIT macro
Checkpatch warns about spacing around the '<<' operator in the Tegra I2C
driver and so fix these by converting the bit definitions that are using
this operator to use the BIT macro.
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r-- | drivers/i2c/busses/i2c-tegra.c | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index b90bc326907d..98d13437eb42 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c | |||
@@ -36,21 +36,21 @@ | |||
36 | 36 | ||
37 | #define I2C_CNFG 0x000 | 37 | #define I2C_CNFG 0x000 |
38 | #define I2C_CNFG_DEBOUNCE_CNT_SHIFT 12 | 38 | #define I2C_CNFG_DEBOUNCE_CNT_SHIFT 12 |
39 | #define I2C_CNFG_PACKET_MODE_EN (1<<10) | 39 | #define I2C_CNFG_PACKET_MODE_EN BIT(10) |
40 | #define I2C_CNFG_NEW_MASTER_FSM (1<<11) | 40 | #define I2C_CNFG_NEW_MASTER_FSM BIT(11) |
41 | #define I2C_CNFG_MULTI_MASTER_MODE (1<<17) | 41 | #define I2C_CNFG_MULTI_MASTER_MODE BIT(17) |
42 | #define I2C_STATUS 0x01C | 42 | #define I2C_STATUS 0x01C |
43 | #define I2C_SL_CNFG 0x020 | 43 | #define I2C_SL_CNFG 0x020 |
44 | #define I2C_SL_CNFG_NACK (1<<1) | 44 | #define I2C_SL_CNFG_NACK BIT(1) |
45 | #define I2C_SL_CNFG_NEWSL (1<<2) | 45 | #define I2C_SL_CNFG_NEWSL BIT(2) |
46 | #define I2C_SL_ADDR1 0x02c | 46 | #define I2C_SL_ADDR1 0x02c |
47 | #define I2C_SL_ADDR2 0x030 | 47 | #define I2C_SL_ADDR2 0x030 |
48 | #define I2C_TX_FIFO 0x050 | 48 | #define I2C_TX_FIFO 0x050 |
49 | #define I2C_RX_FIFO 0x054 | 49 | #define I2C_RX_FIFO 0x054 |
50 | #define I2C_PACKET_TRANSFER_STATUS 0x058 | 50 | #define I2C_PACKET_TRANSFER_STATUS 0x058 |
51 | #define I2C_FIFO_CONTROL 0x05c | 51 | #define I2C_FIFO_CONTROL 0x05c |
52 | #define I2C_FIFO_CONTROL_TX_FLUSH (1<<1) | 52 | #define I2C_FIFO_CONTROL_TX_FLUSH BIT(1) |
53 | #define I2C_FIFO_CONTROL_RX_FLUSH (1<<0) | 53 | #define I2C_FIFO_CONTROL_RX_FLUSH BIT(0) |
54 | #define I2C_FIFO_CONTROL_TX_TRIG_SHIFT 5 | 54 | #define I2C_FIFO_CONTROL_TX_TRIG_SHIFT 5 |
55 | #define I2C_FIFO_CONTROL_RX_TRIG_SHIFT 2 | 55 | #define I2C_FIFO_CONTROL_RX_TRIG_SHIFT 2 |
56 | #define I2C_FIFO_STATUS 0x060 | 56 | #define I2C_FIFO_STATUS 0x060 |
@@ -60,26 +60,26 @@ | |||
60 | #define I2C_FIFO_STATUS_RX_SHIFT 0 | 60 | #define I2C_FIFO_STATUS_RX_SHIFT 0 |
61 | #define I2C_INT_MASK 0x064 | 61 | #define I2C_INT_MASK 0x064 |
62 | #define I2C_INT_STATUS 0x068 | 62 | #define I2C_INT_STATUS 0x068 |
63 | #define I2C_INT_PACKET_XFER_COMPLETE (1<<7) | 63 | #define I2C_INT_PACKET_XFER_COMPLETE BIT(7) |
64 | #define I2C_INT_ALL_PACKETS_XFER_COMPLETE (1<<6) | 64 | #define I2C_INT_ALL_PACKETS_XFER_COMPLETE BIT(6) |
65 | #define I2C_INT_TX_FIFO_OVERFLOW (1<<5) | 65 | #define I2C_INT_TX_FIFO_OVERFLOW BIT(5) |
66 | #define I2C_INT_RX_FIFO_UNDERFLOW (1<<4) | 66 | #define I2C_INT_RX_FIFO_UNDERFLOW BIT(4) |
67 | #define I2C_INT_NO_ACK (1<<3) | 67 | #define I2C_INT_NO_ACK BIT(3) |
68 | #define I2C_INT_ARBITRATION_LOST (1<<2) | 68 | #define I2C_INT_ARBITRATION_LOST BIT(2) |
69 | #define I2C_INT_TX_FIFO_DATA_REQ (1<<1) | 69 | #define I2C_INT_TX_FIFO_DATA_REQ BIT(1) |
70 | #define I2C_INT_RX_FIFO_DATA_REQ (1<<0) | 70 | #define I2C_INT_RX_FIFO_DATA_REQ BIT(0) |
71 | #define I2C_CLK_DIVISOR 0x06c | 71 | #define I2C_CLK_DIVISOR 0x06c |
72 | #define I2C_CLK_DIVISOR_STD_FAST_MODE_SHIFT 16 | 72 | #define I2C_CLK_DIVISOR_STD_FAST_MODE_SHIFT 16 |
73 | #define I2C_CLK_MULTIPLIER_STD_FAST_MODE 8 | 73 | #define I2C_CLK_MULTIPLIER_STD_FAST_MODE 8 |
74 | 74 | ||
75 | #define DVC_CTRL_REG1 0x000 | 75 | #define DVC_CTRL_REG1 0x000 |
76 | #define DVC_CTRL_REG1_INTR_EN (1<<10) | 76 | #define DVC_CTRL_REG1_INTR_EN BIT(10) |
77 | #define DVC_CTRL_REG2 0x004 | 77 | #define DVC_CTRL_REG2 0x004 |
78 | #define DVC_CTRL_REG3 0x008 | 78 | #define DVC_CTRL_REG3 0x008 |
79 | #define DVC_CTRL_REG3_SW_PROG (1<<26) | 79 | #define DVC_CTRL_REG3_SW_PROG BIT(26) |
80 | #define DVC_CTRL_REG3_I2C_DONE_INTR_EN (1<<30) | 80 | #define DVC_CTRL_REG3_I2C_DONE_INTR_EN BIT(30) |
81 | #define DVC_STATUS 0x00c | 81 | #define DVC_STATUS 0x00c |
82 | #define DVC_STATUS_I2C_DONE_INTR (1<<30) | 82 | #define DVC_STATUS_I2C_DONE_INTR BIT(30) |
83 | 83 | ||
84 | #define I2C_ERR_NONE 0x00 | 84 | #define I2C_ERR_NONE 0x00 |
85 | #define I2C_ERR_NO_ACK 0x01 | 85 | #define I2C_ERR_NO_ACK 0x01 |
@@ -89,26 +89,26 @@ | |||
89 | #define PACKET_HEADER0_HEADER_SIZE_SHIFT 28 | 89 | #define PACKET_HEADER0_HEADER_SIZE_SHIFT 28 |
90 | #define PACKET_HEADER0_PACKET_ID_SHIFT 16 | 90 | #define PACKET_HEADER0_PACKET_ID_SHIFT 16 |
91 | #define PACKET_HEADER0_CONT_ID_SHIFT 12 | 91 | #define PACKET_HEADER0_CONT_ID_SHIFT 12 |
92 | #define PACKET_HEADER0_PROTOCOL_I2C (1<<4) | 92 | #define PACKET_HEADER0_PROTOCOL_I2C BIT(4) |
93 | 93 | ||
94 | #define I2C_HEADER_HIGHSPEED_MODE (1<<22) | 94 | #define I2C_HEADER_HIGHSPEED_MODE BIT(22) |
95 | #define I2C_HEADER_CONT_ON_NAK (1<<21) | 95 | #define I2C_HEADER_CONT_ON_NAK BIT(21) |
96 | #define I2C_HEADER_SEND_START_BYTE (1<<20) | 96 | #define I2C_HEADER_SEND_START_BYTE BIT(20) |
97 | #define I2C_HEADER_READ (1<<19) | 97 | #define I2C_HEADER_READ BIT(19) |
98 | #define I2C_HEADER_10BIT_ADDR (1<<18) | 98 | #define I2C_HEADER_10BIT_ADDR BIT(18) |
99 | #define I2C_HEADER_IE_ENABLE (1<<17) | 99 | #define I2C_HEADER_IE_ENABLE BIT(17) |
100 | #define I2C_HEADER_REPEAT_START (1<<16) | 100 | #define I2C_HEADER_REPEAT_START BIT(16) |
101 | #define I2C_HEADER_CONTINUE_XFER (1<<15) | 101 | #define I2C_HEADER_CONTINUE_XFER BIT(15) |
102 | #define I2C_HEADER_MASTER_ADDR_SHIFT 12 | 102 | #define I2C_HEADER_MASTER_ADDR_SHIFT 12 |
103 | #define I2C_HEADER_SLAVE_ADDR_SHIFT 1 | 103 | #define I2C_HEADER_SLAVE_ADDR_SHIFT 1 |
104 | 104 | ||
105 | #define I2C_CONFIG_LOAD 0x08C | 105 | #define I2C_CONFIG_LOAD 0x08C |
106 | #define I2C_MSTR_CONFIG_LOAD (1 << 0) | 106 | #define I2C_MSTR_CONFIG_LOAD BIT(0) |
107 | #define I2C_SLV_CONFIG_LOAD (1 << 1) | 107 | #define I2C_SLV_CONFIG_LOAD BIT(1) |
108 | #define I2C_TIMEOUT_CONFIG_LOAD (1 << 2) | 108 | #define I2C_TIMEOUT_CONFIG_LOAD BIT(2) |
109 | 109 | ||
110 | #define I2C_CLKEN_OVERRIDE 0x090 | 110 | #define I2C_CLKEN_OVERRIDE 0x090 |
111 | #define I2C_MST_CORE_CLKEN_OVR (1 << 0) | 111 | #define I2C_MST_CORE_CLKEN_OVR BIT(0) |
112 | 112 | ||
113 | /* | 113 | /* |
114 | * msg_end_type: The bus control which need to be send at end of transfer. | 114 | * msg_end_type: The bus control which need to be send at end of transfer. |