From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 net-next 8/9] net: korina: Get mdio input clock via common clock framework
Date: Wed, 14 Apr 2021 17:29:44 +0200 [thread overview]
Message-ID: <20210414152946.12517-9-tsbogend@alpha.franken.de> (raw)
In-Reply-To: <20210414152946.12517-1-tsbogend@alpha.franken.de>
With device tree clock is provided via CCF. For non device tree
use a maximum clock value to not overclock the PHY. The non device
tree usage will go away after platform is converted to DT.
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
---
drivers/net/ethernet/korina.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c
index c4590b2c65aa..df75dd5d1638 100644
--- a/drivers/net/ethernet/korina.c
+++ b/drivers/net/ethernet/korina.c
@@ -56,14 +56,13 @@
#include <linux/ethtool.h>
#include <linux/crc32.h>
#include <linux/pgtable.h>
+#include <linux/clk.h>
#include <asm/bootinfo.h>
#include <asm/bitops.h>
#include <asm/io.h>
#include <asm/dma.h>
-#include <asm/mach-rc32434/rb.h>
-#include <asm/mach-rc32434/rc32434.h>
#include <asm/mach-rc32434/eth.h>
#include <asm/mach-rc32434/dma_v.h>
@@ -145,10 +144,9 @@ struct korina_private {
struct work_struct restart_task;
struct net_device *dev;
struct device *dmadev;
+ int mii_clock_freq;
};
-extern unsigned int idt_cpu_freq;
-
static dma_addr_t korina_tx_dma(struct korina_private *lp, int idx)
{
return lp->td_dma + (idx * sizeof(struct dma_desc));
@@ -900,8 +898,8 @@ static int korina_init(struct net_device *dev)
/* Management Clock Prescaler Divisor
* Clock independent setting */
- writel(((idt_cpu_freq) / MII_CLOCK + 1) & ~1,
- &lp->eth_regs->ethmcp);
+ writel(((lp->mii_clock_freq) / MII_CLOCK + 1) & ~1,
+ &lp->eth_regs->ethmcp);
writel(0, &lp->eth_regs->miimcfg);
/* don't transmit until fifo contains 48b */
@@ -1061,6 +1059,7 @@ static int korina_probe(struct platform_device *pdev)
const u8 *mac_addr = dev_get_platdata(&pdev->dev);
struct korina_private *lp;
struct net_device *dev;
+ struct clk *clk;
void __iomem *p;
int rc;
@@ -1081,6 +1080,14 @@ static int korina_probe(struct platform_device *pdev)
eth_hw_addr_random(dev);
}
+ clk = devm_clk_get(&pdev->dev, NULL);
+ if (!IS_ERR(clk)) {
+ clk_prepare_enable(clk);
+ lp->mii_clock_freq = clk_get_rate(clk);
+ } else {
+ lp->mii_clock_freq = 200000000; /* max possible input clk */
+ }
+
lp->rx_irq = platform_get_irq_byname(pdev, "korina_rx");
lp->tx_irq = platform_get_irq_byname(pdev, "korina_tx");
--
2.29.2
next prev parent reply other threads:[~2021-04-14 15:30 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-14 15:29 [PATCH v2 net-next 0/9] net: Korina improvements Thomas Bogendoerfer
2021-04-14 15:29 ` [PATCH v2 net-next 1/9] net: korina: Fix MDIO functions Thomas Bogendoerfer
2021-04-14 15:29 ` [PATCH v2 net-next 2/9] net: korina: Use devres functions Thomas Bogendoerfer
2021-04-14 15:29 ` [PATCH v2 net-next 3/9] net: korina: Remove not needed cache flushes Thomas Bogendoerfer
2021-04-14 15:29 ` [PATCH v2 net-next 4/9] net: korina: Remove nested helpers Thomas Bogendoerfer
2021-04-14 15:29 ` [PATCH v2 net-next 5/9] net: korina: Use DMA API Thomas Bogendoerfer
2021-04-14 15:29 ` [PATCH v2 net-next 6/9] net: korina: Only pass mac address via platform data Thomas Bogendoerfer
2021-04-14 15:29 ` [PATCH v2 net-next 7/9] net: korina: Add support for device tree Thomas Bogendoerfer
2021-04-14 18:33 ` Florian Fainelli
2021-04-14 15:29 ` Thomas Bogendoerfer [this message]
2021-04-14 15:29 ` [PATCH v2 net-next 9/9] net: korina: Make driver COMPILE_TESTable Thomas Bogendoerfer
2021-04-15 2:48 ` kernel test robot
2021-04-14 21:10 ` [PATCH v2 net-next 0/9] net: Korina improvements David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210414152946.12517-9-tsbogend@alpha.franken.de \
--to=tsbogend@alpha.franken.de \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).