Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[pandora-kernel.git] / arch / arm / mach-kirkwood / common.c
index 08847a6..f3248cf 100644 (file)
@@ -15,6 +15,7 @@
 #include <linux/mbus.h>
 #include <linux/ata_platform.h>
 #include <linux/mtd/nand.h>
+#include <linux/dma-mapping.h>
 #include <net/dsa.h>
 #include <asm/page.h>
 #include <asm/timex.h>
@@ -25,9 +26,7 @@
 #include <mach/bridge-regs.h>
 #include <plat/audio.h>
 #include <plat/cache-feroceon-l2.h>
-#include <plat/ehci-orion.h>
 #include <plat/mvsdio.h>
-#include <plat/mv_xor.h>
 #include <plat/orion_nand.h>
 #include <plat/common.h>
 #include <plat/time.h>
@@ -68,48 +67,14 @@ void __init kirkwood_map_io(void)
 unsigned int kirkwood_clk_ctrl = CGC_DUNIT | CGC_RESERVED;
 
 
-/*****************************************************************************
- * EHCI
- ****************************************************************************/
-static struct orion_ehci_data kirkwood_ehci_data = {
-       .dram           = &kirkwood_mbus_dram_info,
-       .phy_version    = EHCI_PHY_NA,
-};
-
-static u64 ehci_dmamask = DMA_BIT_MASK(32);
-
-
 /*****************************************************************************
  * EHCI0
  ****************************************************************************/
-static struct resource kirkwood_ehci_resources[] = {
-       {
-               .start  = USB_PHYS_BASE,
-               .end    = USB_PHYS_BASE + SZ_4K - 1,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .start  = IRQ_KIRKWOOD_USB,
-               .end    = IRQ_KIRKWOOD_USB,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device kirkwood_ehci = {
-       .name           = "orion-ehci",
-       .id             = 0,
-       .dev            = {
-               .dma_mask               = &ehci_dmamask,
-               .coherent_dma_mask      = DMA_BIT_MASK(32),
-               .platform_data          = &kirkwood_ehci_data,
-       },
-       .resource       = kirkwood_ehci_resources,
-       .num_resources  = ARRAY_SIZE(kirkwood_ehci_resources),
-};
-
 void __init kirkwood_ehci_init(void)
 {
        kirkwood_clk_ctrl |= CGC_USB0;
-       platform_device_register(&kirkwood_ehci);
+       orion_ehci_init(&kirkwood_mbus_dram_info,
+                       USB_PHYS_BASE, IRQ_KIRKWOOD_USB);
 }
 
 
@@ -207,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);
 }
 
 
@@ -329,245 +270,36 @@ 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);
 }
 
 
-/*****************************************************************************
- * XOR
- ****************************************************************************/
-static struct mv_xor_platform_shared_data kirkwood_xor_shared_data = {
-       .dram           = &kirkwood_mbus_dram_info,
-};
-
-
 /*****************************************************************************
  * XOR0
  ****************************************************************************/
