Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 843e22b0 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'for-rmk' of git://git.marvell.com/orion

parents 559595a9 f45964ed
Loading
Loading
Loading
Loading
+7 −0
Original line number Original line Diff line number Diff line
@@ -431,6 +431,10 @@ void __init orion5x_uart1_init(void)
/*****************************************************************************
/*****************************************************************************
 * XOR engine
 * XOR engine
 ****************************************************************************/
 ****************************************************************************/
struct mv_xor_platform_shared_data orion5x_xor_shared_data = {
	.dram		= &orion5x_mbus_dram_info,
};

static struct resource orion5x_xor_shared_resources[] = {
static struct resource orion5x_xor_shared_resources[] = {
	{
	{
		.name	= "xor low",
		.name	= "xor low",
@@ -448,6 +452,9 @@ static struct resource orion5x_xor_shared_resources[] = {
static struct platform_device orion5x_xor_shared = {
static struct platform_device orion5x_xor_shared = {
	.name		= MV_XOR_SHARED_NAME,
	.name		= MV_XOR_SHARED_NAME,
	.id		= 0,
	.id		= 0,
	.dev		= {
		.platform_data	= &orion5x_xor_shared_data,
	},
	.num_resources	= ARRAY_SIZE(orion5x_xor_shared_resources),
	.num_resources	= ARRAY_SIZE(orion5x_xor_shared_resources),
	.resource	= orion5x_xor_shared_resources,
	.resource	= orion5x_xor_shared_resources,
};
};