2011-12-06 Sebastian Huber <sebastian.huber@embedded-brains.de>

	* misc/system-clocks.c: New file.
	* Makefile.am: Reflect change from above.
	* include/nand-mlc.h: Fixed lpc32xx_mlc_is_bad_page().
	* make/custom/lpc32xx.inc, make/custom/lpc32xx_mzx_stage_1.cfg: Flags
	for EABI tool chain.
	* configure.ac, include/bsp.h, include/lpc32xx.h, misc/emc.c,
	misc/i2c.c, rtc/rtc-config.c, startup/bspstarthooks.c: Avoid compile
	time ARM_CLK and HCLK.

1 files changed, 12 insertions, 14 deletions

diff --git a/c/src/lib/libbsp/arm/lpc32xx/misc/i2c.c b/c/src/lib/libbsp/arm/lpc32xx/misc/i2c.c
index 60526d4fe0..8dfdc58cfc 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/misc/i2c.c
+++ b/c/src/lib/libbsp/arm/lpc32xx/misc/i2c.c
@@ -7,12 +7,13 @@
  */
 
 /*
- * Copyright (c) 2010
- * embedded brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * <rtems@embedded-brains.de>
+ * Copyright (c) 2010-2011 embedded brains GmbH.  All rights reserved.
+ *
+ *  embedded brains GmbH
+ *  Obere Lagerstr. 30
+ *  82178 Puchheim
+ *  Germany
+ *  <rtems@embedded-brains.de>
  *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
@@ -51,31 +52,28 @@ rtems_status_code lpc32xx_i2c_init(
   return lpc32xx_i2c_clock(i2c, clock_in_hz);
 }
 
-#if LPC32XX_HCLK != 104000000U
-  #error "unexpected HCLK"
-#endif
-
 rtems_status_code lpc32xx_i2c_clock(
   volatile lpc32xx_i2c *i2c,
   unsigned clock_in_hz
 )
 {
+  uint32_t clk_div = lpc32xx_hclk() / clock_in_hz;
   uint32_t clk_lo = 0;
   uint32_t clk_hi = 0;
 
   switch (clock_in_hz) {
     case 100000:
-      clk_lo = 520;
-      clk_hi = 520;
+      clk_lo = clk_div / 2;
       break;
     case 400000:
-      clk_lo = 166;
-      clk_hi = 94;
+      clk_lo = (64 * clk_div) / 100;
       break;
     default:
       return RTEMS_INVALID_CLOCK;
   }
 
+  clk_hi = clk_div - clk_lo;
+
   i2c->clk_lo = clk_lo;
   i2c->clk_hi = clk_hi;