From ca53147d486c9999549d984d4996f9b84a85734c Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Wed, 30 Mar 2011 11:21:34 +0800 Subject: [PATCH] rk29: rename dmac2 to dmac1 as TRM --- arch/arm/mach-rk29/dma.c | 22 +++++++-------- arch/arm/mach-rk29/include/mach/irqs.h | 10 +++---- arch/arm/mach-rk29/include/mach/rk29_iomap.h | 4 +-- arch/arm/mach-rk29/rk29-pl330.c | 28 ++++++++++---------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/arch/arm/mach-rk29/dma.c b/arch/arm/mach-rk29/dma.c index 4a6dec0e0e5f..da53b2562419 100755 --- 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 73810bf57473..c2516fdea500 100644 --- 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 281354566d72..940bb9736c29 100644 --- 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 9c1f2d03143a..df9902004e3d 100644 --- 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) -- 2.34.1