@@ -26,6 +26,7 @@
#define MII_DP83867_MICR 0x12
#define MII_DP83867_ISR 0x13
#define DP83867_CFG2 0x14
+#define DP83867_LEDCR1 0x18
#define DP83867_CFG3 0x1e
#define DP83867_CTRL 0x1f
@@ -150,6 +151,10 @@
/* FLD_THR_CFG */
#define DP83867_FLD_THR_CFG_ENERGY_LOST_THR_MASK 0x7
+/* LED Configuration 1 bits */
+#define DP83867_LED_MODE_SHIFT 4
+#define DP83867_LED_MODE_MASK 0xf
+
enum {
DP83867_PORT_MIRROING_KEEP,
DP83867_PORT_MIRROING_EN,
@@ -167,6 +172,7 @@ struct dp83867_private {
bool set_clk_output;
u32 clk_output_sel;
bool sgmii_ref_clk_en;
+ int led_modes[4];
};
static int dp83867_ack_interrupt(struct phy_device *phydev)
@@ -573,7 +579,7 @@ static int dp83867_of_init(struct phy_device *phydev)
struct dp83867_private *dp83867 = phydev->priv;
struct device *dev = &phydev->mdio.dev;
struct device_node *of_node = dev->of_node;
- int ret;
+ int ret, led;
if (!of_node)
return -ENODEV;
@@ -658,6 +664,13 @@ static int dp83867_of_init(struct phy_device *phydev)
return -EINVAL;
}
+ if (of_property_read_u32_array(of_node, "ti,led-modes",
+ dp83867->led_modes,
+ ARRAY_SIZE(dp83867->led_modes))) {
+ for (led = 0; led < ARRAY_SIZE(dp83867->led_modes); led++)
+ dp83867->led_modes[led] = -EINVAL;
+ }
+
return 0;
}
#else
@@ -665,6 +678,7 @@ static int dp83867_of_init(struct phy_device *phydev)
{
struct dp83867_private *dp83867 = phydev->priv;
u16 delay;
+ int led;
/* For non-OF device, the RX and TX ID values are either strapped
* or take from default value. So, we init RX & TX ID values here
@@ -682,6 +696,10 @@ static int dp83867_of_init(struct phy_device *phydev)
*/
dp83867->io_impedance = DP83867_IO_MUX_CFG_IO_IMPEDANCE_MIN / 2;
+ /* LED mode unconfigured */
+ for (led = 0; led < ARRAY_SIZE(dp83867->led_modes); led++)
+ dp83867->led_modes[led] = -EINVAL;
+
return 0;
}
#endif /* CONFIG_OF_MDIO */
@@ -703,7 +721,7 @@ static int dp83867_probe(struct phy_device *phydev)
static int dp83867_config_init(struct phy_device *phydev)
{
struct dp83867_private *dp83867 = phydev->priv;
- int ret, val, bs;
+ int ret, val, bs, led;
u16 delay;
/* Force speed optimization for the PHY even if it strapped */
@@ -882,6 +900,16 @@ static int dp83867_config_init(struct phy_device *phydev)
mask, val);
}
+ /* LED Configuration */
+ val = phy_read(phydev, DP83867_LEDCR1);
+ for (led = 0; led < ARRAY_SIZE(dp83867->led_modes); led++) {
+ if (dp83867->led_modes[led] != -EINVAL) {
+ val &= ~(DP83867_LED_MODE_MASK << (DP83867_LED_MODE_SHIFT * led));
+ val |= (dp83867->led_modes[led] << (DP83867_LED_MODE_SHIFT * led));
+ }
+ }
+ phy_write(phydev, DP83867_LEDCR1, val);
+
return 0;
}
Add configuration of LED modes per device-tree property ti,led-modes. Signed-off-by: Tim Harvey <tharvey@gateworks.com> --- drivers/net/phy/dp83867.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)