Skip to content

Commit 3ddcd24

Browse files
vladimirolteanvinodkoul
authored andcommitted
phy: enter drivers/phy/Makefile even without CONFIG_GENERIC_PHY
Kconfig option CONFIG_PHY_COMMON_PROPS, which builds drivers/phy/phy-common-props.c, was intended to be selectable independently of CONFIG_GENERIC_PHY. Yet it lives in drivers/phy/, which is entered by the Makefile only if CONFIG_GENERIC_PHY is set. Allow the Makefile to enter one level deeper, but stop at drivers/phy/ if CONFIG_GENERIC_PHY is unselected (i.e. do not enter vendor folders). The other stuff from drivers/phy/Makefile except for CONFIG_PHY_COMMON_PROPS, like CONFIG_PHY_NXP_PTN3222, all depends on CONFIG_GENERIC_PHY. Fixes: e7556b5 ("phy: add phy_get_rx_polarity() and phy_get_tx_polarity()") Closes: https://lore.kernel.org/lkml/43ea0202-891d-4582-980b-5cb557b41114@linux.ibm.com/ Reported-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com> Debugged-by: Christophe Leroy (CS GROUP) <chleroy@kernel.org> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Reviewed-by: Christophe Leroy (CS GROUP) <chleroy@kernel.org> Tested-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com> Link: https://patch.msgid.link/20260123110600.3118561-1-vladimir.oltean@nxp.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent 8bb92fd commit 3ddcd24

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ obj-y += cache/
1010
obj-y += irqchip/
1111
obj-y += bus/
1212

13-
obj-$(CONFIG_GENERIC_PHY) += phy/
13+
obj-y += phy/
1414

1515
# GPIO must come after pinctrl as gpios may need to mux pins etc
1616
obj-$(CONFIG_PINCTRL) += pinctrl/

drivers/phy/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ obj-$(CONFIG_USB_LGM_PHY) += phy-lgm-usb.o
1717
obj-$(CONFIG_PHY_AIROHA_PCIE) += phy-airoha-pcie.o
1818
obj-$(CONFIG_PHY_NXP_PTN3222) += phy-nxp-ptn3222.o
1919
obj-$(CONFIG_PHY_SPACEMIT_K1_PCIE) += phy-spacemit-k1-pcie.o
20-
obj-y += allwinner/ \
20+
obj-$(CONFIG_GENERIC_PHY) += allwinner/ \
2121
amlogic/ \
2222
apple/ \
2323
broadcom/ \

0 commit comments

Comments
 (0)