3771176c9e
The following patches are dropped because they are merged upstream: -0001-tty-serial-drop-QCA-pecific-SoC-symbols.patch -0006-usb-drop-deprecated-symbols.patch -0009-MIPS-ath79-add-lots-of-missing-registers.patch -0010-MIPS-ath79-add-support-for-QCA953x-QCA956x-TP9343.patch -0014-MIPS-ath79-finetune-cpu-overrides.patch -0015-MIPS-ath79-enable-uart-during-early_prink.patch -0016-MIPS-ath79-get-PCIe-controller-out-of-reset.patch This patch is dropped due to the introduction of spi-mem framework: -461-spi-ath79-add-fast-flash-read.patch Thank to Michael Marley @mamarley for his work on this patch: -910-unaligned_access_hacks.patch Signed-off-by: Chuanhong Guo <gch981213@gmail.com> [synchronized kernel config with make kernel_oldconfig] Signed-off-by: Petr Štetiar <ynezz@true.cz>
22 lines
748 B
Diff
22 lines
748 B
Diff
commit f3ffac90bc7266b7d917616f3233f58e8c08a196
|
|
Author: Christian Lamparter <chunkeey@gmail.com>
|
|
Date: Fri Aug 10 23:24:47 2018 +0200
|
|
|
|
ath79: gmac: add parsers for rxd(v)- and tx(d|en)-delay for AR9344
|
|
|
|
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
|
|
|
|
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
|
|
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
|
|
@@ -1229,6 +1229,10 @@
|
|
#define AR934X_ETH_CFG_RDV_DELAY BIT(16)
|
|
#define AR934X_ETH_CFG_RDV_DELAY_MASK 0x3
|
|
#define AR934X_ETH_CFG_RDV_DELAY_SHIFT 16
|
|
+#define AR934X_ETH_CFG_TXD_DELAY_MASK 0x3
|
|
+#define AR934X_ETH_CFG_TXD_DELAY_SHIFT 18
|
|
+#define AR934X_ETH_CFG_TXE_DELAY_MASK 0x3
|
|
+#define AR934X_ETH_CFG_TXE_DELAY_SHIFT 20
|
|
|
|
/*
|
|
* QCA953X GMAC Interface
|