nand:remove compile warnings and add error handle.

diff --git a/arch/arm/mach-rockchip/rknandbase.c b/arch/arm/mach-rockchip/rknandbase.c
index 3aad71266a92b1c77f610aa0888b1d27af2a9dc1..f70cdcaa047d3bd3c98b87efd820b8cd6931f64e 100755 (executable)
--- a/arch/arm/mach-rockchip/rknandbase.c
+++ b/arch/arm/mach-rockchip/rknandbase.c
@@ -7,6 +7,7 @@
 #include <linux/interrupt.h>\r
 #include <linux/bootmem.h>\r
 #include <asm/io.h>\r
+#include <asm/cacheflush.h>\r
 #include <linux/platform_device.h>\r
 #include <linux/semaphore.h>\r
 #include <linux/clk.h>\r
@@ -136,28 +137,36 @@ int rk_nand_get_device(struct rknand_info ** prknand_Info)
 }\r
 EXPORT_SYMBOL(rk_nand_get_device);\r
 \r
-int rknand_dma_map_single(unsigned long ptr,int size,int dir)\r
+unsigned long rknand_dma_flush_dcache(unsigned long ptr,int size,int dir)\r
 {\r
-    return dma_map_single(NULL, ptr,size, dir?DMA_TO_DEVICE:DMA_FROM_DEVICE);\r
+     __cpuc_flush_dcache_area((void*)ptr, size + 63);\r
+    return ((unsigned long )virt_to_phys((void *)ptr));\r
+}\r
+EXPORT_SYMBOL(rknand_dma_flush_dcache);\r
+\r
+unsigned long rknand_dma_map_single(unsigned long ptr,int size,int dir)\r
+{\r
+    return dma_map_single(NULL,(void*)ptr,size, dir?DMA_TO_DEVICE:DMA_FROM_DEVICE);\r
 }\r
 EXPORT_SYMBOL(rknand_dma_map_single);\r
 \r
 void rknand_dma_unmap_single(unsigned long ptr,int size,int dir)\r
 {\r
-    dma_unmap_single(NULL, ptr,size, dir?DMA_TO_DEVICE:DMA_FROM_DEVICE);\r
+    dma_unmap_single(NULL, (dma_addr_t)ptr,size, dir?DMA_TO_DEVICE:DMA_FROM_DEVICE);\r
 }\r
 EXPORT_SYMBOL(rknand_dma_unmap_single);\r
 \r
 int rknand_flash_cs_init(int id)\r
 {\r
-\r
+    return 0;\r
 }\r
 EXPORT_SYMBOL(rknand_flash_cs_init);\r
 \r
 int rknand_get_reg_addr(int *pNandc0,int *pNandc1,int *pSDMMC0,int *pSDMMC1,int *pSDMMC2)\r
 {\r
-       *pNandc0 = g_nandc_info[0].reg_base;\r
-       *pNandc1 = g_nandc_info[1].reg_base;\r
+       *pNandc0 = (int)g_nandc_info[0].reg_base;\r
+       *pNandc1 = (int)g_nandc_info[1].reg_base;\r
+       return 0;\r
 }\r
 EXPORT_SYMBOL(rknand_get_reg_addr);\r
 \r
@@ -166,11 +175,11 @@ int rknand_nandc_irq_init(int id,int mode,void * pfun)
     int ret = 0;\r
     int irq= g_nandc_info[id].irq;\r
 \r
-    if(mode) //init\r
+    if(mode)\r
     {\r
         ret = request_irq(irq, pfun, 0, "nandc", g_nandc_info[id].reg_base);\r
         //if(ret)\r
-            printk("request IRQ_NANDC %x irq %x, ret=%x.........\n",id,irq, ret);\r
+        //printk("request IRQ_NANDC %x irq %x, ret=%x.........\n",id,irq, ret);\r
     }\r
     else //deinit\r
     {\r
@@ -186,17 +195,21 @@ static int rknand_probe(struct platform_device *pdev)
        int irq ;\r
        struct resource         *mem;\r
        void __iomem    *membase;\r
-       \r
+\r
+    if(gpNandInfo == NULL)\r
+    {\r
+        gpNandInfo = kzalloc(sizeof(struct rknand_info), GFP_KERNEL);\r
+        if (!gpNandInfo)\r
+            return -ENOMEM;\r
+       }\r
        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);\r
        membase = devm_request_and_ioremap(&pdev->dev, mem);\r
