ARM: DRA7x/AM57x: Add MMC/SD fixups for rev1.0 and rev 1.1

[people/ms/u-boot.git] / cmd / fdc.c

diff --git a/cmd/fdc.c b/cmd/fdc.c
index 5766b5650b6a64d9dc2f81ceaa99bc48fba1cb71..d2281abbda90e92dee738c709e11027a36f202eb 100644 (file)
--- a/cmd/fdc.c
+++ b/cmd/fdc.c
@@ -189,7 +189,7 @@ int wait_for_fdc_int(void)
        while((read_fdc_reg(FDC_SRA)&0x80)==0) {
                timeout--;
                udelay(10);
-               if(timeout==0) /* timeout occured */
+               if(timeout==0) /* timeout occurred */
                        return false;
        }
        return true;
@@ -205,7 +205,7 @@ int read_fdc_byte(void)
                /* direction out and ready */
                udelay(10);
                timeout--;
-               if(timeout==0) /* timeout occured */
+               if(timeout==0) /* timeout occurred */
                        return -1;
        }
        return read_fdc_reg(FDC_FIFO);
@@ -235,7 +235,7 @@ int write_fdc_byte(unsigned char val)
                timeout--;
                udelay(10);
                fdc_need_more_output();
-               if(timeout==0) /* timeout occured */
+               if(timeout==0) /* timeout occurred */
                        return false;
        }
        write_fdc_reg(FDC_FIFO,val);
@@ -395,7 +395,7 @@ int fdc_terminate(FDC_COMMAND_STRUCT *pCMD)
        int i;
        for(i=0;i<100;i++)
                udelay(500); /* wait 500usec for fifo overrun */
-       while((read_fdc_reg(FDC_SRA)&0x80)==0x00); /* wait as long as no int has occured */
+       while((read_fdc_reg(FDC_SRA)&0x80)==0x00); /* wait as long as no int has occurred */
        for(i=0;i<7;i++) {
                pCMD->result[i]=(unsigned char)read_fdc_byte();
        }
@@ -459,7 +459,7 @@ retryrw:
                                        break;
                                }
                                if((c&0xC0)==0x80) { /* output */
-                                       PRINTF("Transfer error transfered: at %ld, MSR=%02X\n",i,c);
+                                       PRINTF("Transfer error transferred: at %ld, MSR=%02X\n",i,c);
                                        if(i>6) {
                                                for(ii=0;ii<7;ii++) {
                                                        pCMD->result[ii]=bufferw[(i-7+ii)];