modify filename

diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index 9208746b8f9a5c5050fb04e4f7ada23be35645c0..7d71dbb9f9eba66aca42c826c5ec39cf120290d3 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -229,7 +229,7 @@ struct platform_device rk29_device_fb = {
        }
 };
 
-struct platform_device rk29_device_Dma_cpy = {
+struct platform_device rk29_device_dma_cpy = {
        .name             = "dma_memcpy",
        .id               = 4,
 
@@ -1443,7 +1443,7 @@ static struct platform_device *devices[] __initdata = {
 
 #ifdef CONFIG_FB_RK29
        &rk29_device_fb,
-       &rk29_device_Dma_cpy,
+       &rk29_device_dma_cpy,
 #endif
 #ifdef CONFIG_BACKLIGHT_RK29_BL
        &rk29_device_backlight,

diff --git a/arch/arm/mach-rk29/devices.h b/arch/arm/mach-rk29/devices.h
index b8637fb5c1f3977c34b7eb8f74381a94effdcb24..b6e2c8033524ad880602089a3e44fee0ab8e1313 100755 (executable)
--- a/arch/arm/mach-rk29/devices.h
+++ b/arch/arm/mach-rk29/devices.h
@@ -40,7 +40,7 @@ extern struct platform_device rk29xx_device_spi1m;
 extern struct rk29xx_spi_platform_data rk29xx_spi0_platdata;
 extern struct rk29xx_spi_platform_data rk29xx_spi1_platdata;
 extern struct platform_device rk29_device_fb;
-extern struct platform_device rk29_device_Dma_cpy;
+extern struct platform_device rk29_device_dma_cpy;
 extern struct platform_device rk29_device_nand;
 extern struct platform_device rk29xx_device_nand;
 extern struct rk29_sdmmc_platform_data default_sdmmc0_data;

diff --git a/arch/arm/mach-rk29/dma.c b/arch/arm/mach-rk29/dma.c
index 35c0e77467b07325c1ee21ce39371ebd839bd314..5799662ca1dff3152609da546d87c547db80e30b 100755 (executable)
--- a/arch/arm/mach-rk29/dma.c
+++ b/arch/arm/mach-rk29/dma.c
@@ -30,7 +30,7 @@ static struct rk29_pl330_platdata rk29_dmac0_pdata = {
                [4] = DMACH_I2S_2CH_TX,
                [5] = DMACH_I2S_2CH_RX,
                [6] = DMACH_SPDIF,
-        [7] = DMACH_DMAC0_MemToMem,
+        [7] = DMACH_DMAC0_MEMTOMEM,
                [8] = DMACH_MAX,
                [9] = DMACH_MAX,
                [10] = DMACH_MAX,

diff --git a/arch/arm/mach-rk29/include/mach/rk29-dma-pl330.h b/arch/arm/mach-rk29/include/mach/rk29-dma-pl330.h
index 8443d554335b32c4ab628fb38fb2e623b305df17..1b5dae882d4970cb063239d9d2cb92a06c8051d9 100755 (executable)
--- a/arch/arm/mach-rk29/include/mach/rk29-dma-pl330.h
+++ b/arch/arm/mach-rk29/include/mach/rk29-dma-pl330.h
@@ -46,7 +46,7 @@ enum dma_ch {
        DMACH_SPI1_TX,
        DMACH_SPI1_RX,
        DMACH_PID_FILTER,
-    DMACH_DMAC0_MemToMem,
+    DMACH_DMAC0_MEMTOMEM,
        /* END Marker, also used to denote a reserved channel */
        DMACH_MAX,
 };

diff --git a/arch/arm/mach-rk29/memcpy_dma.c b/arch/arm/mach-rk29/memcpy_dma.c
index 6cd496b6dd60e3e04aa5b0a59ccf69a92b1e5d44..da17f9018256adbeb667732a5de07ad23feea719 100755 (executable)
--- a/arch/arm/mach-rk29/memcpy_dma.c
+++ b/arch/arm/mach-rk29/memcpy_dma.c
@@ -15,7 +15,7 @@
 static DECLARE_WAIT_QUEUE_HEAD(wq);\r
 static int wq_condition = 0;\r
 \r
-static struct rk29_dma_client rk29_dma_Memcpy_client = {\r
+static struct rk29_dma_client rk29_dma_memcpy_client = {\r
         .name = "rk29-dma-memcpy",\r
 };\r
 \r
@@ -34,13 +34,13 @@ static void rk29_dma_memcpy_callback(struct rk29_dma_chan *dma_ch, void *buf_id,
 }\r
 \r
 //int slecount = 0;\r
-static ssize_t Memcpy_Dma_read(struct device *device,struct device_attribute *attr, void *argv)\r
+static ssize_t memcpy_dma_read(struct device *device,struct device_attribute *attr, void *argv)\r
 {\r
 \r
      return 0;\r
 }\r
 \r
-static ssize_t Memcpy_Dma_write (struct device *device,struct device_attribute *attr, void *argv)//(struct device_driver *device, const char *argv,size_t count)\r
+static ssize_t memcpy_dma_write (struct device *device,struct device_attribute *attr, void *argv)//(struct device_driver *device, const char *argv,size_t count)\r
 {\r
     int dma_flag;\r
     u32 mcode_sbus;\r
@@ -53,8 +53,8 @@ static ssize_t Memcpy_Dma_write (struct device *device,struct device_attribute *
     struct Dma_MemToMem  *DmaMemInfo = (struct Dma_MemToMem *)argv;\r
 \r
 \r
-    dma_flag = rk29_dma_request(DMACH_DMAC0_MemToMem, &rk29_dma_Memcpy_client, NULL);           \r
-    dma_flag = DMACH_DMAC0_MemToMem;\r
+    dma_flag = rk29_dma_request(DMACH_DMAC0_MEMTOMEM, &rk29_dma_memcpy_client, NULL);           \r
+    dma_flag = DMACH_DMAC0_MEMTOMEM;\r
 \r
     rt = rk29_dma_devconfig(dma_flag, RK29_DMASRC_MEMTOMEM, DmaMemInfo->SrcAddr);\r
     rt = rk29_dma_config(dma_flag, 8);\r
@@ -62,18 +62,18 @@ static ssize_t Memcpy_Dma_write (struct device *device,struct device_attribute *
     rt = rk29_dma_enqueue(dma_flag, NULL, DmaMemInfo->DstAddr, DmaMemInfo->MenSize);\r
     rt = rk29_dma_ctrl(dma_flag, RK29_DMAOP_START);    \r
     wait_event_interruptible_timeout(wq, wq_condition, HZ/20);\r
-    wq_condition = 0; \r
+    wq_condition = 0;  \r
     return 0;\r
 }\r
 \r
-static DRIVER_ATTR(DmaMemcpy,  S_IRUGO|S_IALLUGO, Memcpy_Dma_read, Memcpy_Dma_write);\r
+static DRIVER_ATTR(dmamemcpy,  S_IRUGO|S_IALLUGO, memcpy_dma_read, memcpy_dma_write);\r
 \r
 \r
 static int __init dma_memcpy_probe(struct platform_device *pdev)\r
 {\r
     int ret;\r
       \r
-    ret = device_create_file(&pdev->dev, &driver_attr_DmaMemcpy);\r
+    ret = device_create_file(&pdev->dev, &driver_attr_dmamemcpy);\r
     if(ret)\r
     {\r
         printk(">> fb1 dsp win0 info device_create_file err\n");\r
@@ -86,7 +86,7 @@ static int __init dma_memcpy_probe(struct platform_device *pdev)
 static int  dma_memcpy_remove(struct platform_device *pdev)\r
 {\r
     int ret;\r
-    driver_remove_file(&pdev->dev, &driver_attr_DmaMemcpy);\r
+    driver_remove_file(&pdev->dev, &driver_attr_dmamemcpy);\r
   \r
     return 0;\r
 }\r