diff mbox

[U-Boot,v2,2/3] net: macb: Add the clock support

Message ID 1478052417-4767-3-git-send-email-wenyou.yang@atmel.com
State Accepted
Commit 577aa3b3587193ee078ce83d918604da6ac84dd5
Delegated to: Joe Hershberger
Headers show

Commit Message

Wenyou Yang Nov. 2, 2016, 2:06 a.m. UTC 
Due to introducing the at91 clock driver, add the clock support.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---

Changes in v2:
 - Use positive logic, #ifdef...#else...#endif.
 - Remove unnecessary splitting the signature of macb_mdc_clk_div()
   and others.

 drivers/net/macb.c | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

Comments

Joe Hershberger Nov. 15, 2016, 3:06 a.m. UTC | #1 
On Tue, Nov 1, 2016 at 9:06 PM, Wenyou Yang <wenyou.yang@atmel.com> wrote:
> Due to introducing the at91 clock driver, add the clock support.
>
> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Joe Hershberger Feb. 9, 2017, 4:26 p.m. UTC | #2 
Hi Wenyou,

https://patchwork.ozlabs.org/patch/690227/ was applied to u-boot-net.git.

Thanks!
-Joe
diff mbox

Patch

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 01527f7..f97b82a 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -4,6 +4,7 @@ 
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
+#include <clk.h>
 #include <dm.h>
 
 /*
@@ -112,6 +113,7 @@  struct macb_device {
 	struct mii_dev		*bus;
 
 #ifdef CONFIG_DM_ETH
+	unsigned long		pclk_rate;
 	phy_interface_t		phy_interface;
 #endif
 };
@@ -754,7 +756,11 @@  static int _macb_write_hwaddr(struct macb_device *macb, unsigned char *enetaddr)
 static u32 macb_mdc_clk_div(int id, struct macb_device *macb)
 {
 	u32 config;
+#ifdef CONFIG_DM_ETH
+	unsigned long macb_hz = macb->pclk_rate;
+#else
 	unsigned long macb_hz = get_macb_pclk_rate(id);
+#endif
 
 	if (macb_hz < 20000000)
 		config = MACB_BF(CLK, MACB_CLK_DIV8);
@@ -771,7 +777,12 @@  static u32 macb_mdc_clk_div(int id, struct macb_device *macb)
 static u32 gem_mdc_clk_div(int id, struct macb_device *macb)
 {
 	u32 config;
+
+#ifdef CONFIG_DM_ETH
+	unsigned long macb_hz = macb->pclk_rate;
+#else
 	unsigned long macb_hz = get_macb_pclk_rate(id);
+#endif
 
 	if (macb_hz < 20000000)
 		config = GEM_BF(CLK, GEM_CLK_DIV8);
@@ -991,6 +1002,30 @@  static const struct eth_ops macb_eth_ops = {
 	.write_hwaddr	= macb_write_hwaddr,
 };
 
+static int macb_enable_clk(struct udevice *dev)
+{
+	struct macb_device *macb = dev_get_priv(dev);
+	struct clk clk;
+	ulong clk_rate;
+	int ret;
+
+	ret = clk_get_by_index(dev, 0, &clk);
+	if (ret)
+		return -EINVAL;
+
+	ret = clk_enable(&clk);
+	if (ret)
+		return ret;
+
+	clk_rate = clk_get_rate(&clk);
+	if (!clk_rate)
+		return -EINVAL;
+
+	macb->pclk_rate = clk_rate;
+
+	return 0;
+}
+
 static int macb_eth_probe(struct udevice *dev)
 {
 	struct eth_pdata *pdata = dev_get_platdata(dev);
@@ -998,6 +1033,7 @@  static int macb_eth_probe(struct udevice *dev)
 
 #ifdef CONFIG_DM_ETH
 	const char *phy_mode;
+	int ret;
 
 	phy_mode = fdt_getprop(gd->fdt_blob, dev->of_offset, "phy-mode", NULL);
 	if (phy_mode)
@@ -1010,7 +1046,12 @@  static int macb_eth_probe(struct udevice *dev)
 
 	macb->regs = (void *)pdata->iobase;
 
+	ret = macb_enable_clk(dev);
+	if (ret)
+		return ret;
+
 	_macb_eth_initialize(macb);
+
 #if defined(CONFIG_CMD_MII) || defined(CONFIG_PHYLIB)
 	int retval;
 	struct mii_dev *mdiodev = mdio_alloc();