generic: 6.1: backport patch to enable PHYLIB_LEDS kconfig dynamically

Backport patch to enable PHYLIB_LEDS kconfig dynamically instead of
having to select this config for every target that makes use of PHY LEDs
API.

All affected patch are automatically refreshed.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2024-02-05 17:54:18 +01:00
parent 48d7376400
commit 04a8f553e0
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
5 changed files with 47 additions and 4 deletions

View File

@ -0,0 +1,43 @@
From 9b78d919632b7149d311aaad5a977e4b48b10321 Mon Sep 17 00:00:00 2001
From: Paolo Abeni <pabeni@redhat.com>
Date: Wed, 26 Apr 2023 10:15:31 +0200
Subject: [PATCH] net: phy: hide the PHYLIB_LEDS knob
commit 4bb7aac70b5d ("net: phy: fix circular LEDS_CLASS dependencies")
solved a build failure, but introduces a new config knob with a default
'y' value: PHYLIB_LEDS.
The latter is against the current new config policy. The exception
was raised to allow the user to catch bad configurations without led
support.
Anyway the current definition of PHYLIB_LEDS does not fit the above
goal: if LEDS_CLASS is disabled, the new config will be available
only with PHYLIB disabled, too.
Hide the mentioned config, to preserve the randconfig testing done so
far, while respecting the mentioned policy.
Suggested-by: Andrew Lunn <andrew@lunn.ch>
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Link: https://lore.kernel.org/r/d82489be8ed911c383c3447e9abf469995ccf39a.1682496488.git.pabeni@redhat.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
drivers/net/phy/Kconfig | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -45,10 +45,8 @@ config LED_TRIGGER_PHY
for any speed known to the PHY.
config PHYLIB_LEDS
- bool "Support probing LEDs from device tree"
+ def_bool OF
depends on LEDS_CLASS=y || LEDS_CLASS=PHYLIB
- depends on OF
- default y
help
When LED class support is enabled, phylib can automatically
probe LED setting from device tree.

View File

@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -69,6 +69,80 @@ config SFP
@@ -67,6 +67,80 @@ config SFP
depends on HWMON || HWMON=n
select MDIO_I2C

View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -381,6 +381,12 @@ config ROCKCHIP_PHY
@@ -379,6 +379,12 @@ config ROCKCHIP_PHY
help
Currently supports the integrated Ethernet PHY.

View File

@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
L: linux-i2c@vger.kernel.org
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -311,6 +311,18 @@ config MEDIATEK_GE_PHY
@@ -309,6 +309,18 @@ config MEDIATEK_GE_PHY
help
Supports the MediaTek Gigabit Ethernet PHYs.

View File

@ -13,7 +13,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -323,6 +323,13 @@ config MEDIATEK_GE_SOC_PHY
@@ -321,6 +321,13 @@ config MEDIATEK_GE_SOC_PHY
present in the SoCs efuse and will dynamically calibrate VCM
(common-mode voltage) during startup.