-static struct resource kirkwood_xor0_shared_resources[] = {
-       {
-               .name   = "xor 0 low",
-               .start  = XOR0_PHYS_BASE,
-               .end    = XOR0_PHYS_BASE + 0xff,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .name   = "xor 0 high",
-               .start  = XOR0_HIGH_PHYS_BASE,
-               .end    = XOR0_HIGH_PHYS_BASE + 0xff,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-static struct platform_device kirkwood_xor0_shared = {
-       .name           = MV_XOR_SHARED_NAME,
-       .id             = 0,
-       .dev            = {
-               .platform_data = &kirkwood_xor_shared_data,
-       },
-       .num_resources  = ARRAY_SIZE(kirkwood_xor0_shared_resources),
-       .resource       = kirkwood_xor0_shared_resources,
-};
-
-static u64 kirkwood_xor_dmamask = DMA_BIT_MASK(32);
-
-static struct resource kirkwood_xor00_resources[] = {
-       [0] = {
-               .start  = IRQ_KIRKWOOD_XOR_00,
-               .end    = IRQ_KIRKWOOD_XOR_00,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct mv_xor_platform_data kirkwood_xor00_data = {
-       .shared         = &kirkwood_xor0_shared,
-       .hw_id          = 0,
-       .pool_size      = PAGE_SIZE,
-};
-
-static struct platform_device kirkwood_xor00_channel = {
-       .name           = MV_XOR_NAME,
-       .id             = 0,
-       .num_resources  = ARRAY_SIZE(kirkwood_xor00_resources),
-       .resource       = kirkwood_xor00_resources,
-       .dev            = {
-               .dma_mask               = &kirkwood_xor_dmamask,
-               .coherent_dma_mask      = DMA_BIT_MASK(64),
-               .platform_data          = &kirkwood_xor00_data,
-       },
-};
-
-static struct resource kirkwood_xor01_resources[] = {
-       [0] = {
-               .start  = IRQ_KIRKWOOD_XOR_01,
-               .end    = IRQ_KIRKWOOD_XOR_01,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct mv_xor_platform_data kirkwood_xor01_data = {
-       .shared         = &kirkwood_xor0_shared,
-       .hw_id          = 1,
-       .pool_size      = PAGE_SIZE,
-};
-
-static struct platform_device kirkwood_xor01_channel = {
-       .name           = MV_XOR_NAME,
-       .id             = 1,
-       .num_resources  = ARRAY_SIZE(kirkwood_xor01_resources),
-       .resource       = kirkwood_xor01_resources,
-       .dev            = {
-               .dma_mask               = &kirkwood_xor_dmamask,
-               .coherent_dma_mask      = DMA_BIT_MASK(64),
-               .platform_data          = &kirkwood_xor01_data,
-       },
-};
-
 static void __init kirkwood_xor0_init(void)
 {
        kirkwood_clk_ctrl |= CGC_XOR0;
-       platform_device_register(&kirkwood_xor0_shared);
 
-       /*
-        * two engines can't do memset simultaneously, this limitation
-        * satisfied by removing memset support from one of the engines.
-        */
-       dma_cap_set(DMA_MEMCPY, kirkwood_xor00_data.cap_mask);
-       dma_cap_set(DMA_XOR, kirkwood_xor00_data.cap_mask);
-       platform_device_register(&kirkwood_xor00_channel);
-
-       dma_cap_set(DMA_MEMCPY, kirkwood_xor01_data.cap_mask);
-       dma_cap_set(DMA_MEMSET, kirkwood_xor01_data.cap_mask);
-       dma_cap_set(DMA_XOR, kirkwood_xor01_data.cap_mask);
-       platform_device_register(&kirkwood_xor01_channel);
+       orion_xor0_init(&kirkwood_mbus_dram_info,
+                       XOR0_PHYS_BASE, XOR0_HIGH_PHYS_BASE,
+                       IRQ_KIRKWOOD_XOR_00, IRQ_KIRKWOOD_XOR_01);
 }
 
 
 /*****************************************************************************
  * XOR1
  ****************************************************************************/
-static struct resource kirkwood_xor1_shared_resources[] = {
-       {
-               .name   = "xor 1 low",
-               .start  = XOR1_PHYS_BASE,
-               .end    = XOR1_PHYS_BASE + 0xff,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .name   = "xor 1 high",
-               .start  = XOR1_HIGH_PHYS_BASE,
-               .end    = XOR1_HIGH_PHYS_BASE + 0xff,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-static struct platform_device kirkwood_xor1_shared = {
-       .name           = MV_XOR_SHARED_NAME,
-       .id             = 1,
-       .dev            = {
-               .platform_data = &kirkwood_xor_shared_data,
-       },
-       .num_resources  = ARRAY_SIZE(kirkwood_xor1_shared_resources),
-       .resource       = kirkwood_xor1_shared_resources,
-};
-
-static struct resource kirkwood_xor10_resources[] = {
-       [0] = {
-               .start  = IRQ_KIRKWOOD_XOR_10,
-               .end    = IRQ_KIRKWOOD_XOR_10,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct mv_xor_platform_data kirkwood_xor10_data = {
-       .shared         = &kirkwood_xor1_shared,
-       .hw_id          = 0,
-       .pool_size      = PAGE_SIZE,
-};
-
-static struct platform_device kirkwood_xor10_channel = {
-       .name           = MV_XOR_NAME,
-       .id             = 2,
-       .num_resources  = ARRAY_SIZE(kirkwood_xor10_resources),
-       .resource       = kirkwood_xor10_resources,
-       .dev            = {
-               .dma_mask               = &kirkwood_xor_dmamask,
-               .coherent_dma_mask      = DMA_BIT_MASK(64),
-               .platform_data          = &kirkwood_xor10_data,
-       },
-};
-
-static struct resource kirkwood_xor11_resources[] = {
-       [0] = {
-               .start  = IRQ_KIRKWOOD_XOR_11,
-               .end    = IRQ_KIRKWOOD_XOR_11,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct mv_xor_platform_data kirkwood_xor11_data = {
-       .shared         = &kirkwood_xor1_shared,
-       .hw_id          = 1,
-       .pool_size      = PAGE_SIZE,
-};
-
-static struct platform_device kirkwood_xor11_channel = {
-       .name           = MV_XOR_NAME,
-       .id             = 3,
-       .num_resources  = ARRAY_SIZE(kirkwood_xor11_resources),
-       .resource       = kirkwood_xor11_resources,
-       .dev            = {
-               .dma_mask               = &kirkwood_xor_dmamask,
-               .coherent_dma_mask      = DMA_BIT_MASK(64),
-               .platform_data          = &kirkwood_xor11_data,
-       },
-};
-
 static void __init kirkwood_xor1_init(void)
 {
        kirkwood_clk_ctrl |= CGC_XOR1;
-       platform_device_register(&kirkwood_xor1_shared);
 
-       /*
-        * two engines can't do memset simultaneously, this limitation
-        * satisfied by removing memset support from one of the engines.
-        */
-       dma_cap_set(DMA_MEMCPY, kirkwood_xor10_data.cap_mask);
-       dma_cap_set(DMA_XOR, kirkwood_xor10_data.cap_mask);
-       platform_device_register(&kirkwood_xor10_channel);
-
-       dma_cap_set(DMA_MEMCPY, kirkwood_xor11_data.cap_mask);
-       dma_cap_set(DMA_MEMSET, kirkwood_xor11_data.cap_mask);
-       dma_cap_set(DMA_XOR, kirkwood_xor11_data.cap_mask);
-       platform_device_register(&kirkwood_xor11_channel);
+       orion_xor1_init(XOR1_PHYS_BASE, XOR1_HIGH_PHYS_BASE,
+                       IRQ_KIRKWOOD_XOR_10, IRQ_KIRKWOOD_XOR_11);
 }