Skip to content

Commit

Permalink
ARM: davinci: Add clock for CPPI 4.1 DMA engine
Browse files Browse the repository at this point in the history
The CPPI 4.1 DMA in USB subsystem shares its clock with the
USB OTG, and most of the time, the clock will be enabled by
USB.  But during the init of the DMA, USB is not enabled
(waiting for DMA), and then we must enable the DMA clock
before doing anything.

Add clock for the CPPI 4.1 DMA engine.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
[nsekhar@ti.com: minor commit message tweaks]
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
  • Loading branch information
Alexandre Bailon authored and Sekhar Nori committed Apr 11, 2017
1 parent 28d4d1d commit 398dbc7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
6 changes: 6 additions & 0 deletions arch/arm/mach-davinci/da830.c
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,11 @@ static struct clk usb20_clk = {
.gpsc = 1,
};

static struct clk cppi41_clk = {
.name = "cppi41",
.parent = &usb20_clk,
};

static struct clk aemif_clk = {
.name = "aemif",
.parent = &pll0_sysclk3,
Expand Down Expand Up @@ -413,6 +418,7 @@ static struct clk_lookup da830_clks[] = {
CLK("davinci-mcasp.1", NULL, &mcasp1_clk),
CLK("davinci-mcasp.2", NULL, &mcasp2_clk),
CLK("musb-da8xx", "usb20", &usb20_clk),
CLK("cppi41-dmaengine", NULL, &cppi41_clk),
CLK(NULL, "aemif", &aemif_clk),
CLK(NULL, "aintc", &aintc_clk),
CLK(NULL, "secu_mgr", &secu_mgr_clk),
Expand Down
6 changes: 6 additions & 0 deletions arch/arm/mach-davinci/da850.c
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,11 @@ static struct clk usb20_clk = {
.gpsc = 1,
};

static struct clk cppi41_clk = {
.name = "cppi41",
.parent = &usb20_clk,
};

static struct clk spi0_clk = {
.name = "spi0",
.parent = &pll0_sysclk2,
Expand Down Expand Up @@ -560,6 +565,7 @@ static struct clk_lookup da850_clks[] = {
CLK("davinci-nand.0", "aemif", &aemif_nand_clk),
CLK("ohci-da8xx", "usb11", &usb11_clk),
CLK("musb-da8xx", "usb20", &usb20_clk),
CLK("cppi41-dmaengine", NULL, &cppi41_clk),
CLK("spi_davinci.0", NULL, &spi0_clk),
CLK("spi_davinci.1", NULL, &spi1_clk),
CLK("vpif", NULL, &vpif_clk),
Expand Down

0 comments on commit 398dbc7

Please sign in to comment.