Merge commit 'origin'

Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h

1 files changed, 16 insertions, 9 deletions

diff --git a/drivers/media/video/cx18/cx18-av-firmware.c b/drivers/media/video/cx18/cx18-av-firmware.c
index e996a4e3123a..522a035b2e8f 100644
--- a/drivers/media/video/cx18/cx18-av-firmware.c
+++ b/drivers/media/video/cx18/cx18-av-firmware.c
@@ -20,6 +20,7 @@
  */
 
 #include "cx18-driver.h"
+#include "cx18-io.h"
 #include <linux/firmware.h>
 
 #define CX18_AUDIO_ENABLE 0xc72014
@@ -49,7 +50,7 @@ int cx18_av_loadfw(struct cx18 *cx)
                 cx18_av_write4(cx, 0x8100, 0x00010000);
 
                 /* Put the 8051 in reset and enable firmware upload */
-                cx18_av_write4(cx, CXADEC_DL_CTL, 0x0F000000);
+                cx18_av_write4_noretry(cx, CXADEC_DL_CTL, 0x0F000000);
 
                 ptr = fw->data;
                 size = fw->size;
@@ -58,22 +59,28 @@ int cx18_av_loadfw(struct cx18 *cx)
                         u32 dl_control = 0x0F000000 | i | ((u32)ptr[i] << 16);
                         u32 value = 0;
                         int retries2;
+                        int unrec_err = 0;
 
-                        for (retries2 = 0; retries2 < 5; retries2++) {
-                                cx18_av_write4(cx, CXADEC_DL_CTL, dl_control);
+                        for (retries2 = 0; retries2 < CX18_MAX_MMIO_RETRIES;
+                             retries2++) {
+                                cx18_av_write4_noretry(cx, CXADEC_DL_CTL,
+                                                       dl_control);
                                 udelay(10);
-                                value = cx18_av_read4(cx, CXADEC_DL_CTL);
+                                value = cx18_av_read4_noretry(cx,
+                                                              CXADEC_DL_CTL);
                                 if (value == dl_control)
                                         break;
                                 /* Check if we can correct the byte by changing
                                    the address.  We can only write the lower
                                    address byte of the address. */
                                 if ((value & 0x3F00) != (dl_control & 0x3F00)) {
-                                        retries2 = 5;
+                                        unrec_err = 1;
                                         break;
                                 }
                         }
-                        if (retries2 >= 5)
+                        cx18_log_write_retries(cx, retries2,
+                                        cx->reg_mem + 0xc40000 + CXADEC_DL_CTL);
+                        if (unrec_err || retries2 >= CX18_MAX_MMIO_RETRIES)
                                 break;
                 }
                 if (i == size)
@@ -119,10 +126,10 @@ int cx18_av_loadfw(struct cx18 *cx)
            have a name in the spec. */
         cx18_av_write4(cx, 0x09CC, 1);
 
-        v = read_reg(CX18_AUDIO_ENABLE);
-        /* If bit 11 is 1 */
+        v = cx18_read_reg(cx, CX18_AUDIO_ENABLE);
+        /* If bit 11 is 1, clear bit 10 */
         if (v & 0x800)
-                write_reg(v & 0xFFFFFBFF, CX18_AUDIO_ENABLE); /* Clear bit 10 */
+                cx18_write_reg(cx, v & 0xFFFFFBFF, CX18_AUDIO_ENABLE);
 
         /* Enable WW auto audio standard detection */
         v = cx18_av_read4(cx, CXADEC_STD_DET_CTL);