forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: x86: make i915 as a kmod with required firmware net: phy: broadcom: update dependency condition
- Loading branch information
Showing
3 changed files
with
122 additions
and
138 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
target/linux/generic/pending-6.6/741-net-phy-broadcom-update-dependency-condition.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| From 1be3688b3eaa7ea2d9e19bd29ae6a6a51c121a0b Mon Sep 17 00:00:00 2001 | ||
| From: David Bauer <[email protected]> | ||
| Date: Sat, 16 Nov 2024 22:36:15 +0100 | ||
| Subject: [PATCH] net: phy: broadcom: update dependency condition | ||
|
|
||
| The broadcom PHY driver only has to depend upon PTP_1588_CLOCK_OPTIONAL | ||
| if NETWORK_PHY_TIMESTAMPING is enabled. The PTP functionality is stubbed | ||
| in this case. | ||
|
|
||
| Reflect this circumstance in the dependence condition. This allows to | ||
| build the driver as a built-in module even if PTP is built as a module. | ||
|
|
||
| This is required to include the broadcom PHY module regardless of the | ||
| built-setting of the PTP subsystem. On ath79 (and probably more) | ||
| targets with Broadcom PHY, Gigabit operation is currently broken as the | ||
| PHY driver is only built as a module in case all kernel-packages are | ||
| built. Due to this circumstance, affected devices fall back to using the | ||
| generic PHY driver. | ||
|
|
||
| Signed-off-by: David Bauer <[email protected]> | ||
| --- | ||
| drivers/net/phy/Kconfig | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| --- a/drivers/net/phy/Kconfig | ||
| +++ b/drivers/net/phy/Kconfig | ||
| @@ -113,7 +113,7 @@ config BROADCOM_PHY | ||
| tristate "Broadcom 54XX PHYs" | ||
| select BCM_NET_PHYLIB | ||
| select BCM_NET_PHYPTP if NETWORK_PHY_TIMESTAMPING | ||
| - depends on PTP_1588_CLOCK_OPTIONAL | ||
| + depends on NETWORK_PHY_TIMESTAMPING=n || PTP_1588_CLOCK_OPTIONAL | ||
| help | ||
| Currently supports the BCM5411, BCM5421, BCM5461, BCM54616S, BCM5464, | ||
| BCM5481, BCM54810 and BCM5482 PHYs. |