brcm2708: update to latest patches from RPi foundation

[openwrt/staging/dedeckeh.git] / target / linux / brcm2708 / patches-4.19 / 950-0473-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch

diff --git a/target/linux/brcm2708/patches-4.19/950-0473-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch b/target/linux/brcm2708/patches-4.19/950-0473-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch
new file mode 100644 (file)
index 0000000..15af5a7
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.19/950-0473-phy-bcm54213pe-configure-the-LED-outputs-to-be-more-.patch
@@ -0,0 +1,64 @@
+From dc2550fdfd0a46c3ec67e5003b3d69c29141406b Mon Sep 17 00:00:00 2001
+From: Jonathan Bell <jonathan@raspberrypi.org>
+Date: Fri, 17 May 2019 13:31:21 +0100
+Subject: [PATCH] phy: bcm54213pe: configure the LED outputs to be more
+ user-friendly
+
+The default state was both LEDs indicating link speed.
+
+Change the default configuration to
+- Amber: 1000/100 link speed indication
+- Green: link present + activity indication
+
+Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
+---
+ drivers/net/phy/broadcom.c | 17 +++++++++++++++++
+ include/linux/brcmphy.h    |  4 ++++
+ 2 files changed, 21 insertions(+)
+
+--- a/drivers/net/phy/broadcom.c
++++ b/drivers/net/phy/broadcom.c
+@@ -52,6 +52,21 @@ static int bcm54210e_config_init(struct
+       return 0;
+ }
+ 
++static void bcm54213pe_config_init(struct phy_device *phydev)
++{
++      u16 val;
++
++      /* Enable ACT+LINK indication on ACTIVITY trigger */
++      val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_LEDCTL);
++      val |= BCM54XX_SHD_LEDCTL_ACTLINK_EN;
++      bcm_phy_write_shadow(phydev, BCM54XX_SHD_LEDCTL, val);
++
++      /* Set ACTIVITY on LED "1" output, LINKSPD[1] on LED "3" output */
++      val = BCM5482_SHD_LEDS1_LED1(BCM_LED_SRC_ACTIVITYLED) |
++              BCM5482_SHD_LEDS1_LED3(BCM_LED_SRC_LINKSPD1);
++      bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val);
++}
++
+ static int bcm54612e_config_init(struct phy_device *phydev)
+ {
+       int reg;
+@@ -310,6 +325,8 @@ static int bcm54xx_config_init(struct ph
+               err = bcm54210e_config_init(phydev);
+               if (err)
+                       return err;
++      } else if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54213PE) {
++              bcm54213pe_config_init(phydev);
+       } else if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54612E) {
+               err = bcm54612e_config_init(phydev);
+               if (err)
+--- a/include/linux/brcmphy.h
++++ b/include/linux/brcmphy.h
+@@ -168,6 +168,10 @@
+ #define  BCM54XX_SHD_SCR3_DLLAPD_DIS  0x0002
+ #define  BCM54XX_SHD_SCR3_TRDDAPD     0x0004
+ 
++/* 01001: Additional LED trigger options */
++#define BCM54XX_SHD_LEDCTL            0x09
++#define  BCM54XX_SHD_LEDCTL_ACTLINK_EN        0x0010
++
+ /* 01010: Auto Power-Down */
+ #define BCM54XX_SHD_APD                       0x0a
+ #define  BCM_APD_CLR_MASK             0xFE9F /* clear bits 5, 6 & 8 */