UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

stmmac: dwmac-sti: move st, gmac_en parsing to sti_dwmac_parse_data 

The sti_dwmac_init() function is called both from probe and resume.
Since DT properties doesn't change between suspend/resume cycles move
parsing of this parameter into sti_dwmac_parse_data() where it belongs.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Tested-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joachim Eastwood 2016-11-04 18:54:08 +01:00 committed by David S. Miller
parent 2517cfd4ca
commit 06a6e829bd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
View File

@ -128,6 +128,7 @@ struct sti_dwmac {
int clk_sel_reg; /* GMAC ext clk selection register */ int clk_sel_reg; /* GMAC ext clk selection register */
struct device *dev; struct device *dev;
struct regmap *regmap; struct regmap *regmap;
bool gmac_en;
u32 speed; u32 speed;
void (*fix_retime_src)(void *priv, unsigned int speed); void (*fix_retime_src)(void *priv, unsigned int speed);
}; };
@ -233,14 +234,12 @@ static int sti_dwmac_init(struct platform_device *pdev, void *priv)
struct sti_dwmac *dwmac = priv; struct sti_dwmac *dwmac = priv;
struct regmap *regmap = dwmac->regmap; struct regmap *regmap = dwmac->regmap;
int iface = dwmac->interface; int iface = dwmac->interface;
struct device *dev = dwmac->dev;
struct device_node *np = dev->of_node;
u32 reg = dwmac->ctrl_reg; u32 reg = dwmac->ctrl_reg;
u32 val; u32 val;
clk_prepare_enable(dwmac->clk); clk_prepare_enable(dwmac->clk);
if (of_property_read_bool(np, "st,gmac_en")) if (dwmac->gmac_en)
regmap_update_bits(regmap, reg, EN_MASK, EN); regmap_update_bits(regmap, reg, EN_MASK, EN);
regmap_update_bits(regmap, reg, MII_PHY_SEL_MASK, phy_intf_sels[iface]); regmap_update_bits(regmap, reg, MII_PHY_SEL_MASK, phy_intf_sels[iface]);
@ -281,6 +280,7 @@ static int sti_dwmac_parse_data(struct sti_dwmac *dwmac,
dwmac->dev = dev; dwmac->dev = dev;
dwmac->interface = of_get_phy_mode(np); dwmac->interface = of_get_phy_mode(np);
dwmac->regmap = regmap; dwmac->regmap = regmap;
dwmac->gmac_en = of_property_read_bool(np, "st,gmac_en");
dwmac->ext_phyclk = of_property_read_bool(np, "st,ext-phyclk"); dwmac->ext_phyclk = of_property_read_bool(np, "st,ext-phyclk");
dwmac->tx_retime_src = TX_RETIME_SRC_NA; dwmac->tx_retime_src = TX_RETIME_SRC_NA;
dwmac->speed = SPEED_100; dwmac->speed = SPEED_100;