Add I2C frequency dividers for ColdFire

[oweals/u-boot.git] / board / apollon / apollon.c

diff --git a/board/apollon/apollon.c b/board/apollon/apollon.c
index 064d143ae485d5dff82774376546f328112e20c7..8efa7039512b29fa428a2b7bb95abaf9ad79a73e 100644 (file)
--- a/board/apollon/apollon.c
+++ b/board/apollon/apollon.c
@@ -140,7 +140,7 @@ void wait_for_command_complete(unsigned int wd_base)
 /*******************************************************************
  * Routine:ether_init
  * Description: take the Ethernet controller out of reset and wait
- *                for the EEPROM load to complete.
+ *                for the EEPROM load to complete.
  ******************************************************************/
 void ether_init(void)
 {
@@ -153,10 +153,8 @@ void ether_init(void)
        do {
                __raw_writew(0x1, LAN_RESET_REGISTER);
                udelay(100);
-               if (cnt == 0) {
-                       printf("1. eth reset err\n");
+               if (cnt == 0)
                        goto eth_reset_err_out;
-               }
                --cnt;
        } while (__raw_readw(LAN_RESET_REGISTER) != 0x1);
 
@@ -165,10 +163,8 @@ void ether_init(void)
        do {
                __raw_writew(0x0, LAN_RESET_REGISTER);
                udelay(100);
-               if (cnt == 0) {
-                       printf("2. eth reset err\n");
+               if (cnt == 0)
                        goto eth_reset_err_out;
-               }
                --cnt;
        } while (__raw_readw(LAN_RESET_REGISTER) != 0x0000);
        udelay(1000);
@@ -440,7 +436,8 @@ void muxSetupTouchScreen(void)
 void muxSetupGPMC(void)
 {
        /* gpmc_io_dir, MCR */
-       writel(0x4800008C, 0x19000000);
+       volatile unsigned int *MCR = (unsigned int *) 0x4800008C;
+       *MCR = 0x19000000;
 
        /* NOR FLASH CS0 */
        /* signal - Gpmc_clk; pin - J4; offset - 0x0088; mode 0; Byte-3 */