Commit d470df3b authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Sekhar Nori
Browse files

ARM: davinci: WARN_ON() if clk_get() fails 



Currently the timer code checks if the clock pointer passed to it is
good (!IS_ERR(clk)). The new clocksource driver expects the clock to
be functional and doesn't perform any checks so emit a warning if
clk_get() fails. Apply this to all davinci platforms.

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 29e97f56

arch/arm/mach-davinci/da830.c

+4 −0
Original line number Diff line number Diff line
@@ -751,6 +751,10 @@ void __init da830_init_time(void) 
	da830_pll_init(NULL, pll, NULL);



	clk = clk_get(NULL, "timer0");

	if (WARN_ON(IS_ERR(clk))) {

		pr_err("Unable to get the timer clock\n");

		return;

	}



	davinci_timer_init(clk);

}

arch/arm/mach-davinci/da850.c

+4 −0
Original line number Diff line number Diff line
@@ -681,6 +681,10 @@ void __init da850_init_time(void) 
	da850_pll0_init(NULL, pll0, cfgchip);



	clk = clk_get(NULL, "timer0");

	if (WARN_ON(IS_ERR(clk))) {

		pr_err("Unable to get the timer clock\n");

		return;

	}



	davinci_timer_init(clk);

}

arch/arm/mach-davinci/dm355.c

+4 −0
Original line number Diff line number Diff line
@@ -743,6 +743,10 @@ void __init dm355_init_time(void) 
	dm355_psc_init(NULL, psc);



	clk = clk_get(NULL, "timer0");

	if (WARN_ON(IS_ERR(clk))) {

		pr_err("Unable to get the timer clock\n");

		return;

	}



	davinci_timer_init(clk);

}

arch/arm/mach-davinci/dm365.c

+4 −0
Original line number Diff line number Diff line
@@ -784,6 +784,10 @@ void __init dm365_init_time(void) 
	dm365_psc_init(NULL, psc);



	clk = clk_get(NULL, "timer0");

	if (WARN_ON(IS_ERR(clk))) {

		pr_err("Unable to get the timer clock\n");

		return;

	}



	davinci_timer_init(clk);

}

arch/arm/mach-davinci/dm644x.c

+4 −0
Original line number Diff line number Diff line
@@ -679,6 +679,10 @@ void __init dm644x_init_time(void) 
	dm644x_psc_init(NULL, psc);



	clk = clk_get(NULL, "timer0");

	if (WARN_ON(IS_ERR(clk))) {

		pr_err("Unable to get the timer clock\n");

		return;

	}



	davinci_timer_init(clk);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE