From 4b9b9e7c665bfcff43bc720b579b6b03a5078736 Mon Sep 17 00:00:00 2001 From: Sandeep Paulraj Date: Tue, 28 Dec 2010 14:37:33 -0500 Subject: DaVinci EMAC: Fix davinci_eth_gigabit_enable Enabling the gigabit was overwriting the previous configuration by setting up only GIGAFORCE and GIG bits of MAC control register. Modified to retain previous configuration while gigabit enabling. Signed-off-by: Prakash PM Signed-off-by: Sandeep Paulraj --- drivers/net/davinci_emac.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'drivers/net/davinci_emac.c') diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 56cd2aaf492..2642a5aaf0d 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -322,9 +322,10 @@ static void __attribute__((unused)) davinci_eth_gigabit_enable(void) * Check if link detected is giga-bit * If Gigabit mode detected, enable gigbit in MAC */ - writel(EMAC_MACCONTROL_GIGFORCE | - EMAC_MACCONTROL_GIGABIT_ENABLE, - &adap_emac->MACCONTROL); + writel(readl(&adap_emac->MACCONTROL) | + EMAC_MACCONTROL_GIGFORCE | + EMAC_MACCONTROL_GIGABIT_ENABLE, + &adap_emac->MACCONTROL); } } } -- cgit v1.2.3 From 2a7d603f37de94cb8529c67a35e71906f3c66dce Mon Sep 17 00:00:00 2001 From: Sandeep Paulraj Date: Tue, 28 Dec 2010 14:42:27 -0500 Subject: DaVinci EMAC: Add name to Ethernet device Adds "DaVinci-EMAC" as the name of the device so that it gets printed as "Using DaVinci-EMAC device" during network access (dhcp, tftp) instead of empty name in "Using" statement.This name also gets reflected in 'ethact' env variable. Signed-off-by: Hemant Pedanekar Signed-off-by: Sandeep Paulraj --- drivers/net/davinci_emac.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/net/davinci_emac.c') diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 2642a5aaf0d..2067a54a88f 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -667,6 +667,7 @@ int davinci_emac_initialize(void) return -1; memset(dev, 0, sizeof *dev); + sprintf(dev->name, "DaVinci-EMAC"); dev->iobase = 0; dev->init = davinci_eth_open; -- cgit v1.2.3 From 840f8923a076b02b983cf58c9466b5bdf5957133 Mon Sep 17 00:00:00 2001 From: Sandeep Paulraj Date: Tue, 28 Dec 2010 15:43:16 -0500 Subject: DaVinci DM6467: Added ET1011C (LSI) PHY support Added arch/arm/cpu/arm926ejs/davinci/et1011c.c for handling ET1011C gigabit phy. which overrides get_link_speed function from default implementation. This enables output of 125 MHz reference clock on SYS_CLK pin. Signed-off-by: Prakash PM Signed-off-by: Sandeep Paulraj --- drivers/net/davinci_emac.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'drivers/net/davinci_emac.c') diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 2067a54a88f..c359f54f9df 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -725,6 +725,13 @@ int davinci_emac_initialize(void) phy.get_link_speed = dp83848_get_link_speed; phy.auto_negotiate = dp83848_auto_negotiate; break; + case PHY_ET1011C: + sprintf(phy.name, "ET1011C @ 0x%02x", active_phy_addr); + phy.init = gen_init_phy; + phy.is_phy_connected = gen_is_phy_connected; + phy.get_link_speed = et1011c_get_link_speed; + phy.auto_negotiate = gen_auto_negotiate; + break; default: sprintf(phy.name, "GENERIC @ 0x%02x", active_phy_addr); phy.init = gen_init_phy; -- cgit v1.2.3