David Brownell <[email protected]> writes:
> From: David Brownell <[email protected]>
>
> 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: David Brownell <[email protected]>
Thanks, pushing today.
Kevin
> ---
> arch/arm/mach-davinci/gpio.c | 2 +-
> arch/arm/mach-davinci/psc.c | 4 ----
> 2 files changed, 1 insertion(+), 5 deletions(-)
>
> --- a/arch/arm/mach-davinci/gpio.c
> +++ b/arch/arm/mach-davinci/gpio.c
> @@ -287,7 +287,7 @@ static int __init davinci_gpio_irq_setup
> 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);
>
> --- a/arch/arm/mach-davinci/psc.c
> +++ b/arch/arm/mach-davinci/psc.c
> @@ -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);
> }
> }
>
> _______________________________________________
> Davinci-linux-open-source mailing list
> [email protected]
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
