lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

macb: support higher rate GEM MDIO clock divisors

Browse Source 
GEM devices support larger clock divisors and have a different
range of divisors.  Program the MDIO clock divisors based on the
device type.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Tested-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jamie Iles
2011-03-09 16:22:54 +00:00
parent f75ba50bdc
commit 70c9f3d437
2 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
drivers/net/ethernet/cadence/macb.c
View File

@@ -793,6 +793,48 @@ static void macb_reset_hw(struct macb *bp)
macb_readl(bp, ISR); macb_readl(bp, ISR);
} }
static u32 gem_mdc_clk_div(struct macb *bp)
{
u32 config;
unsigned long pclk_hz = clk_get_rate(bp->pclk);
if (pclk_hz <= 20000000)
config = GEM_BF(CLK, GEM_CLK_DIV8);
else if (pclk_hz <= 40000000)
config = GEM_BF(CLK, GEM_CLK_DIV16);
else if (pclk_hz <= 80000000)
config = GEM_BF(CLK, GEM_CLK_DIV32);
else if (pclk_hz <= 120000000)
config = GEM_BF(CLK, GEM_CLK_DIV48);
else if (pclk_hz <= 160000000)
config = GEM_BF(CLK, GEM_CLK_DIV64);
else
config = GEM_BF(CLK, GEM_CLK_DIV96);
return config;
}
static u32 macb_mdc_clk_div(struct macb *bp)
{
u32 config;
unsigned long pclk_hz;
if (macb_is_gem(bp))
return gem_mdc_clk_div(bp);
pclk_hz = clk_get_rate(bp->pclk);
if (pclk_hz <= 20000000)
config = MACB_BF(CLK, MACB_CLK_DIV8);
else if (pclk_hz <= 40000000)
config = MACB_BF(CLK, MACB_CLK_DIV16);
else if (pclk_hz <= 80000000)
config = MACB_BF(CLK, MACB_CLK_DIV32);
else
config = MACB_BF(CLK, MACB_CLK_DIV64);
return config;
}
static void macb_init_hw(struct macb *bp) static void macb_init_hw(struct macb *bp)
{ {
u32 config; u32 config;
@@ -800,7 +842,7 @@ static void macb_init_hw(struct macb *bp)
macb_reset_hw(bp); macb_reset_hw(bp);
__macb_set_hwaddr(bp); __macb_set_hwaddr(bp);
config = macb_readl(bp, NCFGR) & MACB_BF(CLK, -1L); config = macb_mdc_clk_div(bp);
config |= MACB_BIT(PAE); /* PAuse Enable */ config |= MACB_BIT(PAE); /* PAuse Enable */
config |= MACB_BIT(DRFCS); /* Discard Rx FCS */ config |= MACB_BIT(DRFCS); /* Discard Rx FCS */
config |= MACB_BIT(BIG); /* Receive oversized frames */ config |= MACB_BIT(BIG); /* Receive oversized frames */
@@ -1119,7 +1161,6 @@ static int __init macb_probe(struct platform_device *pdev)
struct net_device *dev; struct net_device *dev;
struct macb *bp; struct macb *bp;
struct phy_device *phydev; struct phy_device *phydev;
unsigned long pclk_hz;
u32 config; u32 config;
int err = -ENXIO; int err = -ENXIO;
@@ -1183,15 +1224,7 @@ static int __init macb_probe(struct platform_device *pdev)
dev->base_addr = regs->start; dev->base_addr = regs->start;
/* Set MII management clock divider */ /* Set MII management clock divider */
pclk_hz = clk_get_rate(bp->pclk); config = macb_mdc_clk_div(bp);
if (pclk_hz <= 20000000)
config = MACB_BF(CLK, MACB_CLK_DIV8);
else if (pclk_hz <= 40000000)
config = MACB_BF(CLK, MACB_CLK_DIV16);
else if (pclk_hz <= 80000000)
config = MACB_BF(CLK, MACB_CLK_DIV32);
else
config = MACB_BF(CLK, MACB_CLK_DIV64);
macb_writel(bp, NCFGR, config); macb_writel(bp, NCFGR, config);
macb_get_hwaddr(bp); macb_get_hwaddr(bp);

11
drivers/net/ethernet/cadence/macb.h
View File

@@ -135,6 +135,9 @@
#define MACB_IRXFCS_OFFSET 19 #define MACB_IRXFCS_OFFSET 19
#define MACB_IRXFCS_SIZE 1 #define MACB_IRXFCS_SIZE 1
/* GEM specific NCFGR bitfields. */
#define GEM_CLK_OFFSET 18
#define GEM_CLK_SIZE 3
/* Bitfields in NSR */ /* Bitfields in NSR */
#define MACB_NSR_LINK_OFFSET 0 #define MACB_NSR_LINK_OFFSET 0
#define MACB_NSR_LINK_SIZE 1 #define MACB_NSR_LINK_SIZE 1
@@ -249,6 +252,14 @@
#define MACB_CLK_DIV32 2 #define MACB_CLK_DIV32 2
#define MACB_CLK_DIV64 3 #define MACB_CLK_DIV64 3
/* GEM specific constants for CLK. */
#define GEM_CLK_DIV8 0
#define GEM_CLK_DIV16 1
#define GEM_CLK_DIV32 2
#define GEM_CLK_DIV48 3
#define GEM_CLK_DIV64 4
#define GEM_CLK_DIV96 5
/* Constants for MAN register */ /* Constants for MAN register */
#define MACB_MAN_SOF 1 #define MACB_MAN_SOF 1
#define MACB_MAN_WRITE 1 #define MACB_MAN_WRITE 1