From: Tony Lindgren <tony@atomide.com>
Date: Fri, 17 Dec 2010 23:14:02 +0000 (-0800)
Subject: Merge branch 'devel-board' into omap-for-linus
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fea83f6a9b0a90fefca16ac3534e308f6c34144b;p=linux-beck.git

Merge branch 'devel-board' into omap-for-linus
---

fea83f6a9b0a90fefca16ac3534e308f6c34144b
diff --cc arch/arm/mach-omap2/board-rx51.c
index 6635142d7d07,215ea0efed89..7362c91ddd76
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@@ -105,9 -105,10 +105,9 @@@ static void __init rx51_init_irq(void
  	omap_board_config = rx51_config;
  	omap_board_config_size = ARRAY_SIZE(rx51_config);
  	omap3_pm_init_cpuidle(rx51_cpuidle_params);
- 	sdrc_params = rx51_get_sdram_timings();
+ 	sdrc_params = nokia_get_sdram_timings();
  	omap2_init_common_hw(sdrc_params, sdrc_params);
  	omap_init_irq();
 -	omap_gpio_init();
  }
  
  extern void __init rx51_peripherals_init(void);
diff --cc arch/arm/plat-omap/include/plat/uncompress.h
index 229fbf2cbd26,d02adb5cc4d9..7bbc0740cb46
--- a/arch/arm/plat-omap/include/plat/uncompress.h
+++ b/arch/arm/plat-omap/include/plat/uncompress.h
@@@ -145,9 -145,9 +145,10 @@@ static inline void __arch_decomp_setup(
  		/* omap3 based boards using UART3 */
  		DEBUG_LL_OMAP3(3, cm_t35);
  		DEBUG_LL_OMAP3(3, cm_t3517);
 +		DEBUG_LL_OMAP3(3, craneboard);
  		DEBUG_LL_OMAP3(3, igep0020);
  		DEBUG_LL_OMAP3(3, igep0030);
+ 		DEBUG_LL_OMAP3(3, nokia_rm680);
  		DEBUG_LL_OMAP3(3, nokia_rx51);
  		DEBUG_LL_OMAP3(3, omap3517evm);
  		DEBUG_LL_OMAP3(3, omap3_beagle);