diff options
author | Felix Fietkau <nbd@nbd.name> | 2017-01-27 14:32:10 +0100 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2017-02-04 20:28:14 +0100 |
commit | f791fb4af45032a653ba7c850f4564923871cb16 (patch) | |
tree | c1fc4e564c8e27faad582e5b55a9ce91816a241c /target/linux/generic/patches-4.9/075-v4.10-0001-net-phy-broadcom-Update-Auxiliary-Control-Register-m.patch | |
parent | 7d00cfe9bb693e376ac9d035e13f8ce8a5ff572c (diff) | |
download | upstream-f791fb4af45032a653ba7c850f4564923871cb16.tar.gz upstream-f791fb4af45032a653ba7c850f4564923871cb16.tar.bz2 upstream-f791fb4af45032a653ba7c850f4564923871cb16.zip |
kernel: add linux 4.9 support
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Tim Harvey <tharvey@gateworks.com> [fixes]
Diffstat (limited to 'target/linux/generic/patches-4.9/075-v4.10-0001-net-phy-broadcom-Update-Auxiliary-Control-Register-m.patch')
-rw-r--r-- | target/linux/generic/patches-4.9/075-v4.10-0001-net-phy-broadcom-Update-Auxiliary-Control-Register-m.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.9/075-v4.10-0001-net-phy-broadcom-Update-Auxiliary-Control-Register-m.patch b/target/linux/generic/patches-4.9/075-v4.10-0001-net-phy-broadcom-Update-Auxiliary-Control-Register-m.patch new file mode 100644 index 0000000000..9279a7c84c --- /dev/null +++ b/target/linux/generic/patches-4.9/075-v4.10-0001-net-phy-broadcom-Update-Auxiliary-Control-Register-m.patch @@ -0,0 +1,34 @@ +From: Xo Wang <xow@google.com> +Date: Fri, 21 Oct 2016 10:20:12 -0700 +Subject: [PATCH] net: phy: broadcom: Update Auxiliary Control Register macros + +Add the RXD-to-RXC skew (delay) time bit in the Miscellaneous Control +shadow register and a mask for the shadow selector field. + +Remove a re-definition of MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL. + +Signed-off-by: Xo Wang <xow@google.com> +Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> +Reviewed-by: Joel Stanley <joel@jms.id.au> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + +--- a/include/linux/brcmphy.h ++++ b/include/linux/brcmphy.h +@@ -101,6 +101,7 @@ + * AUXILIARY CONTROL SHADOW ACCESS REGISTERS. (PHY REG 0x18) + */ + #define MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL 0x0000 ++#define MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW 0x0100 + #define MII_BCM54XX_AUXCTL_ACTL_TX_6DB 0x0400 + #define MII_BCM54XX_AUXCTL_ACTL_SMDSP_ENA 0x0800 + +@@ -109,7 +110,7 @@ + #define MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC 0x7000 + #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC 0x0007 + +-#define MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL 0x0000 ++#define MII_BCM54XX_AUXCTL_SHDWSEL_MASK 0x0007 + + /* + * Broadcom LED source encodings. These are used in BCM5461, BCM5481, |