diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-08 05:03:51 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-08 05:03:51 +0300 |
| commit | 82e4869da38069232b62013b2f77c9d73fc97147 (patch) | |
| tree | 8deb80e3036abea22fa5dac353a634931215ff5e /include/linux | |
| parent | b14ad90c9926d841b0478107ae25fa9fb46936d2 (diff) | |
| parent | b361da837392e7fc13189f223b12385de728be12 (diff) | |
| download | linux-82e4869da38069232b62013b2f77c9d73fc97147.tar.xz | |
Merge branch 'netcp-next'
Murali Karicheri says:
====================
netcp: enhancements and minor fixes
This series is for net-next. This propagates enhancements and minor
bug fixes from internal version of the driver to keep the upstream
in sync. Please review and apply if this looks good.
Tested on all of K2HK/E/L boards with nfs rootfs.
Test logs below
K2HK-EVM: http://pastebin.ubuntu.com/23754106/
k2L-EVM: http://pastebin.ubuntu.com/23754143/
K2E-EVM: http://pastebin.ubuntu.com/23754159/
History:
v1 - dropped 1/10 amd 2/10 of v0 based on comments from Rob as
it needs more work before submission
v0 - Initial version
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/soc/ti/knav_dma.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/soc/ti/knav_dma.h b/include/linux/soc/ti/knav_dma.h index 35cb9264e0d5..2b7882666ef6 100644 --- a/include/linux/soc/ti/knav_dma.h +++ b/include/linux/soc/ti/knav_dma.h @@ -41,6 +41,8 @@ #define KNAV_DMA_DESC_RETQ_SHIFT 0 #define KNAV_DMA_DESC_RETQ_MASK MASK(14) #define KNAV_DMA_DESC_BUF_LEN_MASK MASK(22) +#define KNAV_DMA_DESC_EFLAGS_MASK MASK(4) +#define KNAV_DMA_DESC_EFLAGS_SHIFT 20 #define KNAV_DMA_NUM_EPIB_WORDS 4 #define KNAV_DMA_NUM_PS_WORDS 16 |