phy: broadcom: Kconfig: Fix PHY_BRCM_USB config option
authorAl Cooper <alcooperx@gmail.com>
Wed, 1 Dec 2021 18:06:53 +0000 (13:06 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Feb 2022 11:56:22 +0000 (12:56 +0100)
commitc0ad2c2cac1b092a5f01fcfecac20ff5ed0a3a93
tree7b2a7cdd398d198052103445ff6ce770388ec34a
parent86cdc3060d41343cd3e863d731388e04cb5630de
phy: broadcom: Kconfig: Fix PHY_BRCM_USB config option

[ Upstream commit 5070ce86246a8a4ebacd0c15b121e6b6325bc167 ]

The previous commit 4b402fa8e0b7 ("phy: phy-brcm-usb: support PHY on
the BCM4908") added a second "default" line for ARCH_BCM_4908 above
the original "default" line for ARCH_BRCMSTB. When two "default"
lines are used, only the first is used and this change stopped
the PHY_BRCM_USB option for being enabled for ARCH_BRCMSTB.
The fix is to use one "default line with "||".

Fixes: 4b402fa8e0b7 ("phy: phy-brcm-usb: support PHY on the BCM4908")
Signed-off-by: Al Cooper <alcooperx@gmail.com>
Acked-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20211201180653.35097-4-alcooperx@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/phy/broadcom/Kconfig