OSDN Git Service

dma: mpc512x: separate 'compatible' values for MPC512x and MPC8308
authorAlexander Popov <a13xp0p0v88@gmail.com>
Wed, 23 Apr 2014 13:53:24 +0000 (17:53 +0400)
committerVinod Koul <vinod.koul@intel.com>
Fri, 2 May 2014 17:06:21 +0000 (22:36 +0530)
MPC512x and MPC8308 have similar DMA controllers, but are independent SoCs.
DMA controller driver should have separate 'compatible' values for these SoCs.

Signed-off-by: Alexander Popov <a13xp0p0v88@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
arch/powerpc/boot/dts/mpc8308_p1m.dts
arch/powerpc/boot/dts/mpc8308rdb.dts
drivers/dma/mpc512x_dma.c

index 651e4f5..57f86cd 100644 (file)
                };
 
                dma@2c000 {
-                       compatible = "fsl,mpc8308-dma", "fsl,mpc5121-dma";
+                       compatible = "fsl,mpc8308-dma";
                        reg = <0x2c000 0x1800>;
                        interrupts = <3 0x8
                                        94 0x8>;
index 9ce45f2..d0211f0 100644 (file)
                };
 
                dma@2c000 {
-                       compatible = "fsl,mpc8308-dma", "fsl,mpc5121-dma";
+                       compatible = "fsl,mpc8308-dma";
                        reg = <0x2c000 0x1800>;
                        interrupts = <3 0x8
                                        94 0x8>;
index 2ce248b..0b17f4d 100644 (file)
@@ -815,6 +815,7 @@ static int mpc_dma_remove(struct platform_device *op)
 
 static struct of_device_id mpc_dma_match[] = {
        { .compatible = "fsl,mpc5121-dma", },
+       { .compatible = "fsl,mpc8308-dma", },
        {},
 };