Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[~andy/linux] / arch / arm / mach-at91 / at91sam9g45.c

diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index 977127368a7dbd10d3785d4383840be2b72f840d..ef6cedd52e3c2e71fdfb6dd8e68158b8ef622420 100644 (file)
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -183,6 +183,13 @@ static struct clk adc_op_clk = {
        .rate_hz        = 13200000,
 };
 
+/* AES/TDES/SHA clock - Only for sam9m11/sam9g56 */
+static struct clk aestdessha_clk = {
+       .name           = "aestdessha_clk",
+       .pmc_mask       = 1 << AT91SAM9G45_ID_AESTDESSHA,
+       .type           = CLK_TYPE_PERIPHERAL,
+};
+
 static struct clk *periph_clocks[] __initdata = {
        &pioA_clk,
        &pioB_clk,
@@ -212,6 +219,7 @@ static struct clk *periph_clocks[] __initdata = {
        &udphs_clk,
        &mmc1_clk,
        &adc_op_clk,
+       &aestdessha_clk,
        // irq0
 };
 
@@ -232,6 +240,9 @@ static struct clk_lookup periph_clocks_lookups[] = {
        CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
        CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
        CLKDEV_CON_DEV_ID(NULL, "atmel-trng", &trng_clk),
+       CLKDEV_CON_DEV_ID(NULL, "atmel_sha", &aestdessha_clk),
+       CLKDEV_CON_DEV_ID(NULL, "atmel_tdes", &aestdessha_clk),
+       CLKDEV_CON_DEV_ID(NULL, "atmel_aes", &aestdessha_clk),
        /* more usart lookup table for DT entries */
        CLKDEV_CON_DEV_ID("usart", "ffffee00.serial", &mck),
        CLKDEV_CON_DEV_ID("usart", "fff8c000.serial", &usart0_clk),
@@ -388,7 +399,7 @@ static unsigned int at91sam9g45_default_irq_priority[NR_AIC_IRQS] __initdata = {
        3,      /* Ethernet */
        0,      /* Image Sensor Interface */
        2,      /* USB Device High speed port */
-       0,
+       0,      /* AESTDESSHA Crypto HW Accelerators */
        0,      /* Multimedia Card Interface 1 */
        0,
        0,      /* Advanced Interrupt Controller (IRQ0) */