summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHao Zhang <hzhang@ti.com>2014-09-29 22:17:20 +0300
committerTom Rini <trini@ti.com>2014-10-23 11:27:05 -0400
commitb2cfe32278478dbf4b08a06f8d48436fc3d4ae7e (patch)
tree0ddd57ec160d87a41b80fc6b91851d0f0a535b44
parent8347210a3f158f0d40ced048673d8602802ed9cc (diff)
downloadu-boot-imx-b2cfe32278478dbf4b08a06f8d48436fc3d4ae7e.zip
u-boot-imx-b2cfe32278478dbf4b08a06f8d48436fc3d4ae7e.tar.gz
u-boot-imx-b2cfe32278478dbf4b08a06f8d48436fc3d4ae7e.tar.bz2
net: keystone_net: remove SoC specific emac_regs structure
This patch removes K2HK SOC specifc emac_regs structure, it uses soc specific register offset to keep the network driver common across all the Keystone II EVMs. Acked-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Hao Zhang <hzhang@ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
-rw-r--r--arch/arm/include/asm/arch-keystone/emac_defs.h15
-rw-r--r--drivers/net/keystone_net.c8
2 files changed, 3 insertions, 20 deletions
diff --git a/arch/arm/include/asm/arch-keystone/emac_defs.h b/arch/arm/include/asm/arch-keystone/emac_defs.h
index 9cd8925..47e0ada 100644
--- a/arch/arm/include/asm/arch-keystone/emac_defs.h
+++ b/arch/arm/include/asm/arch-keystone/emac_defs.h
@@ -202,21 +202,6 @@ struct mdio_regs {
dv_reg userphysel1;
};
-/* Ethernet MAC Registers Structure */
-struct emac_regs {
- dv_reg idver;
- dv_reg maccontrol;
- dv_reg macstatus;
- dv_reg soft_reset;
- dv_reg rx_maxlen;
- u32 rsvd0;
- dv_reg rx_pause;
- dv_reg tx_pause;
- dv_reg emcontrol;
- dv_reg pri_map;
- u32 rsvd1[6];
-};
-
#define SGMII_ACCESS(port, reg) \
*((volatile unsigned int *)(sgmiis[port] + reg))
diff --git a/drivers/net/keystone_net.c b/drivers/net/keystone_net.c
index 66532ee..4abde57 100644
--- a/drivers/net/keystone_net.c
+++ b/drivers/net/keystone_net.c
@@ -45,8 +45,6 @@ static void keystone2_eth_mdio_enable(void);
static int gen_get_link_speed(int phy_addr);
/* EMAC Addresses */
-static volatile struct emac_regs *adap_emac =
- (struct emac_regs *)EMAC_EMACSL_BASE_ADDR;
static volatile struct mdio_regs *adap_mdio =
(struct mdio_regs *)EMAC_MDIO_BASE_ADDR;
@@ -169,10 +167,10 @@ static void __attribute__((unused))
* Check if link detected is giga-bit
* If Gigabit mode detected, enable gigbit in MAC
*/
- writel(readl(&(adap_emac[eth_priv->slave_port - 1].maccontrol)) |
+ writel(readl(DEVICE_EMACSL_BASE(eth_priv->slave_port - 1) +
+ CPGMACSL_REG_CTL) |
EMAC_MACCONTROL_GIGFORCE | EMAC_MACCONTROL_GIGABIT_ENABLE,
- &(adap_emac[eth_priv->slave_port - 1].maccontrol))
- ;
+ DEVICE_EMACSL_BASE(eth_priv->slave_port - 1) + CPGMACSL_REG_CTL);
}
int keystone_sgmii_link_status(int port)