Merge with git://www.denx.de/git/u-boot.git

[u-boot] / board / innokom / innokom.c

diff --git a/board/innokom/innokom.c b/board/innokom/innokom.c
index 0176d9c2c336abd6dd53d0e0107ae8bea0d12b94..7f8f47c3a2ef7338acf9d60fc70a50d9bf61523a 100644 (file)
--- a/board/innokom/innokom.c
+++ b/board/innokom/innokom.c
@@ -27,6 +27,8 @@
 #include <asm/arch/pxa-regs.h>
 #include <asm/mach-types.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #ifdef CONFIG_SHOW_BOOT_PROGRESS
 # define SHOW_BOOT_PROGRESS(arg)        show_boot_progress(arg)
 #else
@@ -39,20 +41,28 @@
  * The Innokom board has GPIO70 connected to SCLK which can be toggled
  * until all chips think that their current cycles are finished.
  */
-void i2c_init_board(void)
+int i2c_init_board(void)
 {
-       int i;
+       int i, icr;
+
+       /* disable I2C controller first, otherwhise it thinks we want to    */
+       /* talk to the slave port...                                        */
+       icr = ICR; ICR &= ~(ICR_SCLE | ICR_IUE);
 
-       /* set gpio pin to output */
-        GPDR(70) |= GPIO_bit(70);
-       for (i = 0; i < 11; i++) {
-               GPCR(70) = GPIO_bit(70);
+       /* set gpio pin low _before_ we change direction to output          */
+       GPCR(70) = GPIO_bit(70);
+
+       /* now toggle between output=low and high-impedance                 */
+       for (i = 0; i < 20; i++) {
+               GPDR(70) |= GPIO_bit(70);  /* output */
                udelay(10);
-               GPSR(70)  = GPIO_bit(70);
+               GPDR(70) &= ~GPIO_bit(70); /* input  */
                udelay(10);
        }
-        /* set gpio pin to input */
-        GPDR(70) &= ~GPIO_bit(70);
+
+       ICR = icr;
+
+       return 0;
 }
 
 
@@ -87,16 +97,12 @@ int misc_init_r(void)
 
 int board_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /* memory and cpu-speed are setup before relocation */
        /* so we do _nothing_ here */
 
-       /* arch number of Innokom board */
        gd->bd->bi_arch_number = MACH_TYPE_INNOKOM;
-
-       /* adress of boot parameters */
        gd->bd->bi_boot_params = 0xa0000100;
+       gd->bd->bi_baudrate = CONFIG_BAUDRATE;
 
        return 0;
 }
@@ -110,8 +116,6 @@ int board_init (void)
 
 int dram_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
 
@@ -138,18 +142,18 @@ void innokom_set_led(int led, int state)
                        break;
 
                case 1: if (state==1) {
-                                GPCR0 |= CSB226_USER_LED1;
-                        } else if (state==0) {
-                                GPSR0 |= CSB226_USER_LED1;
-                        }
-                        break;
+                               GPCR0 |= CSB226_USER_LED1;
+                       } else if (state==0) {
+                               GPSR0 |= CSB226_USER_LED1;
+                       }
+                       break;
 
                case 2: if (state==1) {
-                                GPCR0 |= CSB226_USER_LED2;
-                        } else if (state==0) {
-                                GPSR0 |= CSB226_USER_LED2;
-                        }
-                        break;
+                               GPCR0 |= CSB226_USER_LED2;
+                       } else if (state==0) {
+                               GPSR0 |= CSB226_USER_LED2;
+                       }
+                       break;
 */
        }
 
@@ -178,4 +182,3 @@ void show_boot_progress (int status)
 
        return;
 }
-