Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Dimitri Fedrau and committed by
Jakub Kicinski
f29207d2 923d3104

+8 -8
+8 -8
drivers/net/phy/marvell-88q2xxx.c
··· 376 376 */ 377 377 phydev->pma_extable = MDIO_PMA_EXTABLE_BT1; 378 378 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 + 379 387 return 0; 380 388 } 381 389 ··· 708 700 if (ret < 0) 709 701 return ret; 710 702 } 711 - 712 - /* Configure interrupt with default settings, output is driven low for 713 - * active interrupt and high for inactive. 714 - */ 715 - if (phy_interrupt_is_valid(phydev)) 716 - return phy_set_bits_mmd(phydev, MDIO_MMD_PCS, 717 - MDIO_MMD_PCS_MV_GPIO_INT_CTRL, 718 - MDIO_MMD_PCS_MV_GPIO_INT_CTRL_TRI_DIS); 719 703 720 704 return mv88q2xxx_config_init(phydev); 721 705 }