John AudiaandHauke Mehrtens
bb3da35c90
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.78 Removed upstreamed: generic/pending-6.12/620-net-sfp-improve-Huawei-MA5671a-fixup.patch[1] generic/pending-6.12/704-net-phy-register-phy-led_triggers-during-probe-to-av.patch[2] airoha/patches-6.12/014-01-v6.13-net-airoha-fix-PSE-memory-configuration-in-airoha_fe.patch[3] airoha/patches-6.12/014-02-v6.13-net-airoha-read-default-PSE-reserved-pages-value-bef.patch[4] airoha/patches-6.12/031-01-v6.13-net-airoha-Read-completion-queue-data-in-airoha_qdma.patch[5] airoha/patches-6.12/128-v7.1-net-airoha-Remove-airoha_dev_stop-in-airoha_remove.patch[6] Manually rebased: airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch All patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=bbdf6d378e1ddbeadc04c57b182aadefcc3aa917 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=241cd64cf2e32b28ead151b1795cd8fef2b6e482 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=a04ac7bc97afe313e10ae4c73797c668dee47c5c 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=a9ed47c3663219e20406d566f02809de05373a42 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=4cba4373abac7ba27fdb33057a29b92efa8fd15d 6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=652ec118d8dc1b088e685d5562995b6665463771 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/22607 [Fix 048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol] 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
|
|
@@ -3382,11 +3382,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
|
|
@@ -902,8 +902,9 @@ struct phy_plca_status {
|
|
|
|
/* 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,
|