leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: keystone_net: remove SoC specific emac_regs structure

Browse Source 
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>
This commit is contained in:
Hao Zhang
2014-09-29 22:17:20 +03:00
committed by Tom Rini
parent 8347210a3f
commit b2cfe32278
2 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/include/asm/arch-keystone/emac_defs.h
View File

@@ -202,21 +202,6 @@ struct mdio_regs {
dv_reg userphysel1; 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) \ #define SGMII_ACCESS(port, reg) \
*((volatile unsigned int *)(sgmiis[port] + reg)) *((volatile unsigned int *)(sgmiis[port] + reg))

8
drivers/net/keystone_net.c
View File

@@ -45,8 +45,6 @@ static void keystone2_eth_mdio_enable(void);
static int gen_get_link_speed(int phy_addr); static int gen_get_link_speed(int phy_addr);
/* EMAC Addresses */ /* EMAC Addresses */
static volatile struct emac_regs *adap_emac =
(struct emac_regs *)EMAC_EMACSL_BASE_ADDR;
static volatile struct mdio_regs *adap_mdio = static volatile struct mdio_regs *adap_mdio =
(struct mdio_regs *)EMAC_MDIO_BASE_ADDR; (struct mdio_regs *)EMAC_MDIO_BASE_ADDR;
@@ -169,10 +167,10 @@ static void __attribute__((unused))
* Check if link detected is giga-bit * Check if link detected is giga-bit
* If Gigabit mode detected, enable gigbit in MAC * 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, 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) int keystone_sgmii_link_status(int port)