74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
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,
|