Skip to content

Commit

Permalink
arm: dove: Convert Dove to DT XOR DMA engine
Browse files Browse the repository at this point in the history
With DT support for Marvell XOR DMA engine, make use of it on Dove.
Also remove the now redundant code in DT board init for xor engines.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  • Loading branch information
Sebastian Hesselbarth authored and Thomas Petazzoni committed Nov 20, 2012
1 parent c896ed0 commit 49f175b
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 10 deletions.
42 changes: 42 additions & 0 deletions arch/arm/boot/dts/dove.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -174,5 +174,47 @@
clocks = <&gate_clk 15>;
status = "okay";
};

xor0: dma-engine@60800 {
compatible = "marvell,orion-xor";
reg = <0x60800 0x100
0x60a00 0x100>;
clocks = <&gate_clk 23>;
status = "okay";

channel0 {
interrupts = <39>;
dmacap,memcpy;
dmacap,xor;
};

channel1 {
interrupts = <40>;
dmacap,memset;
dmacap,memcpy;
dmacap,xor;
};
};

xor1: dma-engine@60900 {
compatible = "marvell,orion-xor";
reg = <0x60900 0x100
0x60b00 0x100>;
clocks = <&gate_clk 24>;
status = "okay";

channel0 {
interrupts = <42>;
dmacap,memcpy;
dmacap,xor;
};

channel1 {
interrupts = <43>;
dmacap,memset;
dmacap,memcpy;
dmacap,xor;
};
};
};
};
10 changes: 0 additions & 10 deletions arch/arm/mach-dove/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -409,14 +409,6 @@ static void __init dove_legacy_clk_init(void)
clkspec.args[0] = CLOCK_GATING_BIT_PCIE1;
orion_clkdev_add("1", "pcie",
of_clk_get_from_provider(&clkspec));

clkspec.args[0] = CLOCK_GATING_BIT_XOR0;
orion_clkdev_add(NULL, MV_XOR_NAME ".0",
of_clk_get_from_provider(&clkspec));

clkspec.args[0] = CLOCK_GATING_BIT_XOR1;
orion_clkdev_add(NULL, MV_XOR_NAME ".1",
of_clk_get_from_provider(&clkspec));
}

static void __init dove_of_clk_init(void)
Expand Down Expand Up @@ -444,8 +436,6 @@ static void __init dove_dt_init(void)

/* Internal devices not ported to DT yet */
dove_rtc_init();
dove_xor0_init();
dove_xor1_init();

dove_ge00_init(&dove_dt_ge00_data);
dove_ehci0_init();
Expand Down

0 comments on commit 49f175b

Please sign in to comment.