Skip to content

Commit f29207d

Browse files
Dimitri Fedraukuba-moo
authored andcommitted
net: phy: marvell-88q2xxx: move interrupt configuration
Move interrupt configuration from mv88q222x_revb0_config_init to mv88q2xxx_config_init. Same register and bits are used for the 88q2xxx devices. Reviewed-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Stefan Eichenberger <eichest@gmail.com> Signed-off-by: Dimitri Fedrau <dima.fedrau@gmail.com> Link: https://lore.kernel.org/r/20240218075753.18067-15-dima.fedrau@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 923d310 commit f29207d

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

drivers/net/phy/marvell-88q2xxx.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,14 @@ static int mv88q2xxx_config_init(struct phy_device *phydev)
376376
*/
377377
phydev->pma_extable = MDIO_PMA_EXTABLE_BT1;
378378

379+
/* Configure interrupt with default settings, output is driven low for
380+
* active interrupt and high for inactive.
381+
*/
382+
if (phy_interrupt_is_valid(phydev))
383+
return phy_set_bits_mmd(phydev, MDIO_MMD_PCS,
384+
MDIO_MMD_PCS_MV_GPIO_INT_CTRL,
385+
MDIO_MMD_PCS_MV_GPIO_INT_CTRL_TRI_DIS);
386+
379387
return 0;
380388
}
381389

@@ -701,14 +709,6 @@ static int mv88q222x_revb0_config_init(struct phy_device *phydev)
701709
return ret;
702710
}
703711

704-
/* Configure interrupt with default settings, output is driven low for
705-
* active interrupt and high for inactive.
706-
*/
707-
if (phy_interrupt_is_valid(phydev))
708-
return phy_set_bits_mmd(phydev, MDIO_MMD_PCS,
709-
MDIO_MMD_PCS_MV_GPIO_INT_CTRL,
710-
MDIO_MMD_PCS_MV_GPIO_INT_CTRL_TRI_DIS);
711-
712712
return mv88q2xxx_config_init(phydev);
713713
}
714714

0 commit comments

Comments
 (0)