mirror of
https://abf.rosa.ru/djam/kernel-6.6.git
synced 2025-02-24 11:22:47 +00:00
37d488c3a9
Ran ARCH=arm64 ./scripts/kconfig/merge_config.sh /mnt/dev/rosa-pkgs/kernel-6.6/kernel-arm64.config /mnt/dev/rosa-pkgs/kernel-6.6/kernel-x86_64.config inside kernel sources to merge arm64 and x86_64 configs
147 lines
4.6 KiB
Diff
147 lines
4.6 KiB
Diff
From bd7dff13801bf307f40811d155805dcaae7b5e14 Mon Sep 17 00:00:00 2001
|
|
From: Alexey Sheplyakov <asheplyakov@basealt.ru>
|
|
Date: Wed, 12 Oct 2022 13:08:04 +0400
|
|
Subject: [PATCH 630/643] phy: realtek: leds configuration for RTL8211f
|
|
|
|
Configure leds according to 'realtek,led-mode', 'realtek,led[0-2]-control'
|
|
knobs (specified in DTB). Note that *all* of these parameters must be
|
|
set in DTB for this to work.
|
|
See https://my.basealt.space/issues/85133
|
|
|
|
X-feature-Baikal-M
|
|
DONTUPSTREAM
|
|
---
|
|
drivers/net/phy/realtek.c | 55 +++++++++++++++++++
|
|
.../dt-bindings/net/realtek-phy-rtl8211f.h | 26 +++++++++
|
|
2 files changed, 81 insertions(+)
|
|
create mode 100644 include/dt-bindings/net/realtek-phy-rtl8211f.h
|
|
|
|
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
|
|
index 337899c69738..f0fc872ee572 100644
|
|
--- a/drivers/net/phy/realtek.c
|
|
+++ b/drivers/net/phy/realtek.c
|
|
@@ -9,6 +9,7 @@
|
|
*/
|
|
#include <linux/bitops.h>
|
|
#include <linux/of.h>
|
|
+#include <dt-bindings/net/realtek-phy-rtl8211f.h>
|
|
#include <linux/phy.h>
|
|
#include <linux/module.h>
|
|
#include <linux/delay.h>
|
|
@@ -31,6 +32,7 @@
|
|
#define RTL8211F_PHYCR1 0x18
|
|
#define RTL8211F_PHYCR2 0x19
|
|
#define RTL8211F_INSR 0x1d
|
|
+#define RTL8211F_LCR 0x10
|
|
|
|
#define RTL8211F_TX_DELAY BIT(8)
|
|
#define RTL8211F_RX_DELAY BIT(3)
|
|
@@ -335,6 +337,56 @@ static int rtl8211_config_aneg(struct phy_device *phydev)
|
|
return 0;
|
|
}
|
|
|
|
+static void rtl8211f_config_led(struct phy_device *phydev)
|
|
+{
|
|
+ struct device *dev = &phydev->mdio.dev;
|
|
+ struct device_node *of_node = dev->of_node;
|
|
+ u16 val;
|
|
+ u32 led_mode, led0_ctrl, led1_ctrl, led2_ctrl;
|
|
+ int ret;
|
|
+
|
|
+ ret = of_property_read_u32(of_node, "realtek,led-mode", &led_mode);
|
|
+ if (ret < 0) {
|
|
+ dev_dbg(dev, "refusing to reconfigure leds: no 'realtek,led-mode' in dtb\n");
|
|
+ return;
|
|
+ }
|
|
+ ret = of_property_read_u32(of_node, "realtek,led0-control", &led0_ctrl);
|
|
+ if (ret < 0) {
|
|
+ dev_dbg(dev, "refusing to reconfigure leds: no 'realtek,led0-control' in dtb\n");
|
|
+ return;
|
|
+ }
|
|
+ ret = of_property_read_u32(of_node, "realtek,led1-control", &led1_ctrl);
|
|
+ if (ret < 0) {
|
|
+ dev_dbg(dev, "refusing to reconfigure leds: no 'realtek,led1-control' in dtb\n");
|
|
+ return;
|
|
+ }
|
|
+ ret = of_property_read_u32(of_node, "realtek,led2-control", &led2_ctrl);
|
|
+ if (ret < 0) {
|
|
+ dev_dbg(dev, "refusing to reconfigure leds: no 'realtek,led-control' in dtb\n");
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ val = (led_mode << 15) | (led2_ctrl << 10) |
|
|
+ (led1_ctrl << 5) | led0_ctrl;
|
|
+
|
|
+ ret = phy_write_paged(phydev, 0xd04, RTL8211F_LCR, val);
|
|
+ if (ret < 0)
|
|
+ dev_dbg(dev, "Failed to update the LED control register\n");
|
|
+}
|
|
+
|
|
+static int rtl8211f_config_aneg(struct phy_device *phydev)
|
|
+{
|
|
+ int ret;
|
|
+
|
|
+ rtl8211f_config_led(phydev);
|
|
+
|
|
+ ret = genphy_config_aneg(phydev);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int rtl8211c_config_init(struct phy_device *phydev)
|
|
{
|
|
/* RTL8211C has an issue when operating in Gigabit slave mode */
|
|
@@ -349,6 +401,8 @@ static int rtl8211f_config_init(struct phy_device *phydev)
|
|
u16 val_txdly, val_rxdly;
|
|
int ret;
|
|
|
|
+ rtl8211f_config_led(phydev);
|
|
+
|
|
ret = phy_modify_paged_changed(phydev, 0xa43, RTL8211F_PHYCR1,
|
|
RTL8211F_ALDPS_PLL_OFF | RTL8211F_ALDPS_ENABLE | RTL8211F_ALDPS_XTAL_OFF,
|
|
priv->phycr1);
|
|
@@ -953,6 +1007,7 @@ static struct phy_driver realtek_drvs[] = {
|
|
PHY_ID_MATCH_EXACT(0x001cc916),
|
|
.name = "RTL8211F Gigabit Ethernet",
|
|
.probe = rtl821x_probe,
|
|
+ .config_aneg = rtl8211f_config_aneg,
|
|
.config_init = &rtl8211f_config_init,
|
|
.read_status = rtlgen_read_status,
|
|
.config_intr = &rtl8211f_config_intr,
|
|
diff --git a/include/dt-bindings/net/realtek-phy-rtl8211f.h b/include/dt-bindings/net/realtek-phy-rtl8211f.h
|
|
new file mode 100644
|
|
index 000000000000..46d17644119d
|
|
--- /dev/null
|
|
+++ b/include/dt-bindings/net/realtek-phy-rtl8211f.h
|
|
@@ -0,0 +1,26 @@
|
|
+/* SPDX-License-Identifier: GPL-2.0 */
|
|
+#ifndef _DT_BINDINGS_REALTEK_PHY_RTL8211F_H
|
|
+#define _DT_BINDINGS_REALTEK_PHY_RTL8211F_H
|
|
+
|
|
+/* LED modes for RTL8211F PHY */
|
|
+
|
|
+#define RTL8211F_LED_MODE_A 0
|
|
+#define RTL8211F_LED_MODE_B 1
|
|
+
|
|
+#define RTL8211F_LINK_10 1
|
|
+#define RTL8211F_LINK_100 2
|
|
+#define RTL8211F_LINK_10_100 3
|
|
+#define RTL8211F_LINK_1000 8
|
|
+#define RTL8211F_LINK_10_1000 9
|
|
+#define RTL8211F_LINK_100_1000 10
|
|
+#define RTL8211F_LINK_10_100_1000 11
|
|
+#define RTL8211F_ACTIVITY 16
|
|
+#define RTL8211F_LINK_10_ACTIVITY 17
|
|
+#define RTL8211F_LINK_100_ACTIVITY 18
|
|
+#define RTL8211F_LINK_10_100_ACTIVITY 19
|
|
+#define RTL8211F_LINK_1000_ACTIVITY 24
|
|
+#define RTL8211F_LINK_10_1000_ACTIVITY 25
|
|
+#define RTL8211F_LINK_100_1000_ACTIVITY 26
|
|
+#define RTL8211F_LINK_10_100_1000_ACTIVITY 27
|
|
+
|
|
+#endif
|
|
--
|
|
2.40.1
|
|
|