diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-05 10:21:18 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-05 10:21:18 +0100 |
| commit | 843e22b056c07d39b8f97935173dab879abc613b (patch) | |
| tree | 92511d253f3647b48c2a22f57e7b3f8340926905 /arch | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | [ARM] orion5x: pass dram mbus data to xor driver (diff) | |
| download | linux-843e22b056c07d39b8f97935173dab879abc613b.tar.xz linux-843e22b056c07d39b8f97935173dab879abc613b.zip | |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-orion5x/common.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 0a623379789f..8a0e49d84256 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c @@ -431,6 +431,10 @@ void __init orion5x_uart1_init(void) /***************************************************************************** * XOR engine ****************************************************************************/ +struct mv_xor_platform_shared_data orion5x_xor_shared_data = { + .dram = &orion5x_mbus_dram_info, +}; + static struct resource orion5x_xor_shared_resources[] = { { .name = "xor low", @@ -448,6 +452,9 @@ static struct resource orion5x_xor_shared_resources[] = { static struct platform_device orion5x_xor_shared = { .name = MV_XOR_SHARED_NAME, .id = 0, + .dev = { + .platform_data = &orion5x_xor_shared_data, + }, .num_resources = ARRAY_SIZE(orion5x_xor_shared_resources), .resource = orion5x_xor_shared_resources, }; |