| From f3d9f59577c32d68f1e14a940d0f0c44f1193dea Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Wed, 1 Jun 2016 15:16:57 +0200 |
| Subject: [PATCH 185/299] ARM: shmobile: r8a7778: Stop passing mode pins state |
| to clock driver |
| |
| Now the R-Car M1A 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 remove the .init_time() callback, the |
| generic ARM code will take care of calling of_clk_init(). |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Acked-by: Dirk Behme <dirk.behme@de.bosch.com> |
| --- |
| arch/arm/mach-shmobile/setup-r8a7778.c | 15 --------------- |
| 1 file changed, 15 deletions(-) |
| |
| --- a/arch/arm/mach-shmobile/setup-r8a7778.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7778.c |
| @@ -15,7 +15,6 @@ |
| * GNU General Public License for more details. |
| */ |
| |
| -#include <linux/clk/renesas.h> |
| #include <linux/io.h> |
| #include <linux/irqchip.h> |
| |
| @@ -23,19 +22,6 @@ |
| |
| #include "common.h" |
| |
| -#define MODEMR 0xffcc0020 |
| - |
| -static void __init r8a7778_timer_init(void) |
| -{ |
| - u32 mode; |
| - void __iomem *modemr = ioremap_nocache(MODEMR, 4); |
| - |
| - BUG_ON(!modemr); |
| - mode = ioread32(modemr); |
| - iounmap(modemr); |
| - r8a7778_clocks_init(mode); |
| -} |
| - |
| #define INT2SMSKCR0 0x82288 /* 0xfe782288 */ |
| #define INT2SMSKCR1 0x8228c /* 0xfe78228c */ |
| |
| @@ -70,6 +56,5 @@ DT_MACHINE_START(R8A7778_DT, "Generic R8 |
| .init_early = shmobile_init_delay, |
| .init_irq = r8a7778_init_irq_dt, |
| .init_late = shmobile_init_late, |
| - .init_time = r8a7778_timer_init, |
| .dt_compat = r8a7778_compat_dt, |
| MACHINE_END |
