You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
119 lines
3.2 KiB
Diff
119 lines
3.2 KiB
Diff
From e3b7883bacd449a22e262cc359dc923c78eb32f6 Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Thu, 8 Mar 2012 11:23:00 +0100
|
|
Subject: [PATCH 32/73] NET: MIPS: lantiq: convert etop driver to clkdev api
|
|
|
|
Update from old pmu_{dis,en}able() to ckldev api.
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
Cc: netdev@vger.kernel.org
|
|
---
|
|
drivers/net/ethernet/lantiq_etop.c | 49 ++++++++++++++++++++++++++++++-----
|
|
1 files changed, 42 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/lantiq_etop.c
|
|
+++ b/drivers/net/ethernet/lantiq_etop.c
|
|
@@ -36,6 +36,7 @@
|
|
#include <linux/io.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/module.h>
|
|
+#include <linux/clk.h>
|
|
|
|
#include <asm/checksum.h>
|
|
|
|
@@ -147,6 +148,11 @@ struct ltq_etop_priv {
|
|
int tx_free[MAX_DMA_CHAN >> 1];
|
|
|
|
spinlock_t lock;
|
|
+
|
|
+ struct clk *clk_ppe;
|
|
+ struct clk *clk_switch;
|
|
+ struct clk *clk_ephy;
|
|
+ struct clk *clk_ephycgu;
|
|
};
|
|
|
|
static int ltq_etop_mdio_wr(struct mii_bus *bus, int phy_addr,
|
|
@@ -280,16 +286,27 @@ ltq_etop_hw_exit(struct net_device *dev)
|
|
struct ltq_etop_priv *priv = netdev_priv(dev);
|
|
int i;
|
|
|
|
- ltq_pmu_disable(PMU_PPE);
|
|
+ clk_disable(priv->clk_ppe);
|
|
+
|
|
+ if (ltq_has_gbit())
|
|
+ clk_disable(priv->clk_switch);
|
|
+
|
|
+ if (ltq_is_ase()) {
|
|
+ clk_disable(priv->clk_ephy);
|
|
+ clk_disable(priv->clk_ephycgu);
|
|
+ }
|
|
+
|
|
for (i = 0; i < MAX_DMA_CHAN; i++)
|
|
if (IS_TX(i) || IS_RX(i))
|
|
ltq_etop_free_channel(dev, &priv->ch[i]);
|
|
}
|
|
|
|
static void
|
|
-ltq_etop_gbit_init(void)
|
|
+ltq_etop_gbit_init(struct net_device *dev)
|
|
{
|
|
- ltq_pmu_enable(PMU_SWITCH);
|
|
+ struct ltq_etop_priv *priv = netdev_priv(dev);
|
|
+
|
|
+ clk_enable(priv->clk_switch);
|
|
|
|
ltq_gbit_w32_mask(0, GCTL0_SE, LTQ_GBIT_GCTL0);
|
|
/** Disable MDIO auto polling mode */
|
|
@@ -312,10 +329,10 @@ ltq_etop_hw_init(struct net_device *dev)
|
|
int err = 0;
|
|
int i;
|
|
|
|
- ltq_pmu_enable(PMU_PPE);
|
|
+ clk_enable(priv->clk_ppe);
|
|
|
|
if (ltq_has_gbit()) {
|
|
- ltq_etop_gbit_init();
|
|
+ ltq_etop_gbit_init(dev);
|
|
/* force the etops link to the gbit to MII */
|
|
mii_mode = PHY_INTERFACE_MODE_MII;
|
|
}
|
|
@@ -333,11 +350,11 @@ ltq_etop_hw_init(struct net_device *dev)
|
|
|
|
default:
|
|
if (ltq_is_ase()) {
|
|
- ltq_pmu_enable(PMU_EPHY);
|
|
+ clk_enable(priv->clk_ephy);
|
|
/* disable external MII */
|
|
ltq_etop_w32_mask(0, ETOP_CFG_MII0, LTQ_ETOP_CFG);
|
|
/* enable clock for internal PHY */
|
|
- ltq_cgu_enable(CGU_EPHY);
|
|
+ clk_enable(priv->clk_ephycgu);
|
|
/* we need to write this magic to the internal phy to
|
|
make it work */
|
|
ltq_etop_mdio_wr(NULL, 0x8, 0x12, 0xC020);
|
|
@@ -880,6 +897,24 @@ ltq_etop_probe(struct platform_device *p
|
|
priv->res = res;
|
|
priv->pldata = dev_get_platdata(&pdev->dev);
|
|
priv->netdev = dev;
|
|
+
|
|
+ priv->clk_ppe = clk_get(&pdev->dev, NULL);
|
|
+ if (IS_ERR(priv->clk_ppe))
|
|
+ return PTR_ERR(priv->clk_ppe);
|
|
+ if (ltq_has_gbit()) {
|
|
+ priv->clk_switch = clk_get(&pdev->dev, "switch");
|
|
+ if (IS_ERR(priv->clk_switch))
|
|
+ return PTR_ERR(priv->clk_switch);
|
|
+ }
|
|
+ if (ltq_is_ase()) {
|
|
+ priv->clk_ephy = clk_get(&pdev->dev, "ephy");
|
|
+ if (IS_ERR(priv->clk_ephy))
|
|
+ return PTR_ERR(priv->clk_ephy);
|
|
+ priv->clk_ephycgu = clk_get(&pdev->dev, "ephycgu");
|
|
+ if (IS_ERR(priv->clk_ephycgu))
|
|
+ return PTR_ERR(priv->clk_ephycgu);
|
|
+ }
|
|
+
|
|
spin_lock_init(&priv->lock);
|
|
|
|
for (i = 0; i < MAX_DMA_CHAN; i++) {
|