Skip to content

Commit

Permalink
net: altera_tse: use data type u32 for regs and desc
Browse files Browse the repository at this point in the history
Use data type u32/u16/u8 for regs and desc, as it is more
portable.

Signed-off-by: Thomas Chou <[email protected]>
Reviewed-by: Marek Vasut <[email protected]>
Reviewed-by: Chin Liang See <[email protected]>
Acked-by: Joe Hershberger <[email protected]>
  • Loading branch information
hippo5329 committed Nov 6, 2015
1 parent fba54a5 commit 2cd0a52
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 60 deletions.
16 changes: 8 additions & 8 deletions drivers/net/altera_tse.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ static inline void alt_sgdma_construct_descriptor(
struct alt_sgdma_descriptor *next,
void *read_addr,
void *write_addr,
unsigned short length_or_eop,
u16 length_or_eop,
int generate_eop,
int read_fixed,
int write_fixed_or_sop)
{
unsigned char val;
u8 val;

/*
* Mark the "next" descriptor as "not" owned by hardware. This prevents
Expand Down Expand Up @@ -100,7 +100,7 @@ static int alt_sgdma_wait_transfer(struct alt_sgdma_registers *regs)
static int alt_sgdma_start_transfer(struct alt_sgdma_registers *regs,
struct alt_sgdma_descriptor *desc)
{
unsigned int val;
u32 val;

/* Point the controller at the descriptor */
writel(virt_to_phys(desc), &regs->next_descriptor_pointer);
Expand All @@ -121,7 +121,7 @@ static void tse_adjust_link(struct altera_tse_priv *priv,
struct phy_device *phydev)
{
struct alt_tse_mac *mac_dev = priv->mac_dev;
unsigned int refvar;
u32 refvar;

if (!phydev->link) {
debug("%s: No link.\n", phydev->dev->name);
Expand Down Expand Up @@ -230,7 +230,7 @@ static void altera_tse_stop(struct udevice *dev)
struct alt_sgdma_registers *rx_sgdma = priv->sgdma_rx;
struct alt_sgdma_registers *tx_sgdma = priv->sgdma_tx;
struct alt_sgdma_descriptor *rx_desc = priv->rx_desc;
unsigned int status;
u32 status;
int ret;
ulong ctime;

Expand Down Expand Up @@ -266,7 +266,7 @@ static int tse_mdio_read(struct mii_dev *bus, int addr, int devad, int reg)
{
struct altera_tse_priv *priv = bus->priv;
struct alt_tse_mac *mac_dev = priv->mac_dev;
unsigned int value;
u32 value;

/* set mdio address */
writel(addr, &mac_dev->mdio_phy1_addr);
Expand Down Expand Up @@ -337,7 +337,7 @@ static int altera_tse_write_hwaddr(struct udevice *dev)
struct alt_tse_mac *mac_dev = priv->mac_dev;
struct eth_pdata *pdata = dev_get_platdata(dev);
u8 *hwaddr = pdata->enetaddr;
unsigned int mac_lo, mac_hi;
u32 mac_lo, mac_hi;

mac_lo = (hwaddr[3] << 24) | (hwaddr[2] << 16) |
(hwaddr[1] << 8) | hwaddr[0];
Expand All @@ -362,7 +362,7 @@ static int altera_tse_start(struct udevice *dev)
{
struct altera_tse_priv *priv = dev_get_priv(dev);
struct alt_tse_mac *mac_dev = priv->mac_dev;
unsigned int val;
u32 val;
int ret;

/* need to create sgdma */
Expand Down
104 changes: 52 additions & 52 deletions drivers/net/altera_tse.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,34 +54,34 @@
*
*/
struct alt_sgdma_descriptor {
unsigned int source; /* the address of data to be read. */
unsigned int source_pad;
u32 source; /* the address of data to be read. */
u32 source_pad;

unsigned int destination; /* the address to write data */
unsigned int destination_pad;
u32 destination; /* the address to write data */
u32 destination_pad;

unsigned int next; /* the next descriptor in the list. */
unsigned int next_pad;
u32 next; /* the next descriptor in the list. */
u32 next_pad;

unsigned short bytes_to_transfer; /* the number of bytes to transfer */
unsigned char read_burst;
unsigned char write_burst;
u16 bytes_to_transfer; /* the number of bytes to transfer */
u8 read_burst;
u8 write_burst;

unsigned short actual_bytes_transferred;/* bytes transferred by DMA */
unsigned char descriptor_status;
unsigned char descriptor_control;
u16 actual_bytes_transferred;/* bytes transferred by DMA */
u8 descriptor_status;
u8 descriptor_control;

} __packed_1_;

/* SG-DMA Control/Status Slave registers map */

struct alt_sgdma_registers {
unsigned int status;
unsigned int status_pad[3];
unsigned int control;
unsigned int control_pad[3];
unsigned int next_descriptor_pointer;
unsigned int descriptor_pad[3];
u32 status;
u32 status_pad[3];
u32 control;
u32 control_pad[3];
u32 next_descriptor_pointer;
u32 descriptor_pad[3];
};

/* TSE Stuff */
Expand All @@ -98,47 +98,47 @@ struct alt_sgdma_registers {
/* MAC register Space */

struct alt_tse_mac {
unsigned int megacore_revision;
unsigned int scratch_pad;
unsigned int command_config;
unsigned int mac_addr_0;
unsigned int mac_addr_1;
unsigned int max_frame_length;
unsigned int pause_quanta;
unsigned int rx_sel_empty_threshold;
unsigned int rx_sel_full_threshold;
unsigned int tx_sel_empty_threshold;
unsigned int tx_sel_full_threshold;
unsigned int rx_almost_empty_threshold;
unsigned int rx_almost_full_threshold;
unsigned int tx_almost_empty_threshold;
unsigned int tx_almost_full_threshold;
unsigned int mdio_phy0_addr;
unsigned int mdio_phy1_addr;

unsigned int reserved1[0x29];
u32 megacore_revision;
u32 scratch_pad;
u32 command_config;
u32 mac_addr_0;
u32 mac_addr_1;
u32 max_frame_length;
u32 pause_quanta;
u32 rx_sel_empty_threshold;
u32 rx_sel_full_threshold;
u32 tx_sel_empty_threshold;
u32 tx_sel_full_threshold;
u32 rx_almost_empty_threshold;
u32 rx_almost_full_threshold;
u32 tx_almost_empty_threshold;
u32 tx_almost_full_threshold;
u32 mdio_phy0_addr;
u32 mdio_phy1_addr;

u32 reserved1[0x29];

/*FIFO control register. */
unsigned int tx_cmd_stat;
unsigned int rx_cmd_stat;
u32 tx_cmd_stat;
u32 rx_cmd_stat;

unsigned int reserved2[0x44];
u32 reserved2[0x44];

/*Registers 0 to 31 within PHY device 0/1 */
unsigned int mdio_phy0[0x20];
unsigned int mdio_phy1[0x20];
u32 mdio_phy0[0x20];
u32 mdio_phy1[0x20];

/*4 Supplemental MAC Addresses */
unsigned int supp_mac_addr_0_0;
unsigned int supp_mac_addr_0_1;
unsigned int supp_mac_addr_1_0;
unsigned int supp_mac_addr_1_1;
unsigned int supp_mac_addr_2_0;
unsigned int supp_mac_addr_2_1;
unsigned int supp_mac_addr_3_0;
unsigned int supp_mac_addr_3_1;

unsigned int reserved3[0x38];
u32 supp_mac_addr_0_0;
u32 supp_mac_addr_0_1;
u32 supp_mac_addr_1_0;
u32 supp_mac_addr_1_1;
u32 supp_mac_addr_2_0;
u32 supp_mac_addr_2_1;
u32 supp_mac_addr_3_0;
u32 supp_mac_addr_3_1;

u32 reserved3[0x38];
};

struct altera_tse_priv {
Expand Down

0 comments on commit 2cd0a52

Please sign in to comment.