Merge tag 'ftracetest-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[firefly-linux-kernel-4.4.55.git] / drivers / crypto / caam / intern.h

diff --git a/drivers/crypto/caam/intern.h b/drivers/crypto/caam/intern.h
index 97363db4e56ec17d82e1652e37fa3eaac5c8ee2d..89b94cc9e7a29b57654ad5931e9999be3d80e664 100644 (file)
--- a/drivers/crypto/caam/intern.h
+++ b/drivers/crypto/caam/intern.h
@@ -70,10 +70,11 @@ struct caam_drv_private {
        struct platform_device *pdev;
 
        /* Physical-presence section */
-       struct caam_ctrl *ctrl; /* controller region */
-       struct caam_deco **deco; /* DECO/CCB views */
-       struct caam_assurance *ac;
-       struct caam_queue_if *qi; /* QI control region */
+       struct caam_ctrl __iomem *ctrl; /* controller region */
+       struct caam_deco __iomem *deco; /* DECO/CCB views */
+       struct caam_assurance __iomem *assure;
+       struct caam_queue_if __iomem *qi; /* QI control region */
+       struct caam_job_ring __iomem *jr[4];    /* JobR's register space */
 
        /*
         * Detected geometry block. Filled in from device tree if powerpc,