Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / arch / arm / mach-kirkwood / common.c

diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 9e56cbb..f3248cf 100644 (file)
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -172,38 +172,14 @@ static void __init kirkwood_rtc_init(void)
 /*****************************************************************************
  * SATA
  ****************************************************************************/
-static struct resource kirkwood_sata_resources[] = {
-       {
-               .name   = "sata base",
-               .start  = SATA_PHYS_BASE,
-               .end    = SATA_PHYS_BASE + 0x5000 - 1,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .name   = "sata irq",
-               .start  = IRQ_KIRKWOOD_SATA,
-               .end    = IRQ_KIRKWOOD_SATA,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device kirkwood_sata = {
-       .name           = "sata_mv",
-       .id             = 0,
-       .dev            = {
-               .coherent_dma_mask      = DMA_BIT_MASK(32),
-       },
-       .num_resources  = ARRAY_SIZE(kirkwood_sata_resources),
-       .resource       = kirkwood_sata_resources,
-};
-
 void __init kirkwood_sata_init(struct mv_sata_platform_data *sata_data)
 {
        kirkwood_clk_ctrl |= CGC_SATA0;
        if (sata_data->n_ports > 1)
                kirkwood_clk_ctrl |= CGC_SATA1;
-       sata_data->dram = &kirkwood_mbus_dram_info;
-       kirkwood_sata.dev.platform_data = sata_data;
-       platform_device_register(&kirkwood_sata);
+
+       orion_sata_init(sata_data, &kirkwood_mbus_dram_info,
+                       SATA_PHYS_BASE, IRQ_KIRKWOOD_SATA);
 }
 
 
@@ -294,37 +270,11 @@ void __init kirkwood_uart1_init(void)
 /*****************************************************************************
  * Cryptographic Engines and Security Accelerator (CESA)
  ****************************************************************************/
-
-static struct resource kirkwood_crypto_res[] = {
-       {
-               .name   = "regs",
-               .start  = CRYPTO_PHYS_BASE,
-               .end    = CRYPTO_PHYS_BASE + 0xffff,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .name   = "sram",
-               .start  = KIRKWOOD_SRAM_PHYS_BASE,
-               .end    = KIRKWOOD_SRAM_PHYS_BASE + KIRKWOOD_SRAM_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .name   = "crypto interrupt",
-               .start  = IRQ_KIRKWOOD_CRYPTO,
-               .end    = IRQ_KIRKWOOD_CRYPTO,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device kirkwood_crypto_device = {
-       .name           = "mv_crypto",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(kirkwood_crypto_res),
-       .resource       = kirkwood_crypto_res,
-};
-
 void __init kirkwood_crypto_init(void)
 {
        kirkwood_clk_ctrl |= CGC_CRYPTO;
-       platform_device_register(&kirkwood_crypto_device);
+       orion_crypto_init(CRYPTO_PHYS_BASE, KIRKWOOD_SRAM_PHYS_BASE,
+                         KIRKWOOD_SRAM_SIZE, IRQ_KIRKWOOD_CRYPTO);
 }