lkml.org 
[lkml]   [2022]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH net-next 2/3] net: stmmac: dwmac-oxnas: Add support for OX810SE
    From
    Date
    On 03/01/2022 18:56, Neil Armstrong wrote:
    > Add support for OX810SE dwmac glue setup, which is a simplified version
    > of the OX820 introduced later with more control on the PHY interface.
    >
    > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
    > ---
    > .../net/ethernet/stmicro/stmmac/dwmac-oxnas.c | 92 ++++++++++++++-----
    > 1 file changed, 70 insertions(+), 22 deletions(-)
    >
    > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c
    > index adfeb8d3293d..7ffa4a4eb30f 100644
    > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c
    > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c
    > @@ -12,6 +12,7 @@
    > #include <linux/io.h>
    > #include <linux/module.h>
    > #include <linux/of.h>
    > +#include <linux/of_device.h>
    > #include <linux/platform_device.h>
    > #include <linux/regmap.h>
    > #include <linux/mfd/syscon.h>
    > @@ -48,12 +49,58 @@
    > #define DWMAC_RX_VARDELAY(d) ((d) << DWMAC_RX_VARDELAY_SHIFT)
    > #define DWMAC_RXN_VARDELAY(d) ((d) << DWMAC_RXN_VARDELAY_SHIFT)
    >
    > +struct oxnas_dwmac;
    > +
    > +struct oxnas_dwmac_data {
    > + void (*setup)(struct oxnas_dwmac *dwmac);
    > +};
    > +
    > struct oxnas_dwmac {
    > struct device *dev;
    > struct clk *clk;
    > struct regmap *regmap;
    > + const struct oxnas_dwmac_data *data;
    > };
    >
    > +static void oxnas_dwmac_setup_ox810se(struct oxnas_dwmac *dwmac)
    > +{
    > + unsigned int value;
    > +
    > + /* Enable GMII_GTXCLK to follow GMII_REFCLK, required for gigabit PHY */
    > + value = BIT(DWMAC_CKEN_GTX) |
    > + /* Use simple mux for 25/125 Mhz clock switching */
    > + BIT(DWMAC_SIMPLE_MUX);
    > +
    > + regmap_write(dwmac->regmap, OXNAS_DWMAC_CTRL_REGOFFSET, value);
    > +}
    > +
    > +static void oxnas_dwmac_setup_ox820(struct oxnas_dwmac *dwmac)
    > +{
    > + unsigned int value;
    > +
    > + /* Enable GMII_GTXCLK to follow GMII_REFCLK, required for gigabit PHY */
    > + value = BIT(DWMAC_CKEN_GTX) |
    > + /* Use simple mux for 25/125 Mhz clock switching */
    > + BIT(DWMAC_SIMPLE_MUX) |
    > + /* set auto switch tx clock source */
    > + BIT(DWMAC_AUTO_TX_SOURCE) |
    > + /* enable tx & rx vardelay */
    > + BIT(DWMAC_CKEN_TX_OUT) |
    > + BIT(DWMAC_CKEN_TXN_OUT) |
    > + BIT(DWMAC_CKEN_TX_IN) |
    > + BIT(DWMAC_CKEN_RX_OUT) |
    > + BIT(DWMAC_CKEN_RXN_OUT) |
    > + BIT(DWMAC_CKEN_RX_IN);
    > + regmap_write(dwmac->regmap, OXNAS_DWMAC_CTRL_REGOFFSET, value);
    > +
    > + /* set tx & rx vardelay */
    > + value = DWMAC_TX_VARDELAY(4) |
    > + DWMAC_TXN_VARDELAY(2) |
    > + DWMAC_RX_VARDELAY(10) |
    > + DWMAC_RXN_VARDELAY(8);
    > + regmap_write(dwmac->regmap, OXNAS_DWMAC_DELAY_REGOFFSET, value);
    > +}
    > +
    > static int oxnas_dwmac_init(struct platform_device *pdev, void *priv)
    > {
    > struct oxnas_dwmac *dwmac = priv;
    > @@ -75,27 +122,7 @@ static int oxnas_dwmac_init(struct platform_device *pdev, void *priv)
    > return ret;
    > }

    There's an issue with the patch, the value read from register is not used, I'll send a V2 with the fix.

    Neil

    >
    > - /* Enable GMII_GTXCLK to follow GMII_REFCLK, required for gigabit PHY */
    > - value |= BIT(DWMAC_CKEN_GTX) |
    > - /* Use simple mux for 25/125 Mhz clock switching */
    > - BIT(DWMAC_SIMPLE_MUX) |
    > - /* set auto switch tx clock source */
    > - BIT(DWMAC_AUTO_TX_SOURCE) |
    > - /* enable tx & rx vardelay */
    > - BIT(DWMAC_CKEN_TX_OUT) |
    > - BIT(DWMAC_CKEN_TXN_OUT) |
    > - BIT(DWMAC_CKEN_TX_IN) |
    > - BIT(DWMAC_CKEN_RX_OUT) |
    > - BIT(DWMAC_CKEN_RXN_OUT) |
    > - BIT(DWMAC_CKEN_RX_IN);
    > - regmap_write(dwmac->regmap, OXNAS_DWMAC_CTRL_REGOFFSET, value);
    > -
    > - /* set tx & rx vardelay */
    > - value = DWMAC_TX_VARDELAY(4) |
    > - DWMAC_TXN_VARDELAY(2) |
    > - DWMAC_RX_VARDELAY(10) |
    > - DWMAC_RXN_VARDELAY(8);
    > - regmap_write(dwmac->regmap, OXNAS_DWMAC_DELAY_REGOFFSET, value);
    > + dwmac->data->setup(dwmac);
    >
    > return 0;
    > }
    > @@ -128,6 +155,12 @@ static int oxnas_dwmac_probe(struct platform_device *pdev)
    > goto err_remove_config_dt;
    > }
    >
    > + dwmac->data = (const struct oxnas_dwmac_data *)of_device_get_match_data(&pdev->dev);
    > + if (!dwmac->data) {
    > + ret = -EINVAL;
    > + goto err_remove_config_dt;
    > + }
    > +
    > dwmac->dev = &pdev->dev;
    > plat_dat->bsp_priv = dwmac;
    > plat_dat->init = oxnas_dwmac_init;
    > @@ -166,8 +199,23 @@ static int oxnas_dwmac_probe(struct platform_device *pdev)
    > return ret;
    > }
    >
    > +static const struct oxnas_dwmac_data ox810se_dwmac_data = {
    > + .setup = oxnas_dwmac_setup_ox810se,
    > +};
    > +
    > +static const struct oxnas_dwmac_data ox820_dwmac_data = {
    > + .setup = oxnas_dwmac_setup_ox820,
    > +};
    > +
    > static const struct of_device_id oxnas_dwmac_match[] = {
    > - { .compatible = "oxsemi,ox820-dwmac" },
    > + {
    > + .compatible = "oxsemi,ox810se-dwmac",
    > + .data = &ox810se_dwmac_data,
    > + },
    > + {
    > + .compatible = "oxsemi,ox820-dwmac",
    > + .data = &ox820_dwmac_data,
    > + },
    > { }
    > };
    > MODULE_DEVICE_TABLE(of, oxnas_dwmac_match);
    >

    \
     
     \ /
      Last update: 2022-01-04 09:43    [W:2.992 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site