| Message ID | 20240213213955.178762-15-dima.fedrau@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: phy: marvell-88q2xxx: add driver for the Marvell 88Q2220 PHY | expand |
On Tue, Feb 13, 2024 at 10:39:53PM +0100, Dimitri Fedrau wrote: > Move interrupt configuration from mv88q222x_revb0_config_init to > mv88q2xxx_config_init. Same register and bits are used for the 88q2xxx > devices. > > Signed-off-by: Dimitri Fedrau <dima.fedrau@gmail.com> I couldn't test it because we don't have the interrupt pin connected but according to datasheet of the 88Q2110 it looks good. Reviewed-by: Stefan Eichenberger <eichest@gmail.com>
On Tue, Feb 13, 2024 at 10:39:53PM +0100, Dimitri Fedrau wrote: > Move interrupt configuration from mv88q222x_revb0_config_init to > mv88q2xxx_config_init. Same register and bits are used for the 88q2xxx > devices. > > Signed-off-by: Dimitri Fedrau <dima.fedrau@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
diff --git a/drivers/net/phy/marvell-88q2xxx.c b/drivers/net/phy/marvell-88q2xxx.c index 7afaa693316f..dc0f150826f0 100644 --- a/drivers/net/phy/marvell-88q2xxx.c +++ b/drivers/net/phy/marvell-88q2xxx.c @@ -375,6 +375,14 @@ static int mv88q2xxx_config_init(struct phy_device *phydev) */ phydev->pma_extable = MDIO_PMA_EXTABLE_BT1; + /* Configure interrupt with default settings, output is driven low for + * active interrupt and high for inactive. + */ + if (phy_interrupt_is_valid(phydev)) + return phy_set_bits_mmd(phydev, MDIO_MMD_PCS, + MDIO_MMD_PCS_MV_GPIO_INT_CTRL, + MDIO_MMD_PCS_MV_GPIO_INT_CTRL_TRI_DIS); + return 0; } @@ -700,14 +708,6 @@ static int mv88q222x_revb0_config_init(struct phy_device *phydev) return ret; } - /* Configure interrupt with default settings, output is driven low for - * active interrupt and high for inactive. - */ - if (phy_interrupt_is_valid(phydev)) - return phy_set_bits_mmd(phydev, MDIO_MMD_PCS, - MDIO_MMD_PCS_MV_GPIO_INT_CTRL, - MDIO_MMD_PCS_MV_GPIO_INT_CTRL_TRI_DIS); - return mv88q2xxx_config_init(phydev); }
Move interrupt configuration from mv88q222x_revb0_config_init to mv88q2xxx_config_init. Same register and bits are used for the 88q2xxx devices. Signed-off-by: Dimitri Fedrau <dima.fedrau@gmail.com> --- drivers/net/phy/marvell-88q2xxx.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)