Merge branch 'master' of git://git.denx.de/u-boot-arm

* 'master' of git://git.denx.de/u-boot-arm:
  davinci: Remove unwanted memsize.c from hawkboard's nand spl build
  devkit8000: Move CONFIG_SYS_TEXT_BASE out of bss
  da850evm: pass board revision info to kernel
  arch/arm/include/asm/arch-omap5/clocks.h: Fix GCC 4.2 warnings
  arch/arm/cpu/armv7/omap-common/clocks-common.c: Fix GCC 4.6 warnings
  arch/arm/cpu/armv7/omap-common/spl.c: Fix GCC 4.2 warnings
  MX35: flea3: changes due to hardware revision B
  MX: serial_mxc: cleanup removing nasty #ifdef
  M28: Fix OB1 bug in GPIO driver
  MXS: Add static annotations to dma driver
  apbh_dma: return error value on timeout
  Efika: Configure additional regulators for HDMI output
  mx5: Correct a warning in clock.c
  MC13892: Add REGMODE0 bits definitions
  mx51evk: Configure the pins as GPIOs prior to using gpio_get_value
  mx53smd: Configure the pins as GPIOs prior to using gpio_get_value
  mx53evk: Configure the pins as GPIOs prior to using gpio_get_value
  mx53ard: Configure the pins as GPIOs prior to using gpio_get_value
  mx53loco: Configure the pins as GPIOs prior to using gpio_get_value
  OMAP3: Add SPL_BOARD_INIT hook
  AM3517 CraneBoard: Add SPL support
  AM3517: Add SPL support
  OMAP3: Add SPL support to omap3_evm
  OMAP3: Add SPL support to Beagleboard
  OMAP3 SPL: Add identify_nand_chip function
  OMAP3 SPL: Rework memory initalization and devkit8000 support
  OMAP3: Suffix all Micron memory timing parts with their speed
  OMAP3: Add optimal SDRC autorefresh control values
  omap3: mem: Add MCFG helper macro
  OMAP3: Remove get_mem_type prototype
  OMAP3: Change mem_ok to clear again after reading back
  OMAP3: Add a helper function to set timings in SDRC
  OMAP3: Update SDRC dram_init to always call make_cs1_contiguous()
  omap3: mem: Comment enable_gpmc_cs_config more
  ARM: davici_emac: Fix condition for number of phy detects
  arm: printf() is not available in some SPL configurations
  arm, davinci: add support for am1808 based enbw_cmc board
  arm, davinci: move misc function in arch tree
  arm, board/davinci/common/misc.c: Codingstyle cleanup
  arm, davinci, da850: add uart1 tx rx pinmux config
  arm, davinci: move davinci_rtc struct to hardware.h
  arm, davinci: Remove duplication of pinmux configuration code
  arm, hawkboard: Use the pinmux configurations defined in the arch tree
  arm, da850evm: Use the pinmux configurations defined in the arch tree
  arm, da850: Add pinmux configurations to the arch tree
  arm, da850evm: Do pinmux configuration for EMAC together with other pinmuxes
  arm, hawkboard: Remove obsolete struct pinmux_config i2c_pins
  arm, davinci: Move pinmux functions from board to arch tree
  arm, arm926ejs: always do cpu critical inits
  omap_gpmc: use SOFTECC in SPL if it's enabled
  nand_spl_simple: add support for software ECC
  AM3517: move AM3517 specific mux defines to generic header
  AM35xx: add EMAC support
  davinci_emac: hardcode 100Mbps for AM35xx and RMII
  davinci_emac: fix for running with dcache enabled
  arm926ejs: add noop implementation for dcache ops
  davinci_emac: conditionally compile specific PHY support
  davinci_emac: use internal addresses in buffer descriptors
  davinci_emac: move arch-independent defines to separate header
  BeagleBoard: config: Really switch to ttyO2
  ARM: davinci_dm6467Tevm: Fix build breakage
  ARM: OMAP: Remove STACKSIZE for IRQ and FIQ if unused
  ARM: OMAP3: Remove unused define SDRC_R_C_B
  ARM: OMAP3: Remove unused define CONFIG_OMAP3430
  omap4: fix IO setting
  omap4+: streamline CONFIG_SYS_TEXT_BASE and other SDRAM addresses
  omap4460: add ES1.1 identification
  omap4: emif: fix error in driver
  omap: remove I2C from SPL
  omap4460: fix TPS initialization
  omap: fix cache line size for omap3/omap4 boards
  omap4: ttyO2 instead of ttyS2 in default bootargs
  omap: Improve PLL parameter calculation tool
  start.S: remove omap3 specific code from start.S
  armv7: setup vector
  armv7: include armv7/cpu.c in SPL build
  armv7: disable L2 cache in cleanup_before_linux()
  arm, arm926ejs: Fix clear bss loop for zero length bss
  PXA: Move colibri_pxa270 to board/toradex/
  PXA: Flip colibri_pxa27x to pxa-common.h
  PXA: Introduce common configuration header for PXA
  PXA: Rename pxa_dram_init to pxa2xx_dram_init
  PXA: Squash extern pxa_dram_init()
  PXA: Export cpu_is_ and pxa_dram_init functions
  PXA: Cleanup Colibri PXA270
  PXA: Replace timer driver
  PXA: Add cpuinfo display for PXA2xx
  PXA: Separate PXA2xx CPU init
  PXA: Rename CONFIG_PXA2[57]X to CONFIG_CPU_PXA2[57]X
  PXA: Unify vpac270 environment size
  PXA: Enable command line editing for vpac270
  PXA: Adapt Voipac PXA270 to OneNAND SPL
  PXA: Drop Voipac PXA270 OneNAND IPL
  PXA: Fixup PXA25x boards after start.S update
  PXA: Re-add the Dcache locking as RAM for pxa250
  PXA: Rework start.S to be closer to other ARMs
  PXA: Drop XM250 board
  PXA: Drop PLEB2 board
  PXA: Drop CRADLE board
  PXA: Drop CERF250 board
  Fix regression in SMDK6400
  nand: Add common functions to linux/mtd/nand.h
  Ethernut 5 board support
  net: Armada100: Fix compilation warnings
  ARM: remove duplicated code for LaCie boards
  ARM: add support for LaCie 2Big Network v2
  mvsata: fix ide_preinit for missing disks
  netspace_v2: Read Ethernet MAC address from EEPROM
  omap3evm: Add support for EFI partitions
  part_efi: Fix compile errors

