Merge remote-tracking branch 'scott/next' into next

Merge Freescale updates

2 files changed, 16 insertions, 0 deletions

diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index 3823623baa48..9e6002108720 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -338,6 +338,14 @@ static int cpm_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
         tptr = 0;
         rptr = 0;
 
+        /*
+         * If there was a collision in the last i2c transaction,
+         * Set I2COM_MASTER as it was cleared during collision.
+         */
+        if (in_be16(&tbdf->cbd_sc) & BD_SC_CL) {
+                out_8(&cpm->i2c_reg->i2com, I2COM_MASTER);
+        }
+
         while (tptr < num) {
                 pmsg = &msgs[tptr];
                 dev_dbg(&adap->dev, "R: %d T: %d\n", rptr, tptr);
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
index a8dbceb32914..f1b8d555080e 100644
--- a/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@ -138,6 +138,14 @@ static void __booke_wdt_enable(void *data)
         val &= ~WDTP_MASK;
         val |= (TCR_WIE|TCR_WRC(WRC_CHIP)|WDTP(booke_wdt_period));
 
+#ifdef CONFIG_PPC_BOOK3E_64
+        /*
+         * Crit ints are currently broken on PPC64 Book-E, so
+         * just disable them for now.
+         */
+        val &= ~TCR_WIE;
+#endif
+
         mtspr(SPRN_TCR, val);
 }