diff options
author | Alexander Popov <a13xp0p0v88@gmail.com> | 2014-04-23 09:53:24 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2014-05-02 13:06:21 -0400 |
commit | 62057d3375a5237c24f1dee82cb6c860081cc4ff (patch) | |
tree | 7530cf69fd4a5af5f0cae09be95f1ecbf4703d88 | |
parent | 78a4f0367a1de89c625237fc5524f4ef4535f031 (diff) |
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>
-rw-r--r-- | arch/powerpc/boot/dts/mpc8308_p1m.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8308rdb.dts | 2 | ||||
-rw-r--r-- | drivers/dma/mpc512x_dma.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc8308_p1m.dts b/arch/powerpc/boot/dts/mpc8308_p1m.dts index 651e4f55acdb..57f86cdf9f36 100644 --- a/arch/powerpc/boot/dts/mpc8308_p1m.dts +++ b/arch/powerpc/boot/dts/mpc8308_p1m.dts | |||
@@ -296,7 +296,7 @@ | |||
296 | }; | 296 | }; |
297 | 297 | ||
298 | dma@2c000 { | 298 | dma@2c000 { |
299 | compatible = "fsl,mpc8308-dma", "fsl,mpc5121-dma"; | 299 | compatible = "fsl,mpc8308-dma"; |
300 | reg = <0x2c000 0x1800>; | 300 | reg = <0x2c000 0x1800>; |
301 | interrupts = <3 0x8 | 301 | interrupts = <3 0x8 |
302 | 94 0x8>; | 302 | 94 0x8>; |
diff --git a/arch/powerpc/boot/dts/mpc8308rdb.dts b/arch/powerpc/boot/dts/mpc8308rdb.dts index 9ce45f2efd34..d0211f0413c6 100644 --- a/arch/powerpc/boot/dts/mpc8308rdb.dts +++ b/arch/powerpc/boot/dts/mpc8308rdb.dts | |||
@@ -265,7 +265,7 @@ | |||
265 | }; | 265 | }; |
266 | 266 | ||
267 | dma@2c000 { | 267 | dma@2c000 { |
268 | compatible = "fsl,mpc8308-dma", "fsl,mpc5121-dma"; | 268 | compatible = "fsl,mpc8308-dma"; |
269 | reg = <0x2c000 0x1800>; | 269 | reg = <0x2c000 0x1800>; |
270 | interrupts = <3 0x8 | 270 | interrupts = <3 0x8 |
271 | 94 0x8>; | 271 | 94 0x8>; |
diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c index 2ce248b552dc..0b17f4db1908 100644 --- 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) | |||
815 | 815 | ||
816 | static struct of_device_id mpc_dma_match[] = { | 816 | static struct of_device_id mpc_dma_match[] = { |
817 | { .compatible = "fsl,mpc5121-dma", }, | 817 | { .compatible = "fsl,mpc5121-dma", }, |
818 | { .compatible = "fsl,mpc8308-dma", }, | ||
818 | {}, | 819 | {}, |
819 | }; | 820 | }; |
820 | 821 | ||