1 files changed, 6 insertions, 8 deletions

diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index 827c9f2a70fb..f0bf68268ca2 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -18,7 +18,7 @@
 #include <linux/platform_device.h>
 #include <linux/i2c-gpio.h>
 #include <linux/atmel-mci.h>
-#include <linux/platform_data/atmel-aes.h>
+#include <linux/platform_data/crypto-atmel.h>
 
 #include <linux/platform_data/at91_adc.h>
 
@@ -1900,7 +1900,8 @@ static void __init at91_add_device_tdes(void) {}
  * -------------------------------------------------------------------- */
 
 #if defined(CONFIG_CRYPTO_DEV_ATMEL_AES) || defined(CONFIG_CRYPTO_DEV_ATMEL_AES_MODULE)
-static struct aes_platform_data aes_data;
+static struct crypto_platform_data aes_data;
+static struct crypto_dma_data alt_atslave;
 static u64 aes_dmamask = DMA_BIT_MASK(32);
 
 static struct resource aes_resources[] = {
@@ -1931,23 +1932,20 @@ static struct platform_device at91sam9g45_aes_device = {
 static void __init at91_add_device_aes(void)
 {
         struct at_dma_slave     *atslave;
-        struct aes_dma_data     *alt_atslave;
-
-        alt_atslave = kzalloc(sizeof(struct aes_dma_data), GFP_KERNEL);
 
         /* DMA TX slave channel configuration */
-        atslave = &alt_atslave->txdata;
+        atslave = &alt_atslave.txdata;
         atslave->dma_dev = &at_hdmac_device.dev;
         atslave->cfg = ATC_FIFOCFG_ENOUGHSPACE  | ATC_SRC_H2SEL_HW |
                                                 ATC_SRC_PER(AT_DMA_ID_AES_RX);
 
         /* DMA RX slave channel configuration */
-        atslave = &alt_atslave->rxdata;
+        atslave = &alt_atslave.rxdata;
         atslave->dma_dev = &at_hdmac_device.dev;
         atslave->cfg = ATC_FIFOCFG_ENOUGHSPACE  | ATC_DST_H2SEL_HW |
                                                 ATC_DST_PER(AT_DMA_ID_AES_TX);
 
-        aes_data.dma_slave = alt_atslave;
+        aes_data.dma_slave = &alt_atslave;
         platform_device_register(&at91sam9g45_aes_device);
 }
 #else