rk29: rename dmac2 to dmac1 as TRM

diff --git a/arch/arm/mach-rk29/dma.c b/arch/arm/mach-rk29/dma.c
index 4a6dec0e0e5f2c92408249c725fe4b909a0ebfaf..da53b2562419a75bdc1489b546e641a08264ce18 100755 (executable)
--- a/arch/arm/mach-rk29/dma.c
+++ b/arch/arm/mach-rk29/dma.c
@@ -54,20 +54,20 @@ static struct platform_device rk29_device_dmac0 = {
        },
 };
 
-static struct resource rk29_dmac2_resource[] = {
+static struct resource rk29_dmac1_resource[] = {
        [0] = {
-               .start  = RK29_DMA2_PHYS,
-               .end    = RK29_DMA2_PHYS + RK29_DMA2_SIZE - 1,
+               .start  = RK29_DMAC1_PHYS,
+               .end    = RK29_DMAC1_PHYS + RK29_DMAC1_SIZE - 1,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = IRQ_DMAC2_0,
-               .end    = IRQ_DMAC2_0,
+               .start  = IRQ_DMAC1_0,
+               .end    = IRQ_DMAC1_0,
                .flags  = IORESOURCE_IRQ,
        },
 };
 
-static struct rk29_pl330_platdata rk29_dmac2_pdata = {
+static struct rk29_pl330_platdata rk29_dmac1_pdata = {
        .peri = {
                [0] = DMACH_HSADC,
                [1] = DMACH_SDMMC,
@@ -89,21 +89,21 @@ static struct rk29_pl330_platdata rk29_dmac2_pdata = {
        },
 };
 
-static struct platform_device rk29_device_dmac2 = {
+static struct platform_device rk29_device_dmac1 = {
        .name           = "rk29-pl330",
        .id             = 1,
-       .num_resources  = ARRAY_SIZE(rk29_dmac2_resource),
-       .resource       = rk29_dmac2_resource,
+       .num_resources  = ARRAY_SIZE(rk29_dmac1_resource),
+       .resource       = rk29_dmac1_resource,
        .dev            = {
                .dma_mask = &dma_dmamask,
                .coherent_dma_mask = DMA_BIT_MASK(32),
-               .platform_data = &rk29_dmac2_pdata,
+               .platform_data = &rk29_dmac1_pdata,
        },
 };
 
 static struct platform_device *rk29_dmacs[] __initdata = {
        &rk29_device_dmac0,
-       &rk29_device_dmac2,
+       &rk29_device_dmac1,
 };
 
 static int __init rk29_dma_init(void)

diff --git a/arch/arm/mach-rk29/include/mach/irqs.h b/arch/arm/mach-rk29/include/mach/irqs.h
index 73810bf57473e5052ef05a8c54e2746d82ea2497..c2516fdea500afcb14156dccd779ded077ae75dc 100644 (file)
--- a/arch/arm/mach-rk29/include/mach/irqs.h
+++ b/arch/arm/mach-rk29/include/mach/irqs.h
@@ -24,11 +24,11 @@
 #define IRQ_DMAC0_2     RK29XX_IRQ(2)
 #define IRQ_DMAC0_3     RK29XX_IRQ(3)
 
-#define IRQ_DMAC2_0     RK29XX_IRQ(4)
-#define IRQ_DMAC2_1     RK29XX_IRQ(5)
-#define IRQ_DMAC2_2     RK29XX_IRQ(6)
-#define IRQ_DMAC2_3     RK29XX_IRQ(7)
-#define IRQ_DMAC2_4     RK29XX_IRQ(8)
+#define IRQ_DMAC1_0     RK29XX_IRQ(4)
+#define IRQ_DMAC1_1     RK29XX_IRQ(5)
+#define IRQ_DMAC1_2     RK29XX_IRQ(6)
+#define IRQ_DMAC1_3     RK29XX_IRQ(7)
+#define IRQ_DMAC1_4     RK29XX_IRQ(8)
 
 #define IRQ_GPU         RK29XX_IRQ(9)
 #define IRQ_VEPU        RK29XX_IRQ(10)

diff --git a/arch/arm/mach-rk29/include/mach/rk29_iomap.h b/arch/arm/mach-rk29/include/mach/rk29_iomap.h
index 281354566d7209f5523d04b8c401df407ef79639..940bb9736c2972c8ce5053fba4313e4bd367e3b2 100644 (file)
--- a/arch/arm/mach-rk29/include/mach/rk29_iomap.h
+++ b/arch/arm/mach-rk29/include/mach/rk29_iomap.h
@@ -171,8 +171,8 @@
 #define RK29_SPI0_SIZE                         SZ_16K
 #define RK29_SPI1_PHYS                         0x20074000
 #define RK29_SPI1_SIZE                         SZ_16K
-#define RK29_DMA2_PHYS                         0x20078000
-#define RK29_DMA2_SIZE                         SZ_16K
+#define RK29_DMAC1_PHYS                                0x20078000
+#define RK29_DMAC1_SIZE                                SZ_16K
 #define RK29_SMC_PHYS                          0x2007C000
 #define RK29_SMC_SIZE                          SZ_16K
 #define RK29_GPIO1_BASE                                (RK29_ADDR_BASE1+0x80000)

diff --git a/arch/arm/mach-rk29/rk29-pl330.c b/arch/arm/mach-rk29/rk29-pl330.c
index 9c1f2d03143a29a7a8639a01affd751d7c938cc3..df9902004e3d35070d9ddf631de99bd1e7eb3b81 100644 (file)
--- a/arch/arm/mach-rk29/rk29-pl330.c
+++ b/arch/arm/mach-rk29/rk29-pl330.c
@@ -1082,23 +1082,23 @@ static int pl330_probe(struct platform_device *pdev)
                        dev_name(&pdev->dev), pl330_info);
 
         if(pdev->id == 0){
-                request_irq(IRQ_DMAC0_1, pl330_irq_handler, 0,
-                       dev_name(&pdev->dev), pl330_info);
-               request_irq(IRQ_DMAC0_2, pl330_irq_handler, 0,
-                       dev_name(&pdev->dev), pl330_info);
-               request_irq(IRQ_DMAC0_3, pl330_irq_handler, 0,
-                       dev_name(&pdev->dev), pl330_info);
+               WARN_ON(request_irq(IRQ_DMAC0_1, pl330_irq_handler, 0,
+                                   dev_name(&pdev->dev), pl330_info) < 0);
+               WARN_ON(request_irq(IRQ_DMAC0_2, pl330_irq_handler, 0,
+                                   dev_name(&pdev->dev), pl330_info) < 0);
+               WARN_ON(request_irq(IRQ_DMAC0_3, pl330_irq_handler, 0,
+                                   dev_name(&pdev->dev), pl330_info) < 0);
         }
 
         if(pdev->id == 1){
-                request_irq(IRQ_DMAC2_1, pl330_irq_handler, 0,
-                       dev_name(&pdev->dev), pl330_info);
-               request_irq(IRQ_DMAC2_2, pl330_irq_handler, 0,
-                       dev_name(&pdev->dev), pl330_info);
-               request_irq(IRQ_DMAC2_3, pl330_irq_handler, 0,
-                       dev_name(&pdev->dev), pl330_info);
-               request_irq(IRQ_DMAC2_4, pl330_irq_handler, 0,
-                       dev_name(&pdev->dev), pl330_info);
+               WARN_ON(request_irq(IRQ_DMAC1_1, pl330_irq_handler, 0,
+                                   dev_name(&pdev->dev), pl330_info) < 0);
+               WARN_ON(request_irq(IRQ_DMAC1_2, pl330_irq_handler, 0,
+                                   dev_name(&pdev->dev), pl330_info) < 0);
+               WARN_ON(request_irq(IRQ_DMAC1_3, pl330_irq_handler, 0,
+                                   dev_name(&pdev->dev), pl330_info) < 0);
+               WARN_ON(request_irq(IRQ_DMAC1_4, pl330_irq_handler, 0,
+                                   dev_name(&pdev->dev), pl330_info) < 0);
         }
                        
        if (ret)