79 lines
2.5 KiB
Diff
79 lines
2.5 KiB
Diff
From 82c6107d054adcc906e43190ef150840876c2618 Mon Sep 17 00:00:00 2001
|
|
From: Romuald JEANNE <romuald.jeanne@st.com>
|
|
Date: Tue, 13 Nov 2018 12:23:50 +0100
|
|
Subject: [PATCH 10/52] ARM: stm32mp1-r0-rc1: ETH
|
|
|
|
---
|
|
drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 30 ++++++++++++++++++++++-
|
|
1 file changed, 29 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
|
|
index 7e2e79d..d1cf145 100644
|
|
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
|
|
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
|
|
@@ -42,6 +42,7 @@ struct stm32_dwmac {
|
|
struct clk *clk_ethstp;
|
|
struct clk *syscfg_clk;
|
|
bool int_phyclk; /* Clock from RCC to drive PHY */
|
|
+ int irq_pwr_wakeup;
|
|
u32 mode_reg; /* MAC glue-logic mode register */
|
|
struct regmap *regmap;
|
|
u32 speed;
|
|
@@ -232,7 +233,9 @@ static int stm32_dwmac_parse_data(struct stm32_dwmac *dwmac,
|
|
static int stm32mp1_parse_data(struct stm32_dwmac *dwmac,
|
|
struct device *dev)
|
|
{
|
|
+ struct platform_device *pdev = to_platform_device(dev);
|
|
struct device_node *np = dev->of_node;
|
|
+ int err = 0;
|
|
|
|
dwmac->int_phyclk = of_property_read_bool(np, "st,int-phyclk");
|
|
|
|
@@ -260,7 +263,26 @@ static int stm32mp1_parse_data(struct stm32_dwmac *dwmac,
|
|
return PTR_ERR(dwmac->syscfg_clk);
|
|
}
|
|
|
|
- return 0;
|
|
+ /* Get IRQ information early to have an ability to ask for deferred
|
|
+ * probe if needed before we went too far with resource allocation.
|
|
+ */
|
|
+ dwmac->irq_pwr_wakeup = platform_get_irq_byname(pdev,
|
|
+ "stm32_pwr_wakeup");
|
|
+ if (!dwmac->int_phyclk && dwmac->irq_pwr_wakeup >= 0) {
|
|
+ err = device_init_wakeup(&pdev->dev, true);
|
|
+ if (err) {
|
|
+ dev_err(&pdev->dev, "Failed to init wake up irq\n");
|
|
+ return err;
|
|
+ }
|
|
+ err = dev_pm_set_dedicated_wake_irq(&pdev->dev,
|
|
+ dwmac->irq_pwr_wakeup);
|
|
+ if (err) {
|
|
+ dev_err(&pdev->dev, "Failed to set wake up irq\n");
|
|
+ device_init_wakeup(&pdev->dev, false);
|
|
+ }
|
|
+ device_set_wakeup_enable(&pdev->dev, false);
|
|
+ }
|
|
+ return err;
|
|
}
|
|
|
|
static int stm32_dwmac_probe(struct platform_device *pdev)
|
|
@@ -326,9 +348,15 @@ static int stm32_dwmac_remove(struct platform_device *pdev)
|
|
struct net_device *ndev = platform_get_drvdata(pdev);
|
|
struct stmmac_priv *priv = netdev_priv(ndev);
|
|
int ret = stmmac_dvr_remove(&pdev->dev);
|
|
+ struct stm32_dwmac *dwmac = priv->plat->bsp_priv;
|
|
|
|
stm32_dwmac_clk_disable(priv->plat->bsp_priv);
|
|
|
|
+ if (dwmac->irq_pwr_wakeup >= 0) {
|
|
+ dev_pm_clear_wake_irq(&pdev->dev);
|
|
+ device_init_wakeup(&pdev->dev, false);
|
|
+ }
|
|
+
|
|
return ret;
|
|
}
|
|
|
|
--
|
|
2.7.4
|
|
|