From ce06d1cf7baeb10aa3ffef90f51ee4c3a0b81a46 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Fri, 3 Aug 2012 08:53:02 +0000
Subject: [lantiq] cleanup patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32953 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
...-lantiq-convert-etop-driver-to-clkdev-api.patch | 118 ---------------------
1 file changed, 118 deletions(-)
delete mode 100644 target/linux/lantiq/patches-3.3/0029-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch
(limited to 'target/linux/lantiq/patches-3.3/0029-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch')
diff --git a/target/linux/lantiq/patches-3.3/0029-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch b/target/linux/lantiq/patches-3.3/0029-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch
deleted file mode 100644
index b00fbe45e9..0000000000
--- a/target/linux/lantiq/patches-3.3/0029-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 118d9f0abd69278cfdd7c5bde4743c0cab9b7618 Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Thu, 8 Mar 2012 11:23:00 +0100
-Subject: [PATCH 29/70] 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>
-
-@@ -148,6 +149,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,
-@@ -281,16 +287,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 */
-@@ -313,10 +330,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;
- }
-@@ -334,11 +351,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);
-@@ -883,6 +900,24 @@ ltq_etop_probe(struct platform_device *p
- priv->pdev = pdev;
- 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++) {
--
cgit v1.2.3