From: Matthias Kaehlcke <mka@chromium.org>
To: "David S . Miller" <davem@davemloft.net>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>, Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
Heiner Kallweit <hkallweit1@gmail.com>
Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
Douglas Anderson <dianders@chromium.org>,
Matthias Kaehlcke <mka@chromium.org>
Subject: [PATCH v2 7/7] net: phy: realtek: configure RTL8211E LEDs
Date: Wed, 3 Jul 2019 12:37:24 -0700 [thread overview]
Message-ID: <20190703193724.246854-7-mka@chromium.org> (raw)
In-Reply-To: <20190703193724.246854-1-mka@chromium.org>
Configure the RTL8211E LEDs behavior when the device tree property
'realtek,led-modes' is specified.
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
---
Changes in v2:
- patch added to the series
---
drivers/net/phy/realtek.c | 63 +++++++++++++++++++++++++++++++++++++--
1 file changed, 61 insertions(+), 2 deletions(-)
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index 45fee4612031..559aec547738 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -9,6 +9,7 @@
* Copyright (c) 2004 Freescale Semiconductor, Inc.
*/
#include <linux/bitops.h>
+#include <linux/bits.h>
#include <linux/device.h>
#include <linux/module.h>
#include <linux/of.h>
@@ -35,6 +36,15 @@
#define RTL8211E_EEE_LED_MODE1 0x05
#define RTL8211E_EEE_LED_MODE2 0x06
+/* RTL8211E extension page 44 */
+#define RTL8211E_LACR 0x1a
+#define RLT8211E_LACR_LEDACTCTRL_SHIFT 4
+#define RLT8211E_LACR_LEDACTCTRL_MASK GENMASK(6, 4)
+#define RTL8211E_LCR 0x1c
+#define RTL8211E_LCR_LEDCTRL_MASK (GENMASK(2, 0) | \
+ GENMASK(6, 4) | \
+ GENMASK(10, 8))
+
/* RTL8211E extension page 160 */
#define RTL8211E_SCR 0x1a
#define RTL8211E_SCR_DISABLE_RXC_SSC BIT(2)
@@ -124,6 +134,56 @@ static int rtl8211e_disable_eee_led_mode(struct phy_device *phydev)
return phy_restore_page(phydev, oldpage, ret);
}
+static int rtl8211e_config_leds(struct phy_device *phydev)
+{
+ struct device *dev = &phydev->mdio.dev;
+ int count, i, oldpage, ret;
+ u16 lacr_bits = 0, lcr_bits = 0;
+
+ if (!dev->of_node)
+ return 0;
+
+ if (of_property_read_bool(dev->of_node, "realtek,eee-led-mode-disable"))
+ rtl8211e_disable_eee_led_mode(phydev);
+
+ count = of_property_count_elems_of_size(dev->of_node,
+ "realtek,led-modes",
+ sizeof(u32));
+ if (count < 0 || count > 3)
+ return -EINVAL;
+
+ for (i = 0; i < count; i++) {
+ u32 val;
+
+ of_property_read_u32_index(dev->of_node,
+ "realtek,led-modes", i, &val);
+ lacr_bits |= (u16)(val >> 16) <<
+ (RLT8211E_LACR_LEDACTCTRL_SHIFT + i);
+ lcr_bits |= (u16)(val & 0xf) << (i * 4);
+ }
+
+ oldpage = rtl8211e_select_ext_page(phydev, 44);
+ if (oldpage < 0) {
+ dev_err(dev, "failed to select extended page: %d\n", oldpage);
+ goto err;
+ }
+
+ ret = __phy_modify(phydev, RTL8211E_LACR,
+ RLT8211E_LACR_LEDACTCTRL_MASK, lacr_bits);
+ if (ret) {
+ dev_err(dev, "failed to write LACR reg: %d\n", ret);
+ goto err;
+ }
+
+ ret = __phy_modify(phydev, RTL8211E_LCR,
+ RTL8211E_LCR_LEDCTRL_MASK, lcr_bits);
+ if (ret)
+ dev_err(dev, "failed to write LCR reg: %d\n", ret);
+
+err:
+ return phy_restore_page(phydev, oldpage, ret);
+}
+
static int rtl8211e_config_init(struct phy_device *phydev)
{
struct device *dev = &phydev->mdio.dev;
@@ -137,8 +197,7 @@ static int rtl8211e_config_init(struct phy_device *phydev)
dev_err(dev, "failed to enable SSC on RXC: %d\n", ret);
}
- if (of_property_read_bool(dev->of_node, "realtek,eee-led-mode-disable"))
- rtl8211e_disable_eee_led_mode(phydev);
+ rtl8211e_config_leds(phydev);
return 0;
}
--
2.22.0.410.gd8fdbe21b5-goog
next prev parent reply other threads:[~2019-07-03 19:37 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-03 19:37 [PATCH v2 1/7] dt-bindings: net: Add bindings for Realtek PHYs Matthias Kaehlcke
2019-07-03 19:37 ` [PATCH v2 2/7] net: phy: realtek: Allow disabling RTL8211E EEE LED mode Matthias Kaehlcke
2019-07-03 20:09 ` Heiner Kallweit
2019-07-03 20:32 ` Matthias Kaehlcke
2019-07-03 19:37 ` [PATCH v2 3/7] dt-bindings: net: realtek: Add property to enable SSC Matthias Kaehlcke
2019-07-03 19:37 ` [PATCH v2 4/7] net: phy: realtek: Enable accessing RTL8211E extension pages Matthias Kaehlcke
2019-07-03 20:12 ` Heiner Kallweit
2019-07-03 20:36 ` Matthias Kaehlcke
2019-07-03 21:01 ` Heiner Kallweit
2019-07-03 21:24 ` Matthias Kaehlcke
2019-07-03 21:27 ` Heiner Kallweit
2019-07-03 22:56 ` Matthias Kaehlcke
2019-07-03 19:37 ` [PATCH v2 5/7] net: phy: realtek: Support SSC for the RTL8211E Matthias Kaehlcke
2019-07-03 19:37 ` [PATCH v2 6/7] dt-bindings: net: realtek: Add property to configure LED mode Matthias Kaehlcke
2019-07-03 20:07 ` Andrew Lunn
2019-07-03 20:13 ` Heiner Kallweit
2019-07-03 20:22 ` Heiner Kallweit
2019-07-03 21:37 ` Florian Fainelli
2019-07-03 23:23 ` Matthias Kaehlcke
2019-07-10 15:55 ` Rob Herring
2019-07-10 16:28 ` Florian Fainelli
2019-07-12 17:28 ` Matthias Kaehlcke
2019-07-12 17:20 ` Matthias Kaehlcke
2019-07-22 17:14 ` Matthias Kaehlcke
2019-07-22 19:01 ` Andrew Lunn
2019-07-22 19:14 ` Matthias Kaehlcke
2019-07-22 19:38 ` Andrew Lunn
2019-07-03 19:37 ` Matthias Kaehlcke [this message]
2019-07-03 20:10 ` [PATCH v2 7/7] net: phy: realtek: configure RTL8211E LEDs Andrew Lunn
2019-07-03 20:43 ` Matthias Kaehlcke
2019-07-03 20:28 ` Heiner Kallweit
2019-07-03 20:45 ` Matthias Kaehlcke
2019-07-03 20:21 ` [PATCH v2 1/7] dt-bindings: net: Add bindings for Realtek PHYs David Miller
2019-07-03 21:11 ` Rob Herring
2019-07-03 21:33 ` Andrew Lunn
2019-07-03 22:08 ` Matthias Kaehlcke
2019-07-05 16:18 ` Rob Herring
2019-07-05 16:17 ` Rob Herring
2019-07-05 16:29 ` Andrew Lunn
2019-07-05 17:07 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190703193724.246854-7-mka@chromium.org \
--to=mka@chromium.org \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=netdev@vger.kernel.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®