Skip to content

L
linux
Commit 0fb98db1 authored by Heiko Stübner's avatar Heiko Stübner Committed by David S. Miller
Browse files
Options

net: stmmac: dwmac-rk: abstract access to mac settings in GRF 

The mac settings like RGMII/RMII, speeds etc are done in the so called
"General Register Files", contain numerous other settings as well and
always seem to change between Rockchip SoCs. Therefore abstract the
register accesses into a per-soc ops struct to make this reusable on
other Rockchip SoCs.
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c48fa33c
Show whitespace changes
Inline Side-by-side
Showing with 75 additions and 41 deletions
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
View file @ 0fb98db1
...@@ -33,10 +33,20 @@ ...@@ -33,10 +33,20 @@
#include "stmmac_platform.h" #include "stmmac_platform.h"
struct rk_priv_data;
struct rk_gmac_ops {
void (*set_to_rgmii)(struct rk_priv_data *bsp_priv,
int tx_delay, int rx_delay);
void (*set_to_rmii)(struct rk_priv_data *bsp_priv);
void (*set_rgmii_speed)(struct rk_priv_data *bsp_priv, int speed);
void (*set_rmii_speed)(struct rk_priv_data *bsp_priv, int speed);
};
struct rk_priv_data { struct rk_priv_data {
struct platform_device *pdev; struct platform_device *pdev;
int phy_iface; int phy_iface;
struct regulator *regulator; struct regulator *regulator;
struct rk_gmac_ops *ops;
bool clk_enabled; bool clk_enabled;
bool clock_input; bool clock_input;
...@@ -66,29 +76,31 @@ struct rk_priv_data { ...@@ -66,29 +76,31 @@ struct rk_priv_data {
#define RK3288_GRF_SOC_CON3 0x0250 #define RK3288_GRF_SOC_CON3 0x0250
/*RK3288_GRF_SOC_CON1*/ /*RK3288_GRF_SOC_CON1*/
#define GMAC_PHY_INTF_SEL_RGMII (GRF_BIT(6) | GRF_CLR_BIT(7) | GRF_CLR_BIT(8)) #define RK3288_GMAC_PHY_INTF_SEL_RGMII (GRF_BIT(6) | GRF_CLR_BIT(7) | \
#define GMAC_PHY_INTF_SEL_RMII (GRF_CLR_BIT(6) | GRF_CLR_BIT(7) | GRF_BIT(8)) GRF_CLR_BIT(8))
#define GMAC_FLOW_CTRL GRF_BIT(9) #define RK3288_GMAC_PHY_INTF_SEL_RMII (GRF_CLR_BIT(6) | GRF_CLR_BIT(7) | \
#define GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(9) GRF_BIT(8))
#define GMAC_SPEED_10M GRF_CLR_BIT(10) #define RK3288_GMAC_FLOW_CTRL GRF_BIT(9)
#define GMAC_SPEED_100M GRF_BIT(10) #define RK3288_GMAC_FLOW_CTRL_CLR GRF_CLR_BIT(9)
#define GMAC_RMII_CLK_25M GRF_BIT(11) #define RK3288_GMAC_SPEED_10M GRF_CLR_BIT(10)
#define GMAC_RMII_CLK_2_5M GRF_CLR_BIT(11) #define RK3288_GMAC_SPEED_100M GRF_BIT(10)
#define GMAC_CLK_125M (GRF_CLR_BIT(12) | GRF_CLR_BIT(13)) #define RK3288_GMAC_RMII_CLK_25M GRF_BIT(11)
#define GMAC_CLK_25M (GRF_BIT(12) | GRF_BIT(13)) #define RK3288_GMAC_RMII_CLK_2_5M GRF_CLR_BIT(11)
#define GMAC_CLK_2_5M (GRF_CLR_BIT(12) | GRF_BIT(13)) #define RK3288_GMAC_CLK_125M (GRF_CLR_BIT(12) | GRF_CLR_BIT(13))
#define GMAC_RMII_MODE GRF_BIT(14) #define RK3288_GMAC_CLK_25M (GRF_BIT(12) | GRF_BIT(13))
#define GMAC_RMII_MODE_CLR GRF_CLR_BIT(14) #define RK3288_GMAC_CLK_2_5M (GRF_CLR_BIT(12) | GRF_BIT(13))
#define RK3288_GMAC_RMII_MODE GRF_BIT(14)
#define RK3288_GMAC_RMII_MODE_CLR GRF_CLR_BIT(14)
/*RK3288_GRF_SOC_CON3*/ /*RK3288_GRF_SOC_CON3*/
#define GMAC_TXCLK_DLY_ENABLE GRF_BIT(14) #define RK3288_GMAC_TXCLK_DLY_ENABLE GRF_BIT(14)
#define GMAC_TXCLK_DLY_DISABLE GRF_CLR_BIT(14) #define RK3288_GMAC_TXCLK_DLY_DISABLE GRF_CLR_BIT(14)
#define GMAC_RXCLK_DLY_ENABLE GRF_BIT(15) #define RK3288_GMAC_RXCLK_DLY_ENABLE GRF_BIT(15)
#define GMAC_RXCLK_DLY_DISABLE GRF_CLR_BIT(15) #define RK3288_GMAC_RXCLK_DLY_DISABLE GRF_CLR_BIT(15)
#define GMAC_CLK_RX_DL_CFG(val) HIWORD_UPDATE(val, 0x7F, 7) #define RK3288_GMAC_CLK_RX_DL_CFG(val) HIWORD_UPDATE(val, 0x7F, 7)
#define GMAC_CLK_TX_DL_CFG(val) HIWORD_UPDATE(val, 0x7F, 0) #define RK3288_GMAC_CLK_TX_DL_CFG(val) HIWORD_UPDATE(val, 0x7F, 0)
static void set_to_rgmii(struct rk_priv_data *bsp_priv, static void rk3288_set_to_rgmii(struct rk_priv_data *bsp_priv,
int tx_delay, int rx_delay) int tx_delay, int rx_delay)
{ {
struct device *dev = &bsp_priv->pdev->dev; struct device *dev = &bsp_priv->pdev->dev;
...@@ -99,14 +111,16 @@ static void set_to_rgmii(struct rk_priv_data *bsp_priv, ...@@ -99,14 +111,16 @@ static void set_to_rgmii(struct rk_priv_data *bsp_priv,
} }
regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1, regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1,
GMAC_PHY_INTF_SEL_RGMII | GMAC_RMII_MODE_CLR); RK3288_GMAC_PHY_INTF_SEL_RGMII |
RK3288_GMAC_RMII_MODE_CLR);
regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON3, regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON3,
GMAC_RXCLK_DLY_ENABLE | GMAC_TXCLK_DLY_ENABLE | RK3288_GMAC_RXCLK_DLY_ENABLE |
GMAC_CLK_RX_DL_CFG(rx_delay) | RK3288_GMAC_TXCLK_DLY_ENABLE |
GMAC_CLK_TX_DL_CFG(tx_delay)); RK3288_GMAC_CLK_RX_DL_CFG(rx_delay) |
RK3288_GMAC_CLK_TX_DL_CFG(tx_delay));
} }
static void set_to_rmii(struct rk_priv_data *bsp_priv) static void rk3288_set_to_rmii(struct rk_priv_data *bsp_priv)
{ {
struct device *dev = &bsp_priv->pdev->dev; struct device *dev = &bsp_priv->pdev->dev;
...@@ -116,10 +130,10 @@ static void set_to_rmii(struct rk_priv_data *bsp_priv) ...@@ -116,10 +130,10 @@ static void set_to_rmii(struct rk_priv_data *bsp_priv)
} }
regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1, regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1,
GMAC_PHY_INTF_SEL_RMII | GMAC_RMII_MODE); RK3288_GMAC_PHY_INTF_SEL_RMII | RK3288_GMAC_RMII_MODE);
} }
static void set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed) static void rk3288_set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed)
{ {
struct device *dev = &bsp_priv->pdev->dev; struct device *dev = &bsp_priv->pdev->dev;
...@@ -129,16 +143,19 @@ static void set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed) ...@@ -129,16 +143,19 @@ static void set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed)
} }
if (speed == 10) if (speed == 10)
regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1, GMAC_CLK_2_5M); regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1,
RK3288_GMAC_CLK_2_5M);
else if (speed == 100) else if (speed == 100)
regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1, GMAC_CLK_25M); regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1,
RK3288_GMAC_CLK_25M);
else if (speed == 1000) else if (speed == 1000)
regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1, GMAC_CLK_125M); regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1,
RK3288_GMAC_CLK_125M);
else else
dev_err(dev, "unknown speed value for RGMII! speed=%d", speed); dev_err(dev, "unknown speed value for RGMII! speed=%d", speed);
} }
static void set_rmii_speed(struct rk_priv_data *bsp_priv, int speed) static void rk3288_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed)
{ {
struct device *dev = &bsp_priv->pdev->dev; struct device *dev = &bsp_priv->pdev->dev;
...@@ -149,15 +166,24 @@ static void set_rmii_speed(struct rk_priv_data *bsp_priv, int speed) ...@@ -149,15 +166,24 @@ static void set_rmii_speed(struct rk_priv_data *bsp_priv, int speed)
if (speed == 10) { if (speed == 10) {
regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1, regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1,
GMAC_RMII_CLK_2_5M | GMAC_SPEED_10M); RK3288_GMAC_RMII_CLK_2_5M |
RK3288_GMAC_SPEED_10M);
} else if (speed == 100) { } else if (speed == 100) {
regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1, regmap_write(bsp_priv->grf, RK3288_GRF_SOC_CON1,
GMAC_RMII_CLK_25M | GMAC_SPEED_100M); RK3288_GMAC_RMII_CLK_25M |
RK3288_GMAC_SPEED_100M);
} else { } else {
dev_err(dev, "unknown speed value for RMII! speed=%d", speed); dev_err(dev, "unknown speed value for RMII! speed=%d", speed);
} }
} }
struct rk_gmac_ops rk3288_ops = {
.set_to_rgmii = rk3288_set_to_rgmii,
.set_to_rmii = rk3288_set_to_rmii,
.set_rgmii_speed = rk3288_set_rgmii_speed,
.set_rmii_speed = rk3288_set_rmii_speed,
};
static int gmac_clk_init(struct rk_priv_data *bsp_priv) static int gmac_clk_init(struct rk_priv_data *bsp_priv)
{ {
struct device *dev = &bsp_priv->pdev->dev; struct device *dev = &bsp_priv->pdev->dev;
...@@ -309,7 +335,8 @@ static int phy_power_on(struct rk_priv_data *bsp_priv, bool enable) ...@@ -309,7 +335,8 @@ static int phy_power_on(struct rk_priv_data *bsp_priv, bool enable)
return 0; return 0;
} }
static void *rk_gmac_setup(struct platform_device *pdev) static struct rk_priv_data *rk_gmac_setup(struct platform_device *pdev,
struct rk_gmac_ops *ops)
{ {
struct rk_priv_data *bsp_priv; struct rk_priv_data *bsp_priv;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
...@@ -322,6 +349,7 @@ static void *rk_gmac_setup(struct platform_device *pdev) ...@@ -322,6 +349,7 @@ static void *rk_gmac_setup(struct platform_device *pdev)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
bsp_priv->phy_iface = of_get_phy_mode(dev->of_node); bsp_priv->phy_iface = of_get_phy_mode(dev->of_node);
bsp_priv->ops = ops;
bsp_priv->regulator = devm_regulator_get_optional(dev, "phy"); bsp_priv->regulator = devm_regulator_get_optional(dev, "phy");
if (IS_ERR(bsp_priv->regulator)) { if (IS_ERR(bsp_priv->regulator)) {
...@@ -375,10 +403,11 @@ static void *rk_gmac_setup(struct platform_device *pdev) ...@@ -375,10 +403,11 @@ static void *rk_gmac_setup(struct platform_device *pdev)
/*rmii or rgmii*/ /*rmii or rgmii*/
if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RGMII) { if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RGMII) {
dev_info(dev, "init for RGMII\n"); dev_info(dev, "init for RGMII\n");
set_to_rgmii(bsp_priv, bsp_priv->tx_delay, bsp_priv->rx_delay); bsp_priv->ops->set_to_rgmii(bsp_priv, bsp_priv->tx_delay,
bsp_priv->rx_delay);
} else if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) { } else if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) {
dev_info(dev, "init for RMII\n"); dev_info(dev, "init for RMII\n");
set_to_rmii(bsp_priv); bsp_priv->ops->set_to_rmii(bsp_priv);
} else { } else {
dev_err(dev, "NO interface defined!\n"); dev_err(dev, "NO interface defined!\n");
} }
...@@ -388,6 +417,11 @@ static void *rk_gmac_setup(struct platform_device *pdev) ...@@ -388,6 +417,11 @@ static void *rk_gmac_setup(struct platform_device *pdev)
return bsp_priv; return bsp_priv;
} }
static void *rk3288_gmac_setup(struct platform_device *pdev)
{
return rk_gmac_setup(pdev, &rk3288_ops);
}
static int rk_gmac_init(struct platform_device *pdev, void *priv) static int rk_gmac_init(struct platform_device *pdev, void *priv)
{ {
struct rk_priv_data *bsp_priv = priv; struct rk_priv_data *bsp_priv = priv;
...@@ -418,9 +452,9 @@ static void rk_fix_speed(void *priv, unsigned int speed) ...@@ -418,9 +452,9 @@ static void rk_fix_speed(void *priv, unsigned int speed)
struct device *dev = &bsp_priv->pdev->dev; struct device *dev = &bsp_priv->pdev->dev;
if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RGMII) if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RGMII)
set_rgmii_speed(bsp_priv, speed); bsp_priv->ops->set_rgmii_speed(bsp_priv, speed);
else if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) else if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII)
set_rmii_speed(bsp_priv, speed); bsp_priv->ops->set_rmii_speed(bsp_priv, speed);
else else
dev_err(dev, "unsupported interface %d", bsp_priv->phy_iface); dev_err(dev, "unsupported interface %d", bsp_priv->phy_iface);
} }
...@@ -428,7 +462,7 @@ static void rk_fix_speed(void *priv, unsigned int speed) ...@@ -428,7 +462,7 @@ static void rk_fix_speed(void *priv, unsigned int speed)
static const struct stmmac_of_data rk3288_gmac_data = { static const struct stmmac_of_data rk3288_gmac_data = {
.has_gmac = 1, .has_gmac = 1,
.fix_mac_speed = rk_fix_speed, .fix_mac_speed = rk_fix_speed,
.setup = rk_gmac_setup, .setup = rk3288_gmac_setup,
.init = rk_gmac_init, .init = rk_gmac_init,
.exit = rk_gmac_exit, .exit = rk_gmac_exit,
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7