Commit 93b3c455 authored by David Brownell's avatar David Brownell Committed by Kevin Hilman

gpio clock init simplification

Minor cleanup of gpio init:  since the gpio code enables its clock,
the PSC code doesn't need to do that too.  And when enabling that
clock triggers an error, report it in the standard way.
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 1a86f3d6
......@@ -287,7 +287,7 @@ static int __init davinci_gpio_irq_setup(void)
if (IS_ERR(clk)) {
printk(KERN_ERR "Error %ld getting gpio clock?\n",
PTR_ERR(clk));
return 0;
return PTR_ERR(clk);
}
clk_enable(clk);
......
......@@ -213,8 +213,6 @@ void __init davinci_psc_init(void)
DAVINCI_LPSC_TPTC0, 1);
davinci_psc_config(DAVINCI_GPSC_ARMDOMAIN,
DAVINCI_LPSC_TPTC1, 1);
davinci_psc_config(DAVINCI_GPSC_ARMDOMAIN,
DAVINCI_LPSC_GPIO, 1);
/* Turn on WatchDog timer LPSC. Needed for RESET to work */
davinci_psc_config(DAVINCI_GPSC_ARMDOMAIN,
......@@ -222,7 +220,5 @@ void __init davinci_psc_init(void)
} else if (cpu_is_davinci_dm646x()) {
davinci_psc_config(DAVINCI_GPSC_ARMDOMAIN,
DM646X_LPSC_AEMIF, 1);
davinci_psc_config(DAVINCI_GPSC_ARMDOMAIN,
DM646X_LPSC_GPIO, 1);
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment