dma: mpc512x: separate 'compatible' values for MPC512x and MPC8308

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>

diff --git a/arch/powerpc/boot/dts/mpc8308_p1m.dts b/arch/powerpc/boot/dts/mpc8308_p1m.dts
index 651e4f55acdbf6f6187b1792315c780f127effde..57f86cdf9f36e4fcde7f844731bfa3047be45d0a 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8308_p1m.dts
+++ b/arch/powerpc/boot/dts/mpc8308_p1m.dts
@@ -296,7 +296,7 @@ ipic-msi@7c0 {
                };
 
                dma@2c000 {
-                       compatible = "fsl,mpc8308-dma", "fsl,mpc5121-dma";
+                       compatible = "fsl,mpc8308-dma";
                        reg = <0x2c000 0x1800>;
                        interrupts = <3 0x8
                                        94 0x8>;

diff --git a/arch/powerpc/boot/dts/mpc8308rdb.dts b/arch/powerpc/boot/dts/mpc8308rdb.dts
index 9ce45f2efd34907014d8b228823cb0d6d3254ead..d0211f0413c6469d71cd6feda3d59b5630e174a8 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8308rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8308rdb.dts
@@ -265,7 +265,7 @@ ipic-msi@7c0 {
                };
 
                dma@2c000 {
-                       compatible = "fsl,mpc8308-dma", "fsl,mpc5121-dma";
+                       compatible = "fsl,mpc8308-dma";
                        reg = <0x2c000 0x1800>;
                        interrupts = <3 0x8
                                        94 0x8>;

diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c
index 2ce248b552dcc7caf5587338049db9b483dc0e88..0b17f4db1908c91e2c5761c294da7ec1447952cd 100644 (file)
--- a/drivers/dma/mpc512x_dma.c
+++ b/drivers/dma/mpc512x_dma.c
@@ -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", },
        {},
 };