Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / drivers / crypto / fsl / jr.h

diff --git a/drivers/crypto/fsl/jr.h b/drivers/crypto/fsl/jr.h
index 152606008845aa2e327713c53b01d51d2587aa25..545d964cedd5b8c2a7969a29a00df12f577a41b0 100644 (file)
--- a/drivers/crypto/fsl/jr.h
+++ b/drivers/crypto/fsl/jr.h
@@ -37,14 +37,13 @@
 #define JQ_ENQ_ERR             -3
 
 struct op_ring {
-       dma_addr_t desc;
+       phys_addr_t desc;
        uint32_t status;
 } __packed;
 
 struct jr_info {
-       void (*callback)(dma_addr_t desc, uint32_t status, void *arg);
-       dma_addr_t desc_phys_addr;
-       uint32_t desc_addr;
+       void (*callback)(uint32_t status, void *arg);
+       phys_addr_t desc_phys_addr;
        uint32_t desc_len;
        uint32_t op_done;
        void *arg;
@@ -73,6 +72,8 @@ struct jobring {
        int write_idx;
        /* Size of the rings. */
        int size;
+       /* Op ring size aligned to cache line size */
+       int op_size;
        /* The ip and output rings have to be accessed by SEC. So the
         * pointers will ahve to point to the housekeeping region provided
         * by SEC