diff options
author | Herbert Xu | 2017-04-05 15:57:07 +0200 |
---|---|---|
committer | Herbert Xu | 2017-04-05 15:57:07 +0200 |
commit | c6dc0609062c6110d04c54e24b81b503eeadb2c8 (patch) | |
tree | c8441197c74e9df8407a00eff2433540924ca5ce /drivers/crypto/ccp/ccp-dev.h | |
parent | crypto: ixp4xx - Use sg_virt() (diff) | |
parent | crypto: caam - fix RNG deinstantiation error checking (diff) | |
download | kernel-qcow2-linux-c6dc0609062c6110d04c54e24b81b503eeadb2c8.tar.gz kernel-qcow2-linux-c6dc0609062c6110d04c54e24b81b503eeadb2c8.tar.xz kernel-qcow2-linux-c6dc0609062c6110d04c54e24b81b503eeadb2c8.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to resolve conflict between caam changes.
Diffstat (limited to 'drivers/crypto/ccp/ccp-dev.h')
-rw-r--r-- | drivers/crypto/ccp/ccp-dev.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/crypto/ccp/ccp-dev.h b/drivers/crypto/ccp/ccp-dev.h index 754e9c2f6ee3..3a45c2af2fbd 100644 --- a/drivers/crypto/ccp/ccp-dev.h +++ b/drivers/crypto/ccp/ccp-dev.h @@ -179,6 +179,10 @@ /* ------------------------ General CCP Defines ------------------------ */ +#define CCP_DMA_DFLT 0x0 +#define CCP_DMA_PRIV 0x1 +#define CCP_DMA_PUB 0x2 + #define CCP_DMAPOOL_MAX_SIZE 64 #define CCP_DMAPOOL_ALIGN BIT(5) @@ -646,6 +650,7 @@ struct ccp_actions { /* Structure to hold CCP version-specific values */ struct ccp_vdata { const unsigned int version; + const unsigned int dma_chan_attr; void (*setup)(struct ccp_device *); const struct ccp_actions *perform; const unsigned int bar; |