Skip to content

Commit

Permalink
davinci: dm646x: Add clock info and update mux setup for ATA
Browse files Browse the repository at this point in the history
This patch adds clock data for IDE and also updates pin mux mask for ATA so as
to disable PCI when ATA is selected.

Signed-off-by: Hemant Pedanekar <hemantp@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
  • Loading branch information
Hemant Pedanekar authored and Kevin Hilman committed Aug 26, 2009
1 parent 8865998 commit 3e25d5f
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion arch/arm/mach-davinci/dm646x.c
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,13 @@ static struct clk timer2_clk = {
.flags = ALWAYS_ENABLED, /* no LPSC, always enabled; c.f. spruep9a */
};


static struct clk ide_clk = {
.name = "ide",
.parent = &pll1_sysclk4,
.lpsc = DAVINCI_LPSC_ATA,
};

static struct clk vpif0_clk = {
.name = "vpif0",
.parent = &ref_clk,
Expand Down Expand Up @@ -336,6 +343,7 @@ struct davinci_clk dm646x_clks[] = {
CLK(NULL, "timer0", &timer0_clk),
CLK(NULL, "timer1", &timer1_clk),
CLK("watchdog", NULL, &timer2_clk),
CLK("palm_bk3710", NULL, &ide_clk),
CLK(NULL, "vpif0", &vpif0_clk),
CLK(NULL, "vpif1", &vpif1_clk),
CLK(NULL, NULL, NULL),
Expand Down Expand Up @@ -399,7 +407,7 @@ static struct platform_device dm646x_emac_device = {
*/
static const struct mux_config dm646x_pins[] = {
#ifdef CONFIG_DAVINCI_MUX
MUX_CFG(DM646X, ATAEN, 0, 0, 1, 1, true)
MUX_CFG(DM646X, ATAEN, 0, 0, 5, 1, true)

MUX_CFG(DM646X, AUDCK1, 0, 29, 1, 0, false)

Expand Down

0 comments on commit 3e25d5f

Please sign in to comment.