Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc

* 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas: (234 commits)
  ARM: shmobile: remove additional __io() macro use
  ARM: mach-shmobile: default to no earlytimer
  ARM: mach-shmobile: r8a7779 and Marzen timer rework
  ARM: mach-shmobile: r8a7740 and Bonito timer rework
  ARM: mach-shmobile: sh73a0, AG5EVM and Kota2 timer rework
  ARM: mach-shmobile: sh7372, AP4EVB and Mackerel timer rework
  ARM: mach-shmobile: sh7377 and G4EVM timer rework
  ARM: mach-shmobile: sh7367 and G3EVM timer rework
  ARM: mach-shmobile: add shmobile_earlytimer_init()
  ARM: mach-shmobile: Move sh7372 AP4EVB external clk setup
  ARM: mach-shmobile: Move sh7372 Mackerel external clk setup
  ARM: mach-shmobile: rename clk_init() to shmobile_clk_init()
  ARM: mach-shmobile: r8a7779 L2 cache support
  ARM: mach-shmobile: r8a7779 map_io and init_early update
  ARM: mach-shmobile: r8a7740 map_io and init_early update
  ARM: mach-shmobile: sh73a0 map_io and init_early update
  ARM: mach-shmobile: sh7372 map_io and init_early update
  ARM: mach-shmobile: sh7377 map_io and init_early update
  ARM: mach-shmobile: sh7367 map_io and init_early update
  sh: remove clk_ops
  ...

  (includes an update to v3.3-rc7)

Conflicts:
	arch/arm/mach-omap2/id.c

1 files changed, 12 insertions, 32 deletions

diff --git a/arch/arm/mach-shmobile/board-bonito.c b/arch/arm/mach-shmobile/board-bonito.c
index 4d2201622323..d062becd5460 100644
--- a/arch/arm/mach-shmobile/board-bonito.c
+++ b/arch/arm/mach-shmobile/board-bonito.c
@@ -327,28 +327,6 @@ static struct platform_device *bonito_base_devices[] __initdata = {
  * map I/O
  */
 static struct map_desc bonito_io_desc[] __initdata = {
-         /*
-          * for CPGA/INTC/PFC
-          * 0xe6000000-0xefffffff -> 0xe6000000-0xefffffff
-          */
-        {
-                .virtual        = 0xe6000000,
-                .pfn            = __phys_to_pfn(0xe6000000),
-                .length         = 160 << 20,
-                .type           = MT_DEVICE_NONSHARED
-        },
-#ifdef CONFIG_CACHE_L2X0
-        /*
-         * for l2x0_init()
-         * 0xf0100000-0xf0101000 -> 0xf0002000-0xf0003000
-         */
-        {
-                .virtual        = 0xf0002000,
-                .pfn            = __phys_to_pfn(0xf0100000),
-                .length         = PAGE_SIZE,
-                .type           = MT_DEVICE_NONSHARED
-        },
-#endif
         /*
          * for FPGA (0x1800000-0x19ffffff)
          * 0x18000000-0x18002000 -> 0xf0003000-0xf0005000
@@ -363,11 +341,8 @@ static struct map_desc bonito_io_desc[] __initdata = {
 
 static void __init bonito_map_io(void)
 {
+        r8a7740_map_io();
         iotable_init(bonito_io_desc, ARRAY_SIZE(bonito_io_desc));
-
-        /* setup early devices and console here as well */
-        r8a7740_add_early_devices();
-        shmobile_setup_console();
 }
 
 /*
@@ -491,7 +466,7 @@ static void __init bonito_init(void)
         }
 }
 
-static void __init bonito_timer_init(void)
+static void __init bonito_earlytimer_init(void)
 {
         u16 val;
         u8 md_ck = 0;
@@ -506,17 +481,22 @@ static void __init bonito_timer_init(void)
                 md_ck |= MD_CK0;
 
         r8a7740_clock_init(md_ck);
-        shmobile_timer.init();
+        shmobile_earlytimer_init();
 }
 
-struct sys_timer bonito_timer = {
-        .init   = bonito_timer_init,
-};
+void __init bonito_add_early_devices(void)
+{
+        r8a7740_add_early_devices();
+
+        /* override timer setup with board-specific code */
+        shmobile_timer.init = bonito_earlytimer_init;
+}
 
 MACHINE_START(BONITO, "bonito")
         .map_io         = bonito_map_io,
+        .init_early     = bonito_add_early_devices,
         .init_irq       = r8a7740_init_irq,
         .handle_irq     = shmobile_handle_irq_intc,
         .init_machine   = bonito_init,
-        .timer          = &bonito_timer,
+        .timer          = &shmobile_timer,
 MACHINE_END