Merge branch develop-3.10

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / rockchip / gmac / stmmac.h

diff --git a/drivers/net/ethernet/rockchip/gmac/stmmac.h b/drivers/net/ethernet/rockchip/gmac/stmmac.h
index 8f23e1106868485b28b4bbfaea54c0cd35cb909e..810d2b342741ddb29cd96a22549156b103ede1fd 100755 (executable)
--- a/drivers/net/ethernet/rockchip/gmac/stmmac.h
+++ b/drivers/net/ethernet/rockchip/gmac/stmmac.h
@@ -107,16 +107,45 @@ struct stmmac_priv {
        u32 adv_ts;
        int use_riwt;
        spinlock_t ptp_lock;
+       bool mdio_registered;
+};
+
+enum {
+       RK3288_GMAC,
+       RK312X_GMAC,
+       RK3368_GMAC
 };
 
 struct bsp_priv {
-       char pwr_ctl_by[8];
+       struct regmap *grf;
+       struct platform_device *pdev;
+       bool power_ctrl_by_pmu;
+       char pmu_regulator[32];
        int power_io;
        int power_io_level;
        int reset_io;
        int reset_io_level;
+       int phyirq_io;
+       int phyirq_io_level;
        int phy_iface;
-       int (*phy_power_on)(struct plat_stmmacenet_data *plat, int enable);
+       bool clock_input;
+       int chip;
+       int tx_delay;
+       int rx_delay;
+
+       struct clk *clk_mac;
+       struct clk *clk_mac_pll;
+       struct clk *gmac_clkin;
+       struct clk *mac_clk_rx;
+       struct clk *mac_clk_tx;
+       struct clk *clk_mac_ref;
+       struct clk *clk_mac_refout;
+       struct clk *aclk_mac;
+       struct clk *pclk_mac;
+       bool clk_enable;
+
+       int (*phy_power_on)(bool enable);
+       int (*gmac_clk_enable)(bool enable);
 };
 
 extern int phyaddr;