| Message ID | 1246976381-7944-1-git-send-email-hemantp@ti.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Hemant Pedanekar <hemantp@ti.com> writes: > 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> Thanks, pushing today. Kevin > --- > arch/arm/mach-davinci/dm646x.c | 10 +++++++++- > 1 files changed, 9 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c > index df82ee5..7e2c036 100644 > --- a/arch/arm/mach-davinci/dm646x.c > +++ b/arch/arm/mach-davinci/dm646x.c > @@ -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, > @@ -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), > @@ -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) > > -- > 1.6.2.4 > > _______________________________________________ > Davinci-linux-open-source mailing list > Davinci-linux-open-source@linux.davincidsp.com > http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index df82ee5..7e2c036 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -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, @@ -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), @@ -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)
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> --- arch/arm/mach-davinci/dm646x.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-)