Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 344263
b: refs/heads/master
c: dd2c57b
h: refs/heads/master
i:
  344261: b4e920c
  344259: 1a2ea52
  344255: 67f3fc5
v: v3
  • Loading branch information
Thomas Petazzoni committed Nov 20, 2012
1 parent 3e6f453 commit 6a8f2db
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 53 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: af19e148be5e2d7acf2d6322cce74e85be87d603
refs/heads/master: dd2c57b822bc0fc999f95c57933e4c597e765b0a
94 changes: 42 additions & 52 deletions trunk/arch/arm/plat-orion/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -715,61 +715,43 @@ static struct resource orion_xor1_shared_resources[] = {
}, {
.name = "xor 1 high",
.flags = IORESOURCE_MEM,
}, {
.name = "irq channel 0",
.flags = IORESOURCE_IRQ,
}, {
.name = "irq channel 1",
.flags = IORESOURCE_IRQ,
},
};

static struct platform_device orion_xor1_shared = {
.name = MV_XOR_SHARED_NAME,
.id = 1,
.num_resources = ARRAY_SIZE(orion_xor1_shared_resources),
.resource = orion_xor1_shared_resources,
};

static struct resource orion_xor10_resources[] = {
[0] = {
.flags = IORESOURCE_IRQ,
},
};

static struct mv_xor_platform_data orion_xor10_data = {
.shared = &orion_xor1_shared,
.hw_id = 0,
.pool_size = PAGE_SIZE,
};
static struct platform_device orion_xor1_shared;

static struct platform_device orion_xor10_channel = {
.name = MV_XOR_NAME,
.id = 2,
.num_resources = ARRAY_SIZE(orion_xor10_resources),
.resource = orion_xor10_resources,
.dev = {
.dma_mask = &orion_xor_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(64),
.platform_data = &orion_xor10_data,
static struct mv_xor_platform_data orion_xor1_channels_pdata[2] = {
{
.shared = &orion_xor1_shared,
.hw_id = 0,
.pool_size = PAGE_SIZE,
},
};

static struct resource orion_xor11_resources[] = {
[0] = {
.flags = IORESOURCE_IRQ,
{
.shared = &orion_xor1_shared,
.hw_id = 1,
.pool_size = PAGE_SIZE,
},
};

static struct mv_xor_platform_data orion_xor11_data = {
.shared = &orion_xor1_shared,
.hw_id = 1,
.pool_size = PAGE_SIZE,
static struct mv_xor_shared_platform_data orion_xor1_pdata = {
.channels = orion_xor1_channels_pdata,
};

static struct platform_device orion_xor11_channel = {
.name = MV_XOR_NAME,
.id = 3,
.num_resources = ARRAY_SIZE(orion_xor11_resources),
.resource = orion_xor11_resources,
.dev = {
.dma_mask = &orion_xor_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(64),
.platform_data = &orion_xor11_data,
static struct platform_device orion_xor1_shared = {
.name = MV_XOR_SHARED_NAME,
.id = 1,
.num_resources = ARRAY_SIZE(orion_xor1_shared_resources),
.resource = orion_xor1_shared_resources,
.dev = {
.dma_mask = &orion_xor_dmamask,
.coherent_dma_mask = DMA_BIT_MASK(64),
.platform_data = &orion_xor1_pdata,
},
};

Expand All @@ -783,15 +765,23 @@ void __init orion_xor1_init(unsigned long mapbase_low,
orion_xor1_shared_resources[1].start = mapbase_high;
orion_xor1_shared_resources[1].end = mapbase_high + 0xff;

orion_xor10_resources[0].start = irq_0;
orion_xor10_resources[0].end = irq_0;
orion_xor11_resources[0].start = irq_1;
orion_xor11_resources[0].end = irq_1;
orion_xor1_shared_resources[2].start = irq_0;
orion_xor1_shared_resources[2].end = irq_0;
orion_xor1_shared_resources[3].start = irq_1;
orion_xor1_shared_resources[3].end = irq_1;

platform_device_register(&orion_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, orion_xor1_channels_pdata[0].cap_mask);
dma_cap_set(DMA_XOR, orion_xor1_channels_pdata[0].cap_mask);

orion_xor_init_channels(&orion_xor10_data, &orion_xor10_channel,
&orion_xor11_data, &orion_xor11_channel);
dma_cap_set(DMA_MEMSET, orion_xor1_channels_pdata[1].cap_mask);
dma_cap_set(DMA_MEMCPY, orion_xor1_channels_pdata[1].cap_mask);
dma_cap_set(DMA_XOR, orion_xor1_channels_pdata[1].cap_mask);

platform_device_register(&orion_xor1_shared);
}

/*****************************************************************************
Expand Down

0 comments on commit 6a8f2db

Please sign in to comment.