From 9a31c739d2c0f1383d8a73830c5b0bc444ba9d28 Mon Sep 17 00:00:00 2001 From: Alexandru Gagniuc Date: Fri, 7 Jul 2017 11:37:00 -0700 Subject: [PATCH] net: phy: Hide Micrel KSZ9021 and KSZ9031 Kconfig options The correct option is PHY_MICREL_KSZ90X1, but some configs still select the 9021 and 9031 options, which are deprecated. Signed-off-by: Alexandru Gagniuc Reviewed-by: Philipp Tomsich Acked-by: Joe Hershberger --- drivers/net/phy/Kconfig | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index aecf7ed91f..4d02d8bb19 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -67,34 +67,14 @@ config PHY_MICREL if PHY_MICREL config PHY_MICREL_KSZ9021 - bool "Micrel KSZ9021 family support" + bool select PHY_GIGE select PHY_MICREL_KSZ90X1 - help - Enable support for the Micrel KSZ9021 GbE PHY family. If - enabled, the extended register read/write for KSZ9021 PHYs - is supported through the 'mdio' command and any RGMII signal - delays configured in the device tree will be applied to the - PHY during initialisation. - - Note that the KSZ9021 uses the same part number os the - KSZ8921BL, so enabling this option disables support for the - KSZ8721BL. - - Deprecated. Use PHY_MICREL_KSZ90X1 instead. config PHY_MICREL_KSZ9031 - bool "Micrel KSZ9031 family support" + bool select PHY_GIGE select PHY_MICREL_KSZ90X1 - help - Enable support for the Micrel KSZ9031 GbE PHY family. If - enabled, the extended register read/write for KSZ9021 PHYs - is supported through the 'mdio' command and any RGMII signal - delays configured in the device tree will be applied to the - PHY during initialisatioin. - - Deprecated. Use PHY_MICREL_KSZ90X1 instead. config PHY_MICREL_KSZ90X1 bool "Micrel KSZ90x1 family support"