1 files changed, 96 insertions, 91 deletions

diff --git a/tools/omap/clocks_get_m_n.c b/tools/omap/clocks_get_m_n.c
index cfc176042a7..c27577b70cc 100644
--- a/tools/omap/clocks_get_m_n.c
+++ b/tools/omap/clocks_get_m_n.c
@@ -63,45 +63,41 @@ typedef unsigned int u32;
  *	$ gcc clocks_get_m_n.c
  *	$ ./a.out
  */
-int get_m_n_optimized(u32 target_freq_khz, u32 ref_freq_khz, u32 *m, u32 *n,
-			u32 tolerance_khz)
+int get_m_n_optimized(u32 target_freq_khz, u32 ref_freq_khz, u32 *M, u32 *N)
 {
-	u32 min_freq = target_freq_khz - tolerance_khz;
-	u32 max_freq = target_freq_khz;
-	u32 freq, freq_old;
-	*n = 1;
+	u32 freq = target_freq_khz;
+	u32 m_optimal, n_optimal, freq_optimal = 0, freq_old;
+	u32 m, n;
+	n = 1;
 	while (1) {
-		*m = min_freq / ref_freq_khz / 2 * (*n) ;
+		m = target_freq_khz / ref_freq_khz / 2 * n;
 		freq_old = 0;
 		while (1) {
-			freq = ref_freq_khz * 2 * (*m) / (*n);
-			if (abs(target_freq_khz - freq_old) <=
-				abs(target_freq_khz - freq)) {
+			freq = ref_freq_khz * 2 * m / n;
+			if (freq > target_freq_khz) {
 				freq = freq_old;
-				(*m)--;
+				m--;
 				break;
 			}
-			(*m)++;
+			m++;
 			freq_old = freq;
 		}
-		if (freq >= min_freq && freq <= max_freq)
+		if (freq > freq_optimal) {
+			freq_optimal = freq;
+			m_optimal = m;
+			n_optimal = n;
+		}
+		n++;
+		if ((freq_optimal == target_freq_khz) ||
+			((ref_freq_khz / n) < 1000)) {
 			break;
-		(*n)++;
-		if ((*n) > MAX_N + 1) {
-			printf("ref %d m %d n %d target %d : ",
-				ref_freq_khz, *m, *n, target_freq_khz);
-			printf("can not find m & n - please consider"
-				" increasing tolerance\n");
-			return -1;
 		}
 	}
-	(*n)--;
-	printf("ref %d m %d n %d target %d locked %d\n",
-		ref_freq_khz, *m, *n, target_freq_khz, freq);
-	if ((ref_freq_khz / (*n + 1)) < 1000) {
-		printf("\tREFCLK - CLKINP/(N+1) is less than 1 MHz - less than"
-			" ideal, locking time will be high!\n");
-	}
+	n--;
+	*M = m_optimal;
+	*N = n_optimal - 1;
+	printf("ref %d m %d n %d target %d locked %d\n", ref_freq_khz,
+		m_optimal, n_optimal - 1, target_freq_khz, freq_optimal);
 	return 0;
 }
 
@@ -109,89 +105,98 @@ void main(void)
 {
 	u32 m, n;
 	printf("\nMPU - 2000000\n");
-	get_m_n_optimized(2000000, 12000, &m, &n, 0);
-	get_m_n_optimized(2000000, 13000, &m, &n, 0);
-	get_m_n_optimized(2000000, 16800, &m, &n, 800);
-	get_m_n_optimized(2000000, 19200, &m, &n, 0);
-	get_m_n_optimized(2000000, 26000, &m, &n, 0);
-	get_m_n_optimized(2000000, 27000, &m, &n, 0);
-	get_m_n_optimized(2000000, 38400, &m, &n, 0);
+	get_m_n_optimized(2000000, 12000, &m, &n);
+	get_m_n_optimized(2000000, 13000, &m, &n);
+	get_m_n_optimized(2000000, 16800, &m, &n);
+	get_m_n_optimized(2000000, 19200, &m, &n);
+	get_m_n_optimized(2000000, 26000, &m, &n);
+	get_m_n_optimized(2000000, 27000, &m, &n);
+	get_m_n_optimized(2000000, 38400, &m, &n);
 
 	printf("\nMPU - 1200000\n");
-	get_m_n_optimized(1200000, 12000, &m, &n, 0);
-	get_m_n_optimized(1200000, 13000, &m, &n, 0);
-	get_m_n_optimized(1200000, 16800, &m, &n, 800);
-	get_m_n_optimized(1200000, 19200, &m, &n, 0);
-	get_m_n_optimized(1200000, 26000, &m, &n, 0);
-	get_m_n_optimized(1200000, 27000, &m, &n, 0);
-	get_m_n_optimized(1200000, 38400, &m, &n, 0);
+	get_m_n_optimized(1200000, 12000, &m, &n);
+	get_m_n_optimized(1200000, 13000, &m, &n);
+	get_m_n_optimized(1200000, 16800, &m, &n);
+	get_m_n_optimized(1200000, 19200, &m, &n);
+	get_m_n_optimized(1200000, 26000, &m, &n);
+	get_m_n_optimized(1200000, 27000, &m, &n);
+	get_m_n_optimized(1200000, 38400, &m, &n);
 
 	printf("\nMPU - 1584000\n");
-	get_m_n_optimized(1584000, 12000, &m, &n, 0);
-	get_m_n_optimized(1584000, 13000, &m, &n, 0);
-	get_m_n_optimized(1584000, 16800, &m, &n, 400);
-	get_m_n_optimized(1584000, 19200, &m, &n, 0);
-	get_m_n_optimized(1584000, 26000, &m, &n, 0);
-	get_m_n_optimized(1584000, 27000, &m, &n, 0);
-	get_m_n_optimized(1584000, 38400, &m, &n, 0);
+	get_m_n_optimized(1584000, 12000, &m, &n);
+	get_m_n_optimized(1584000, 13000, &m, &n);
+	get_m_n_optimized(1584000, 16800, &m, &n);
+	get_m_n_optimized(1584000, 19200, &m, &n);
+	get_m_n_optimized(1584000, 26000, &m, &n);
+	get_m_n_optimized(1584000, 27000, &m, &n);
+	get_m_n_optimized(1584000, 38400, &m, &n);
 
 	printf("\nCore 1600000\n");
-	get_m_n_optimized(1600000, 12000, &m, &n, 0);
-	get_m_n_optimized(1600000, 13000, &m, &n, 0);
-	get_m_n_optimized(1600000, 16800, &m, &n, 200);
-	get_m_n_optimized(1600000, 19200, &m, &n, 0);
-	get_m_n_optimized(1600000, 26000, &m, &n, 0);
-	get_m_n_optimized(1600000, 27000, &m, &n, 0);
-	get_m_n_optimized(1600000, 38400, &m, &n, 0);
+	get_m_n_optimized(1600000, 12000, &m, &n);
+	get_m_n_optimized(1600000, 13000, &m, &n);
+	get_m_n_optimized(1600000, 16800, &m, &n);
+	get_m_n_optimized(1600000, 19200, &m, &n);
+	get_m_n_optimized(1600000, 26000, &m, &n);
+	get_m_n_optimized(1600000, 27000, &m, &n);
+	get_m_n_optimized(1600000, 38400, &m, &n);
 
 	printf("\nPER 1536000\n");
-	get_m_n_optimized(1536000, 12000, &m, &n, 0);
-	get_m_n_optimized(1536000, 13000, &m, &n, 0);
-	get_m_n_optimized(1536000, 16800, &m, &n, 0);
-	get_m_n_optimized(1536000, 19200, &m, &n, 0);
-	get_m_n_optimized(1536000, 26000, &m, &n, 0);
-	get_m_n_optimized(1536000, 27000, &m, &n, 0);
-	get_m_n_optimized(1536000, 38400, &m, &n, 0);
+	get_m_n_optimized(1536000, 12000, &m, &n);
+	get_m_n_optimized(1536000, 13000, &m, &n);
+	get_m_n_optimized(1536000, 16800, &m, &n);
+	get_m_n_optimized(1536000, 19200, &m, &n);
+	get_m_n_optimized(1536000, 26000, &m, &n);
+	get_m_n_optimized(1536000, 27000, &m, &n);
+	get_m_n_optimized(1536000, 38400, &m, &n);
 
 	printf("\nIVA 1862000\n");
-	get_m_n_optimized(1862000, 12000, &m, &n, 0);
-	get_m_n_optimized(1862000, 13000, &m, &n, 0);
-	get_m_n_optimized(1862000, 16800, &m, &n, 0);
-	get_m_n_optimized(1862000, 19200, &m, &n, 900);
-	get_m_n_optimized(1862000, 26000, &m, &n, 0);
-	get_m_n_optimized(1862000, 27000, &m, &n, 0);
-	get_m_n_optimized(1862000, 38400, &m, &n, 800);
+	get_m_n_optimized(1862000, 12000, &m, &n);
+	get_m_n_optimized(1862000, 13000, &m, &n);
+	get_m_n_optimized(1862000, 16800, &m, &n);
+	get_m_n_optimized(1862000, 19200, &m, &n);
+	get_m_n_optimized(1862000, 26000, &m, &n);
+	get_m_n_optimized(1862000, 27000, &m, &n);
+	get_m_n_optimized(1862000, 38400, &m, &n);
+
+	printf("\nIVA Nitro - 1290000\n");
+	get_m_n_optimized(1290000, 12000, &m, &n);
+	get_m_n_optimized(1290000, 13000, &m, &n);
+	get_m_n_optimized(1290000, 16800, &m, &n);
+	get_m_n_optimized(1290000, 19200, &m, &n);
+	get_m_n_optimized(1290000, 26000, &m, &n);
+	get_m_n_optimized(1290000, 27000, &m, &n);
+	get_m_n_optimized(1290000, 38400, &m, &n);
 
 	printf("\nABE 196608 sys clk\n");
-	get_m_n_optimized(196608, 12000, &m, &n, 700);
-	get_m_n_optimized(196608, 13000, &m, &n, 200);
-	get_m_n_optimized(196608, 16800, &m, &n, 700);
-	get_m_n_optimized(196608, 19200, &m, &n, 400);
-	get_m_n_optimized(196608, 26000, &m, &n, 200);
-	get_m_n_optimized(196608, 27000, &m, &n, 900);
-	get_m_n_optimized(196608, 38400, &m, &n, 0);
+	get_m_n_optimized(196608, 12000, &m, &n);
+	get_m_n_optimized(196608, 13000, &m, &n);
+	get_m_n_optimized(196608, 16800, &m, &n);
+	get_m_n_optimized(196608, 19200, &m, &n);
+	get_m_n_optimized(196608, 26000, &m, &n);
+	get_m_n_optimized(196608, 27000, &m, &n);
+	get_m_n_optimized(196608, 38400, &m, &n);
 
 	printf("\nABE 196608 32K\n");
-	get_m_n_optimized(196608000/4, 32768, &m, &n, 0);
+	get_m_n_optimized(196608000/4, 32768, &m, &n);
 
 	printf("\nUSB 1920000\n");
-	get_m_n_optimized(1920000, 12000, &m, &n, 0);
-	get_m_n_optimized(1920000, 13000, &m, &n, 0);
-	get_m_n_optimized(1920000, 16800, &m, &n, 0);
-	get_m_n_optimized(1920000, 19200, &m, &n, 0);
-	get_m_n_optimized(1920000, 26000, &m, &n, 0);
-	get_m_n_optimized(1920000, 27000, &m, &n, 0);
-	get_m_n_optimized(1920000, 38400, &m, &n, 0);
+	get_m_n_optimized(1920000, 12000, &m, &n);
+	get_m_n_optimized(1920000, 13000, &m, &n);
+	get_m_n_optimized(1920000, 16800, &m, &n);
+	get_m_n_optimized(1920000, 19200, &m, &n);
+	get_m_n_optimized(1920000, 26000, &m, &n);
+	get_m_n_optimized(1920000, 27000, &m, &n);
+	get_m_n_optimized(1920000, 38400, &m, &n);
 
 	printf("\nCore ES1 1523712\n");
-	get_m_n_optimized(1524000, 12000, &m, &n, 100);
-	get_m_n_optimized(1524000, 13000, &m, &n, 0);
-	get_m_n_optimized(1524000, 16800, &m, &n, 0);
-	get_m_n_optimized(1524000, 19200, &m, &n, 0);
-	get_m_n_optimized(1524000, 26000, &m, &n, 0);
-	get_m_n_optimized(1524000, 27000, &m, &n, 0);
+	get_m_n_optimized(1524000, 12000, &m, &n);
+	get_m_n_optimized(1524000, 13000, &m, &n);
+	get_m_n_optimized(1524000, 16800, &m, &n);
+	get_m_n_optimized(1524000, 19200, &m, &n);
+	get_m_n_optimized(1524000, 26000, &m, &n);
+	get_m_n_optimized(1524000, 27000, &m, &n);
 
 	/* exact recommendation for SDPs */
-	get_m_n_optimized(1523712, 38400, &m, &n, 0);
+	get_m_n_optimized(1523712, 38400, &m, &n);
 
 }