aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/86xx
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2010-05-03 16:54:15 -0500
committerKumar Gala <galak@kernel.crashing.org>2010-05-17 10:55:33 -0500
commit4c5ddd52695f7bac6362ad13fd3dc878212d1368 (patch)
tree95ccf0d8f5a11eef09600fe0866a5c43e08f77cb /arch/powerpc/platforms/86xx
parent6971df4f5b0e5b6955c03e8d51bad5d50463f98f (diff)
downloadkernel_samsung_aries-4c5ddd52695f7bac6362ad13fd3dc878212d1368.zip
kernel_samsung_aries-4c5ddd52695f7bac6362ad13fd3dc878212d1368.tar.gz
kernel_samsung_aries-4c5ddd52695f7bac6362ad13fd3dc878212d1368.tar.bz2
powerpc/8610: add probing for individual DMA channels, not just DMA controllers
A future version of the MPC8610 HPCD's ASoC DMA driver will probe on individual DMA channel nodes, so the DMA controller nodes' compatible string must be listed in mpc8610_ids[] for the probe to work. Also remove the "gianfar" compatible from mpc8610_ids[], since there is no gianfar (or any other networking device) on the 8610. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/86xx')
-rw-r--r--arch/powerpc/platforms/86xx/mpc8610_hpcd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index 5abe137..018cc67 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -83,7 +83,8 @@ static struct of_device_id __initdata mpc8610_ids[] = {
{ .compatible = "fsl,mpc8610-immr", },
{ .compatible = "fsl,mpc8610-guts", },
{ .compatible = "simple-bus", },
- { .compatible = "gianfar", },
+ /* So that the DMA channel nodes can be probed individually: */
+ { .compatible = "fsl,eloplus-dma", },
{}
};