mmc: atmel_sdhci: Enable the quirk SDHCI_QUIRK_WAIT_SEND_CMD

[platform/kernel/u-boot.git] / arch / powerpc / cpu / mpc8xx / i2c.c

diff --git a/arch/powerpc/cpu/mpc8xx/i2c.c b/arch/powerpc/cpu/mpc8xx/i2c.c
index 2f8b139..54d5cb5 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/i2c.c
+++ b/arch/powerpc/cpu/mpc8xx/i2c.c
@@ -12,14 +12,12 @@
  */
 
 #include <common.h>
+#include <console.h>
 
 #ifdef CONFIG_HARD_I2C
 
 #include <commproc.h>
 #include <i2c.h>
-#ifdef CONFIG_LWMON
-#include <watchdog.h>
-#endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -192,17 +190,7 @@ void i2c_init(int speed, int slaveaddr)
        iip->iic_rpbase = 0;
 #endif
 
-#ifdef CONFIG_SYS_ALLOC_DPRAM
-       dpaddr = iip->iic_rbase;
-       if (dpaddr == 0) {
-               /* need to allocate dual port ram */
-               dpaddr = dpram_alloc_align((NUM_RX_BDS * sizeof(I2C_BD)) +
-                                          (NUM_TX_BDS * sizeof(I2C_BD)) +
-                                          MAX_TX_SPACE, 8);
-       }
-#else
        dpaddr = CPM_I2C_BASE;
-#endif
 
        /*
         * initialise data in dual port ram:
@@ -591,10 +579,6 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
        uchar xaddr[4];
        int rc;
 
-#ifdef CONFIG_LWMON
-       WATCHDOG_RESET();
-#endif
-
        xaddr[0] = (addr >> 24) & 0xFF;
        xaddr[1] = (addr >> 16) & 0xFF;
        xaddr[2] = (addr >> 8) & 0xFF;