Takashi Iwai 8e10a7
From 6cb17707aad869de163d7bf42c253caf501be4e2 Mon Sep 17 00:00:00 2001
Takashi Iwai 8e10a7
From: Geert Uytterhoeven <geert+renesas@glider.be>
Takashi Iwai 8e10a7
Date: Mon, 8 Feb 2021 16:02:52 +0100
Takashi Iwai 8e10a7
Subject: [PATCH] phy: marvell: ARMADA375_USBCLUSTER_PHY should not default to y, unconditionally
Takashi Iwai 8e10a7
Git-commit: 6cb17707aad869de163d7bf42c253caf501be4e2
Takashi Iwai 8e10a7
Patch-mainline: v5.13-rc1
Takashi Iwai 8e10a7
References: git-fixes
Takashi Iwai 8e10a7
Takashi Iwai 8e10a7
Merely enabling CONFIG_COMPILE_TEST should not enable additional code.
Takashi Iwai 8e10a7
To fix this, restrict the automatic enabling of ARMADA375_USBCLUSTER_PHY
Takashi Iwai 8e10a7
to MACH_ARMADA_375, and ask the user in case of compile-testing.
Takashi Iwai 8e10a7
Takashi Iwai 8e10a7
Fixes: eee47538ec1f2619 ("phy: add support for USB cluster on the Armada 375 SoC")
Takashi Iwai 8e10a7
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Takashi Iwai 8e10a7
Link: https://lore.kernel.org/r/20210208150252.424706-1-geert+renesas@glider.be
Takashi Iwai 8e10a7
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Takashi Iwai 8e10a7
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 8e10a7
Takashi Iwai 8e10a7
---
Takashi Iwai 8e10a7
 drivers/phy/marvell/Kconfig | 4 ++--
Takashi Iwai 8e10a7
 1 file changed, 2 insertions(+), 2 deletions(-)
Takashi Iwai 8e10a7
Takashi Iwai 8e10a7
diff --git a/drivers/phy/marvell/Kconfig b/drivers/phy/marvell/Kconfig
Takashi Iwai 8e10a7
index 9208839019bd..c5651ef70666 100644
Takashi Iwai 8e10a7
--- a/drivers/phy/marvell/Kconfig
Takashi Iwai 8e10a7
+++ b/drivers/phy/marvell/Kconfig
Takashi Iwai 8e10a7
@@ -3,8 +3,8 @@
Takashi Iwai 8e10a7
 # Phy drivers for Marvell platforms
Takashi Iwai 8e10a7
 #
Takashi Iwai 8e10a7
 config ARMADA375_USBCLUSTER_PHY
Takashi Iwai 8e10a7
-	def_bool y
Takashi Iwai 8e10a7
-	depends on MACH_ARMADA_375 || COMPILE_TEST
Takashi Iwai 8e10a7
+	bool "Armada 375 USB cluster PHY support" if COMPILE_TEST
Takashi Iwai 8e10a7
+	default y if MACH_ARMADA_375
Takashi Iwai 8e10a7
 	depends on OF && HAS_IOMEM
Takashi Iwai 8e10a7
 	select GENERIC_PHY
Takashi Iwai 8e10a7
 
Takashi Iwai 8e10a7
-- 
Takashi Iwai 8e10a7
2.26.2
Takashi Iwai 8e10a7