-\r
-    irq = platform_get_irq(pdev, 0);\r
-       printk("nand irq: %d\n",irq);\r
-       if (irq < 0) {\r
-               dev_err(&pdev->dev, "no irq resource?\n");\r
-               return irq;\r
+       if (membase == 0) \r
+       {\r
+               dev_err(&pdev->dev, "no reg resource?\n");\r
+               return -1;\r
        }\r
-\r
+       //printk("rknand_probe %d %x %x\n", pdev->id,(int)mem,(int)membase);\r
 #ifdef CONFIG_OF\r
        if(0==of_property_read_u32(pdev->dev.of_node, "nandc_id", &id))\r
        {\r
@@ -204,14 +217,22 @@ static int rknand_probe(struct platform_device *pdev)
        }\r
     pdev->id = id;\r
 #endif\r
-       printk("rknand_probe %d %x\n", pdev->id,mem);\r
-       \r
-       if(id == 0)\r
+    if(id == 0)\r
        {\r
         memcpy(vendor0,membase+0x1400,0x200);\r
         memcpy(sn_data,membase+0x1600,0x200);\r
        }\r
+       else if(id >= 2)\r
+       {\r
+               dev_err(&pdev->dev, "nandc id = %d error!\n",id);\r
+       }\r
 \r
+    irq = platform_get_irq(pdev, 0);\r
+       //printk("nand irq: %d\n",irq);\r
+       if (irq < 0) {\r
+               dev_err(&pdev->dev, "no irq resource?\n");\r
+               return irq;\r
+       }\r
     g_nandc_info[id].id = id;\r
     g_nandc_info[id].irq = irq;\r
     g_nandc_info[id].reg_base = membase;\r
@@ -234,21 +255,26 @@ static int rknand_probe(struct platform_device *pdev)
        clk_prepare_enable( g_nandc_info[id].clk );\r
        clk_prepare_enable( g_nandc_info[id].hclk);\r
        clk_prepare_enable( g_nandc_info[id].gclk);\r
-\r
        return 0;\r
 }\r
 \r
 static int rknand_suspend(struct platform_device *pdev, pm_message_t state)\r
 {\r
     if(gpNandInfo->rknand_suspend)\r
-        gpNandInfo->rknand_suspend();  \r
+    {\r
+        gpNandInfo->rknand_suspend();\r
+        //TODO:nandc clk disable\r
+       }\r
        return 0;\r
 }\r
 \r
 static int rknand_resume(struct platform_device *pdev)\r
 {\r
     if(gpNandInfo->rknand_resume)\r
+    {\r
+       //TODO:nandc clk enable\r
        gpNandInfo->rknand_resume();  \r
+       }\r
        return 0;\r
 }\r
 \r
@@ -303,11 +329,9 @@ static int __init rknand_part_init(void)
 \r
        cmdline = strstr(saved_command_line, "mtdparts=") + 9;\r
 \r
-       gpNandInfo = kzalloc(sizeof(struct rknand_info), GFP_KERNEL);\r
-       if (!gpNandInfo)\r
-               return -ENOMEM;\r
-    //memset(gpNandInfo,0,sizeof(struct rknand_info));// no need\r
-    \r
+       gpNandInfo = NULL;\r
+    memset(g_nandc_info,0,sizeof(g_nandc_info));\r
+\r
        ret = platform_driver_register(&rknand_driver);\r
        printk("rknand_driver:ret = %x \n",ret);\r
        return ret;\r