ENGR00180943-6: Place CAAM Job Ring resources in their own struct

Place CAAM Job Ring resources in their own struct,
and treat as array to the limit of instantiable rings.

Signed-off-by: Steve Cornelius <steve.cornelius@freescale.com>

diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h
index 4ae60dc9e86fd7a83d36d2f9d4a4ca12dd8a38c1..0bd80b99297d2f3e09a8ea95f0c88fbaea1ffbc0 100755 (executable)
--- a/arch/arm/plat-mxc/include/mach/devices-common.h
+++ b/arch/arm/plat-mxc/include/mach/devices-common.h
@@ -104,14 +104,16 @@ struct imx_snvs_rtc_data {
 struct platform_device *__init imx_add_snvs_rtc(
                const struct imx_snvs_rtc_data *data);
 
+struct imx_caam_jr_data {
+       resource_size_t offset_jr;
+       resource_size_t irq_jr;
+};
+
 struct imx_caam_data {
        resource_size_t iobase_caam;
        resource_size_t irq_sec_vio;
        resource_size_t irq_snvs;
-       resource_size_t irq_jr0;
-       resource_size_t irq_jr1;
-       resource_size_t irq_jr2;
-       resource_size_t irq_jr3;
+       struct imx_caam_jr_data jr[4];  /* offset+IRQ for each possible ring */
 };
 
 struct platform_device *__init imx_add_caam(