Skip to content

Commit 8914ad3

Browse files
committed
deepin: net: macb: use new bit for MACB_CAPS_SEL_CLK
deepin inclusion category: bugfix Use 0x1000 instead of 0x0800 for MACB_CAPS_SEL_CLK, 0x800 is used by MACB_CAPS_QUEUE_DISABLE, which commit 2fd0bdd49e57 ("net: macb: queue tie-off or disable during WOL suspend") upstream. Other, in linux-6.6.y not any config assign MACB_CAPS_QUEUE_DISABLE which is assign in commit 3650a8c ("net: macb: Enable queue disable upstream"). Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 00f1374 commit 8914ad3

File tree

1 file changed

+1
-2
lines changed
  • drivers/net/ethernet/cadence

1 file changed

+1
-2
lines changed

drivers/net/ethernet/cadence/macb.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -770,11 +770,10 @@
770770
#define MACB_CAPS_GEM_HAS_PTP 0x00000040
771771
#define MACB_CAPS_BD_RD_PREFETCH 0x00000080
772772
#define MACB_CAPS_NEEDS_RSTONUBR 0x00000100
773-
#define MACB_CAPS_SEL_CLK 0x00000800
774773
#define MACB_CAPS_MIIONRGMII 0x00000200
775774
#define MACB_CAPS_NEED_TSUCLK 0x00000400
776-
#define MACB_CAPS_SEL_CLK 0x00000800
777775
#define MACB_CAPS_QUEUE_DISABLE 0x00000800
776+
#define MACB_CAPS_SEL_CLK 0x00001000
778777
#define MACB_CAPS_PCS 0x01000000
779778
#define MACB_CAPS_HIGH_SPEED 0x02000000
780779
#define MACB_CAPS_CLK_HW_CHG 0x04000000

0 commit comments

Comments
 (0)