mxc_nand: Update driver to work with i.MX31.

[karo-tx-uboot.git] / drivers / mtd / at45.c

diff --git a/drivers/mtd/at45.c b/drivers/mtd/at45.c
index dac987a43a569891943531b6325d540c35c5cf0f..d1a60aac90b38495dee178265cd951fd80692d72 100644 (file)
--- a/drivers/mtd/at45.c
+++ b/drivers/mtd/at45.c
@@ -20,8 +20,6 @@
 
 #include <config.h>
 #include <common.h>
-
-#ifdef CONFIG_HAS_DATAFLASH
 #include <dataflash.h>
 
 /*
@@ -140,8 +138,8 @@ AT91S_DataFlashStatus AT91F_DataFlashWaitReady(AT91PS_DataflashDesc
 }
 
 /*--------------------------------------------------------------------------*/
-/* Function Name       : AT91F_DataFlashContinuousRead                             */
-/* Object              : Continuous stream Read                            */
+/* Function Name       : AT91F_DataFlashContinuousRead                     */
+/* Object              : Continuous stream Read                            */
 /* Input Parameters    : DataFlash Service                                 */
 /*                                             : <src> = dataflash address */
 /*                     : <*dataBuffer> = data buffer pointer               */
@@ -205,7 +203,7 @@ AT91S_DataFlashStatus AT91F_DataFlashPagePgmBuf(AT91PS_DataFlash pDataFlash,
 /* Object              : Read a page in the SRAM Buffer 1 or 2              */
 /* Input Parameters    : DataFlash Service                                  */
 /*                     : Page concerned                                             */
-/*                     :                                                    */
+/*                     :                                                    */
 /* Return value                : State of the dataflash                             */
 /*---------------------------------------------------------------------------*/
 AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfert(
@@ -303,10 +301,10 @@ AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer(
 
 /*---------------------------------------------------------------------------*/
 /* Function Name       : AT91F_PageErase                                     */
-/* Object              : Erase a page                                       */
+/* Object              : Erase a page                                       */
 /* Input Parameters    : DataFlash Service                                  */
 /*                     : Page concerned                                             */
-/*                     :                                                    */
+/*                     :                                                    */
 /* Return value                : State of the dataflash                             */
 /*---------------------------------------------------------------------------*/
 AT91S_DataFlashStatus AT91F_PageErase(
@@ -328,10 +326,10 @@ AT91S_DataFlashStatus AT91F_PageErase(
 
 /*---------------------------------------------------------------------------*/
 /* Function Name       : AT91F_BlockErase                                    */
-/* Object              : Erase a Block                                              */
+/* Object              : Erase a Block                                      */
 /* Input Parameters    : DataFlash Service                                  */
 /*                     : Page concerned                                             */
-/*                     :                                                    */
+/*                     :                                                    */
 /* Return value                : State of the dataflash                             */
 /*---------------------------------------------------------------------------*/
 AT91S_DataFlashStatus AT91F_BlockErase(
@@ -510,10 +508,10 @@ AT91S_DataFlashStatus AT91F_DataFlashWrite(AT91PS_DataFlash pDataFlash,
 }
 
 /*---------------------------------------------------------------------------*/
-/* Function Name       : AT91F_DataFlashRead                                */
+/* Function Name       : AT91F_DataFlashRead                                */
 /* Object              : Read a block in dataflash                          */
-/* Input Parameters    :                                                    */
-/* Return value                :                                                    */
+/* Input Parameters    :                                                    */
+/* Return value                :                                                    */
 /*---------------------------------------------------------------------------*/
 int AT91F_DataFlashRead(AT91PS_DataFlash pDataFlash,
                        unsigned long addr, unsigned long size, char *buffer)
@@ -548,9 +546,9 @@ int AT91F_DataFlashRead(AT91PS_DataFlash pDataFlash,
 }
 
 /*---------------------------------------------------------------------------*/
-/* Function Name       : AT91F_DataflashProbe                               */
-/* Object              :                                                    */
-/* Input Parameters    :                                                    */
+/* Function Name       : AT91F_DataflashProbe                               */
+/* Object              :                                                    */
+/* Input Parameters    :                                                    */
 /* Return value               : Dataflash status register                           */
 /*---------------------------------------------------------------------------*/
 int AT91F_DataflashProbe(int cs, AT91PS_DataflashDesc pDesc)
@@ -559,4 +557,3 @@ int AT91F_DataflashProbe(int cs, AT91PS_DataflashDesc pDesc)
        AT91F_DataFlashGetStatus(pDesc);
        return ((pDesc->command[1] == 0xFF) ? 0 : pDesc->command[1] & 0x3C);
 }
-#endif