| From 9feeaae4570f5f6f7d07504e5f5218d3e5a9f8ed Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Tue, 7 Jul 2015 15:06:34 +0200 |
| Subject: [PATCH 187/299] ARM: shmobile: rcar-gen2: Stop passing mode pins |
| state to clock driver |
| |
| Now the R-Car Gen2 CPG clock driver obtains the state of the mode pins |
| from the R-Car RST driver, there's no longer a need to pass this state |
| explicitly. Hence we can just call of_clk_init() instead. |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Acked-by: Dirk Behme <dirk.behme@de.bosch.com> |
| --- |
| arch/arm/mach-shmobile/setup-rcar-gen2.c | 5 ++--- |
| 1 file changed, 2 insertions(+), 3 deletions(-) |
| |
| --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c |
| +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c |
| @@ -15,7 +15,7 @@ |
| * GNU General Public License for more details. |
| */ |
| |
| -#include <linux/clk/renesas.h> |
| +#include <linux/clk-provider.h> |
| #include <linux/clocksource.h> |
| #include <linux/device.h> |
| #include <linux/dma-contiguous.h> |
| @@ -71,7 +71,6 @@ static unsigned int __init get_extal_fre |
| |
| void __init rcar_gen2_timer_init(void) |
| { |
| - u32 mode = rcar_gen2_read_mode_pins(); |
| #ifdef CONFIG_ARM_ARCH_TIMER |
| void __iomem *base; |
| u32 freq; |
| @@ -130,7 +129,7 @@ void __init rcar_gen2_timer_init(void) |
| iounmap(base); |
| #endif /* CONFIG_ARM_ARCH_TIMER */ |
| |
| - rcar_gen2_clocks_init(mode); |
| + of_clk_init(NULL); |
| clocksource_probe(); |
| } |
| |
