Commit 5c7bbedb authored by Kevin Hilman's avatar Kevin Hilman

NET: davinci EMAC: change clock name

Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 18490740
...@@ -171,7 +171,7 @@ static struct clk uart2_clk = { ...@@ -171,7 +171,7 @@ static struct clk uart2_clk = {
}; };
static struct clk emac_clk = { static struct clk emac_clk = {
.name = "EMACCLK", .name = "emac",
.parent = &pll1_sysclk5, .parent = &pll1_sysclk5,
.lpsc = DAVINCI_LPSC_EMAC_WRAPPER, .lpsc = DAVINCI_LPSC_EMAC_WRAPPER,
}; };
......
...@@ -189,7 +189,7 @@ static struct clk aemif_clk = { ...@@ -189,7 +189,7 @@ static struct clk aemif_clk = {
}; };
static struct clk emac_clk = { static struct clk emac_clk = {
.name = "EMACCLK", .name = "emac",
.parent = &pll1_sysclk3, .parent = &pll1_sysclk3,
.lpsc = DM646X_LPSC_EMAC, .lpsc = DM646X_LPSC_EMAC,
}; };
......
...@@ -2605,7 +2605,7 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) ...@@ -2605,7 +2605,7 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
unsigned long size; unsigned long size;
/* obtain emac clock from kernel */ /* obtain emac clock from kernel */
emac_clk = clk_get(&pdev->dev, "EMACCLK"); emac_clk = clk_get(&pdev->dev, "emac");
if (IS_ERR(emac_clk)) { if (IS_ERR(emac_clk)) {
printk(KERN_ERR "DaVinci EMAC: Failed to get EMAC clock\n"); printk(KERN_ERR "DaVinci EMAC: Failed to get EMAC clock\n");
return -EBUSY; return -EBUSY;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment