Skip to content

Commit

Permalink
net: altera_tse: use BIT macro
Browse files Browse the repository at this point in the history
Replace numerical bit shift with BIT macro
in altera_tse

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

Signed-off-by: Thomas Chou <[email protected]>
Reviewed-by: Marek Vasut <[email protected]>
Reviewed-by: Chin Liang See <[email protected]>
Reviewed-by: Jagan Teki <[email protected]>
Acked-by: Joe Hershberger <[email protected]>
  • Loading branch information
hippo5329 committed Nov 6, 2015
1 parent 14fb536 commit 4c8df1d
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions drivers/net/altera_tse.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
#define __packed_1_ __packed __aligned(1)

/* SGDMA Stuff */
#define ALT_SGDMA_STATUS_BUSY_MSK 0x00000010
#define ALT_SGDMA_STATUS_BUSY_MSK BIT(4)

#define ALT_SGDMA_CONTROL_RUN_MSK 0x00000020
#define ALT_SGDMA_CONTROL_STOP_DMA_ER_MSK 0x00000040
#define ALT_SGDMA_CONTROL_SOFTWARERESET_MSK 0x00010000
#define ALT_SGDMA_CONTROL_RUN_MSK BIT(5)
#define ALT_SGDMA_CONTROL_STOP_DMA_ER_MSK BIT(6)
#define ALT_SGDMA_CONTROL_SOFTWARERESET_MSK BIT(16)

/*
* Descriptor control bit masks & offsets
Expand All @@ -27,10 +27,10 @@
* The following bit-offsets are expressed relative to the LSB of
* the control register bitfield.
*/
#define ALT_SGDMA_DESCRIPTOR_CONTROL_GENERATE_EOP_MSK 0x00000001
#define ALT_SGDMA_DESCRIPTOR_CONTROL_READ_FIXED_ADDRESS_MSK 0x00000002
#define ALT_SGDMA_DESCRIPTOR_CONTROL_WRITE_FIXED_ADDRESS_MSK 0x00000004
#define ALT_SGDMA_DESCRIPTOR_CONTROL_OWNED_BY_HW_MSK 0x00000080
#define ALT_SGDMA_DESCRIPTOR_CONTROL_GENERATE_EOP_MSK BIT(0)
#define ALT_SGDMA_DESCRIPTOR_CONTROL_READ_FIXED_ADDRESS_MSK BIT(1)
#define ALT_SGDMA_DESCRIPTOR_CONTROL_WRITE_FIXED_ADDRESS_MSK BIT(2)
#define ALT_SGDMA_DESCRIPTOR_CONTROL_OWNED_BY_HW_MSK BIT(7)

/*
* Descriptor status bit masks & offsets
Expand All @@ -39,7 +39,7 @@
* The following bit-offsets are expressed relative to the LSB of
* the status register bitfield.
*/
#define ALT_SGDMA_DESCRIPTOR_STATUS_TERMINATED_BY_EOP_MSK 0x00000080
#define ALT_SGDMA_DESCRIPTOR_STATUS_TERMINATED_BY_EOP_MSK BIT(7)

/*
* The SGDMA controller buffer descriptor allocates
Expand Down Expand Up @@ -85,12 +85,12 @@ struct alt_sgdma_registers {
};

/* TSE Stuff */
#define ALTERA_TSE_CMD_TX_ENA_MSK 0x00000001
#define ALTERA_TSE_CMD_RX_ENA_MSK 0x00000002
#define ALTERA_TSE_CMD_ETH_SPEED_MSK 0x00000008
#define ALTERA_TSE_CMD_HD_ENA_MSK 0x00000400
#define ALTERA_TSE_CMD_SW_RESET_MSK 0x00002000
#define ALTERA_TSE_CMD_ENA_10_MSK 0x02000000
#define ALTERA_TSE_CMD_TX_ENA_MSK BIT(0)
#define ALTERA_TSE_CMD_RX_ENA_MSK BIT(1)
#define ALTERA_TSE_CMD_ETH_SPEED_MSK BIT(3)
#define ALTERA_TSE_CMD_HD_ENA_MSK BIT(10)
#define ALTERA_TSE_CMD_SW_RESET_MSK BIT(13)
#define ALTERA_TSE_CMD_ENA_10_MSK BIT(25)

#define ALT_TSE_SW_RESET_TIMEOUT (3 * CONFIG_SYS_HZ)
#define ALT_TSE_SGDMA_BUSY_TIMEOUT (3 * CONFIG_SYS_HZ)
Expand Down

0 comments on commit 4c8df1d

Please sign in to comment.