mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-31 05:54:26 -04:00
51bbc8114b
1. Update target/linux/generic/config-6.6 for new ksym 2. Refresh patches Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.57 Added: generic/backport-6.6/777-netfilter-xtables-fix-typo-causing-some-targets-to-not-load-on-IPv6.patch[1] Manually rebased: generic/hack-6.6/645-netfilter-connmark-introduce-set-dscpmark.patch Removed upstreamed: gemini/patches-6.6/0001-net-ethernet-cortina-Drop-TSO-support.patch[2] gemini/patches-6.6/0004-net-ethernet-cortina-Restore-TSO-support.patch[3] All other patches automatically rebased. 1. https://lore.kernel.org/all/20241019-xtables-typos-v2-1-6b8b1735dc8e@0upti.me/ 2 https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.57&id=452c0740d72c6a77a41f6ddc318a48f18c3d2346 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.57&id=611f74b0e7fb93ee2366d9d7edca546806b220e9 Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/16726 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
From a274465cc3bef2dfd9c9ea5100848dda0a8641e1 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Thu, 10 Oct 2024 13:54:19 +0100
|
|
Subject: [PATCH 1/4] net: phy: support 'active-high' property for PHY LEDs
|
|
|
|
In addition to 'active-low' and 'inactive-high-impedance' also
|
|
support 'active-high' property for PHY LED pin configuration.
|
|
As only either 'active-high' or 'active-low' can be set at the
|
|
same time, WARN and return an error in case both are set.
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Link: https://patch.msgid.link/91598487773d768f254d5faf06cf65b13e972f0e.1728558223.git.daniel@makrotopia.org
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/phy/phy_device.c | 6 ++++++
|
|
include/linux/phy.h | 5 +++--
|
|
2 files changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/phy/phy_device.c
|
|
+++ b/drivers/net/phy/phy_device.c
|
|
@@ -3220,11 +3220,17 @@ static int of_phy_led(struct phy_device
|
|
if (index > U8_MAX)
|
|
return -EINVAL;
|
|
|
|
+ if (of_property_read_bool(led, "active-high"))
|
|
+ set_bit(PHY_LED_ACTIVE_HIGH, &modes);
|
|
if (of_property_read_bool(led, "active-low"))
|
|
set_bit(PHY_LED_ACTIVE_LOW, &modes);
|
|
if (of_property_read_bool(led, "inactive-high-impedance"))
|
|
set_bit(PHY_LED_INACTIVE_HIGH_IMPEDANCE, &modes);
|
|
|
|
+ if (WARN_ON(modes & BIT(PHY_LED_ACTIVE_LOW) &&
|
|
+ modes & BIT(PHY_LED_ACTIVE_HIGH)))
|
|
+ return -EINVAL;
|
|
+
|
|
if (modes) {
|
|
/* Return error if asked to set polarity modes but not supported */
|
|
if (!phydev->drv->led_polarity_set)
|
|
--- a/include/linux/phy.h
|
|
+++ b/include/linux/phy.h
|
|
@@ -872,8 +872,9 @@ struct phy_led {
|
|
|
|
/* Modes for PHY LED configuration */
|
|
enum phy_led_modes {
|
|
- PHY_LED_ACTIVE_LOW = 0,
|
|
- PHY_LED_INACTIVE_HIGH_IMPEDANCE = 1,
|
|
+ PHY_LED_ACTIVE_HIGH = 0,
|
|
+ PHY_LED_ACTIVE_LOW = 1,
|
|
+ PHY_LED_INACTIVE_HIGH_IMPEDANCE = 2,
|
|
|
|
/* keep it last */
|
|
__PHY_LED_MODES_NUM,
|