Commit d8daff28 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Jakub Kicinski

net: stmmac: replace the has_sun8i field with a flag

Drop the boolean field of the plat_stmmacenet_data structure in favor of a
simple bitfield flag.
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/20230710090001.303225-5-brgl@bgdev.plReviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fd1d62d8
...@@ -1227,7 +1227,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) ...@@ -1227,7 +1227,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev)
plat_dat->interface = interface; plat_dat->interface = interface;
plat_dat->rx_coe = STMMAC_RX_COE_TYPE2; plat_dat->rx_coe = STMMAC_RX_COE_TYPE2;
plat_dat->tx_coe = 1; plat_dat->tx_coe = 1;
plat_dat->has_sun8i = true; plat_dat->flags |= STMMAC_FLAG_HAS_SUN8I;
plat_dat->bsp_priv = gmac; plat_dat->bsp_priv = gmac;
plat_dat->init = sun8i_dwmac_init; plat_dat->init = sun8i_dwmac_init;
plat_dat->exit = sun8i_dwmac_exit; plat_dat->exit = sun8i_dwmac_exit;
......
...@@ -325,7 +325,7 @@ static void stmmac_clk_csr_set(struct stmmac_priv *priv) ...@@ -325,7 +325,7 @@ static void stmmac_clk_csr_set(struct stmmac_priv *priv)
priv->clk_csr = STMMAC_CSR_250_300M; priv->clk_csr = STMMAC_CSR_250_300M;
} }
if (priv->plat->has_sun8i) { if (priv->plat->flags & STMMAC_FLAG_HAS_SUN8I) {
if (clk_rate > 160000000) if (clk_rate > 160000000)
priv->clk_csr = 0x03; priv->clk_csr = 0x03;
else if (clk_rate > 80000000) else if (clk_rate > 80000000)
...@@ -6856,7 +6856,7 @@ static int stmmac_hw_init(struct stmmac_priv *priv) ...@@ -6856,7 +6856,7 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
int ret; int ret;
/* dwmac-sun8i only work in chain mode */ /* dwmac-sun8i only work in chain mode */
if (priv->plat->has_sun8i) if (priv->plat->flags & STMMAC_FLAG_HAS_SUN8I)
chain_mode = 1; chain_mode = 1;
priv->chain_mode = chain_mode; priv->chain_mode = chain_mode;
......
...@@ -207,6 +207,7 @@ struct dwmac4_addrs { ...@@ -207,6 +207,7 @@ struct dwmac4_addrs {
#define STMMAC_FLAG_HAS_INTEGRATED_PCS BIT(0) #define STMMAC_FLAG_HAS_INTEGRATED_PCS BIT(0)
#define STMMAC_FLAG_SPH_DISABLE BIT(1) #define STMMAC_FLAG_SPH_DISABLE BIT(1)
#define STMMAC_FLAG_USE_PHY_WOL BIT(2) #define STMMAC_FLAG_USE_PHY_WOL BIT(2)
#define STMMAC_FLAG_HAS_SUN8I BIT(3)
struct plat_stmmacenet_data { struct plat_stmmacenet_data {
int bus_id; int bus_id;
...@@ -270,7 +271,6 @@ struct plat_stmmacenet_data { ...@@ -270,7 +271,6 @@ struct plat_stmmacenet_data {
struct reset_control *stmmac_ahb_rst; struct reset_control *stmmac_ahb_rst;
struct stmmac_axi *axi; struct stmmac_axi *axi;
int has_gmac4; int has_gmac4;
bool has_sun8i;
bool tso_en; bool tso_en;
int rss_en; int rss_en;
int mac_port_sel_speed; int mac_port_sel_speed;
......
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