| Message ID | 20191102011351.6467-1-michael@walle.cc |
|---|---|
| Headers | show |
| Series | net: phy: at803x device tree binding | expand |
On 11/1/2019 6:13 PM, Michael Walle wrote: > The name of the PHY is actually AR803x not AT803x. Additionally, add the > name of the vendor and mention the AR8031 support. > > Signed-off-by: Michael Walle <michael@walle.cc> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
On 11/1/2019 6:13 PM, Michael Walle wrote: > Add support for configuring the CLK_25M pin as well as the RGMII I/O > voltage by the device tree. > > Signed-off-by: Michael Walle <michael@walle.cc> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
On 11/1/2019 6:13 PM, Michael Walle wrote: > Fix at least the displayed strings. The actual name of the chip is > AR803x. Only if you have to spin a v2, since you fixed the Kconfig entry, you might as well fix those names to be Qualcomm Atheros. -- Florian
From: Michael Walle <michael@walle.cc> Date: Sat, 2 Nov 2019 02:13:46 +0100 > Adds a device tree binding to configure the clock and the RGMII voltage. This does not apply cleanly to net-next, please respin. Thank you.
Am 2019-11-05 23:06, schrieb David Miller: > From: Michael Walle <michael@walle.cc> > Date: Sat, 2 Nov 2019 02:13:46 +0100 > >> Adds a device tree binding to configure the clock and the RGMII >> voltage. > > This does not apply cleanly to net-next, please respin. That is actually just fine, because there is a bug in the AR8035 handling. I'll fix that and rebase it on your net-next. Thanks, -michael
Am 2019-11-02 02:13, schrieb Michael Walle: > Add support for configuring the CLK_25M pin as well as the RGMII I/O > voltage by the device tree. > > Signed-off-by: Michael Walle <michael@walle.cc> > --- > drivers/net/phy/at803x.c | 283 ++++++++++++++++++++++++++++++++++++++- > 1 file changed, 281 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c > index 1eb5d4fb8925..a30a2ff57068 100644 > --- a/drivers/net/phy/at803x.c > +++ b/drivers/net/phy/at803x.c > @@ -13,7 +13,12 @@ > #include <linux/netdevice.h> > #include <linux/etherdevice.h> > #include <linux/of_gpio.h> > +#include <linux/bitfield.h> > #include <linux/gpio/consumer.h> > +#include <linux/regulator/of_regulator.h> > +#include <linux/regulator/driver.h> > +#include <linux/regulator/consumer.h> > +#include <dt-bindings/net/qca-ar803x.h> > > #define AT803X_SPECIFIC_STATUS 0x11 > #define AT803X_SS_SPEED_MASK (3 << 14) > @@ -62,6 +67,42 @@ > #define AT803X_DEBUG_REG_5 0x05 > #define AT803X_DEBUG_TX_CLK_DLY_EN BIT(8) > > +#define AT803X_DEBUG_REG_1F 0x1F > +#define AT803X_DEBUG_PLL_ON BIT(2) > +#define AT803X_DEBUG_RGMII_1V8 BIT(3) > + > +/* AT803x supports either the XTAL input pad, an internal PLL or the > + * DSP as clock reference for the clock output pad. The XTAL reference > + * is only used for 25 MHz output, all other frequencies need the PLL. > + * The DSP as a clock reference is used in synchronous ethernet > + * applications. > + * > + * By default the PLL is only enabled if there is a link. Otherwise > + * the PHY will go into low power state and disabled the PLL. You can > + * set the PLL_ON bit (see debug register 0x1f) to keep the PLL always > + * enabled. > + */ > +#define AT803X_MMD7_CLK25M 0x8016 > +#define AT803X_CLK_OUT_MASK GENMASK(4, 2) > +#define AT803X_CLK_OUT_25MHZ_XTAL 0 > +#define AT803X_CLK_OUT_25MHZ_DSP 1 > +#define AT803X_CLK_OUT_50MHZ_PLL 2 > +#define AT803X_CLK_OUT_50MHZ_DSP 3 > +#define AT803X_CLK_OUT_62_5MHZ_PLL 4 > +#define AT803X_CLK_OUT_62_5MHZ_DSP 5 > +#define AT803X_CLK_OUT_125MHZ_PLL 6 > +#define AT803X_CLK_OUT_125MHZ_DSP 7 > + > +/* Unfortunately, the AR8035 has another mask which is incompatible > + * with the AR8031 PHY. Also, it only supports 25MHz and 50MHz. > + */ > +#define AT8035_CLK_OUT_MASK GENMASK(4, 3) > + > +#define AT803X_CLK_OUT_STRENGTH_MASK GENMASK(8, 7) > +#define AT803X_CLK_OUT_STRENGTH_FULL 0 > +#define AT803X_CLK_OUT_STRENGTH_HALF 1 > +#define AT803X_CLK_OUT_STRENGTH_QUARTER 2 > + > #define ATH8030_PHY_ID 0x004dd076 > #define ATH8031_PHY_ID 0x004dd074 > #define ATH8035_PHY_ID 0x004dd072 > @@ -73,6 +114,13 @@ MODULE_LICENSE("GPL"); > > struct at803x_priv { > bool phy_reset:1; > + int flags; > +#define AT803X_KEEP_PLL_ENABLED BIT(0) /* don't turn off internal PLL > */ > + u16 clk_25m_reg; > + u16 clk_25m_mask; > + struct regulator_dev *vddio_rdev; > + struct regulator_dev *vddh_rdev; > + struct regulator *vddio; > }; > > struct at803x_context { > @@ -240,6 +288,192 @@ static int at803x_resume(struct phy_device > *phydev) > return phy_modify(phydev, MII_BMCR, BMCR_PDOWN | BMCR_ISOLATE, 0); > } > > +static int at803x_rgmii_reg_set_voltage_sel(struct regulator_dev > *rdev, > + unsigned int selector) > +{ > + struct phy_device *phydev = rdev_get_drvdata(rdev); > + > + if (selector) > + return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_1F, > + 0, AT803X_DEBUG_RGMII_1V8); > + else > + return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_1F, > + AT803X_DEBUG_RGMII_1V8, 0); > +} > + > +static int at803x_rgmii_reg_get_voltage_sel(struct regulator_dev > *rdev) > +{ > + struct phy_device *phydev = rdev_get_drvdata(rdev); > + int val; > + > + val = at803x_debug_reg_read(phydev, AT803X_DEBUG_REG_1F); > + if (val < 0) > + return val; > + > + return (val & AT803X_DEBUG_RGMII_1V8) ? 1 : 0; > +} > + > +static struct regulator_ops vddio_regulator_ops = { > + .list_voltage = regulator_list_voltage_table, > + .set_voltage_sel = at803x_rgmii_reg_set_voltage_sel, > + .get_voltage_sel = at803x_rgmii_reg_get_voltage_sel, > +}; > + > +static const unsigned int vddio_voltage_table[] = { > + 1500000, > + 1800000, > +}; > + > +static const struct regulator_desc vddio_desc = { > + .name = "vddio", > + .of_match = of_match_ptr("vddio-regulator"), > + .n_voltages = ARRAY_SIZE(vddio_voltage_table), > + .volt_table = vddio_voltage_table, > + .ops = &vddio_regulator_ops, > + .type = REGULATOR_VOLTAGE, > + .owner = THIS_MODULE, > +}; > + > +static struct regulator_ops vddh_regulator_ops = { > +}; > + > +static const struct regulator_desc vddh_desc = { > + .name = "vddh", > + .of_match = of_match_ptr("vddh-regulator"), > + .n_voltages = 1, > + .fixed_uV = 2500000, > + .ops = &vddh_regulator_ops, > + .type = REGULATOR_VOLTAGE, > + .owner = THIS_MODULE, > +}; > + > +static int at8031_register_regulators(struct phy_device *phydev) > +{ > + struct at803x_priv *priv = phydev->priv; > + struct device *dev = &phydev->mdio.dev; > + struct regulator_config config = { }; > + > + config.dev = dev; > + config.driver_data = phydev; > + > + priv->vddio_rdev = devm_regulator_register(dev, &vddio_desc, > &config); > + if (IS_ERR(priv->vddio_rdev)) { > + phydev_err(phydev, "failed to register VDDIO regulator\n"); > + return PTR_ERR(priv->vddio_rdev); > + } > + > + priv->vddh_rdev = devm_regulator_register(dev, &vddh_desc, &config); > + if (IS_ERR(priv->vddh_rdev)) { > + phydev_err(phydev, "failed to register VDDH regulator\n"); > + return PTR_ERR(priv->vddh_rdev); > + } > + > + return 0; > +} > + > +static bool at803x_match_phy_id(struct phy_device *phydev, u32 phy_id) > +{ > + return (phydev->phy_id & phydev->drv->phy_id_mask) > + == (phy_id & phydev->drv->phy_id_mask); > +} > + > +static int at803x_parse_dt(struct phy_device *phydev) > +{ > + struct device_node *node = phydev->mdio.dev.of_node; > + struct at803x_priv *priv = phydev->priv; > + unsigned int sel, mask; > + u32 freq, strength; > + int ret; > + > + if (!IS_ENABLED(CONFIG_OF_MDIO)) > + return 0; > + > + ret = of_property_read_u32(node, "qca,clk-out-frequency", &freq); > + if (!ret) { > + mask = AT803X_CLK_OUT_MASK; > + switch (freq) { > + case 25000000: > + sel = AT803X_CLK_OUT_25MHZ_XTAL; > + break; > + case 50000000: > + sel = AT803X_CLK_OUT_50MHZ_PLL; > + break; > + case 62500000: > + sel = AT803X_CLK_OUT_62_5MHZ_PLL; > + break; > + case 125000000: > + sel = AT803X_CLK_OUT_125MHZ_PLL; > + break; > + default: > + phydev_err(phydev, "invalid qca,clk-out-frequency\n"); > + return -EINVAL; > + } > + > + /* Fixup for the AR8030/AR8035. This chip has another mask and > + * supports only 25MHz and 50MHz output. This is actually wrong. There are two different datasheets with contradictory information. The AR8035 actually supports up to 125MHz, just the DSP option. I'll fix that in the v2. > + * > + * Warning: > + * There was no datasheet for the AR8030 available so this is > + * just a guess. But the AR8035 is listed as pin compatible > + * to the AR8030 so there might be a good chance it works on > + * the AR8030 too. > + */ > + if (at803x_match_phy_id(phydev, ATH8030_PHY_ID) || > + at803x_match_phy_id(phydev, ATH8035_PHY_ID)) { > + mask = AT8035_CLK_OUT_MASK; > + if (freq > 50000000) > + phydev_err(phydev, > + "invalid qca,clk-out-frequency\n"); > + return -EINVAL; > + } > + > + priv->clk_25m_reg |= FIELD_PREP(mask, sel); > + priv->clk_25m_mask |= mask; -michael