diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-04-25 14:37:35 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:02:49 +0200 |
| commit | 3ad49e1ee6da097da6972b4a17cc0b973c068978 (patch) | |
| tree | e40cb793bc3cacdf26751445a9c4867db0298ca6 | |
| parent | b6189f922ccf6f08d91ceee87af031e9170eae60 (diff) | |
ux500: dma: Give parent device to dma initialization
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/dma-db8500.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/setup.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 52fc036bc8e..ac7c4df4996 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -245,7 +245,7 @@ struct device * __init u8500_init_devices(void) #endif parent = db8500_soc_device_init(); - db8500_dma_init(); + db8500_dma_init(parent); db8500_add_rtc(parent); db8500_add_usb(parent, usb_db8500_rx_dma_cfg, usb_db8500_tx_dma_cfg); diff --git a/arch/arm/mach-ux500/dma-db8500.c b/arch/arm/mach-ux500/dma-db8500.c index 17c4c80de33..d4363e2efb1 100644 --- a/arch/arm/mach-ux500/dma-db8500.c +++ b/arch/arm/mach-ux500/dma-db8500.c @@ -301,10 +301,11 @@ static struct platform_device dma40_device = { .resource = dma40_resources }; -void __init db8500_dma_init(void) +void __init db8500_dma_init(struct device *parent) { int ret; + dma40_device.dev.parent = parent; ret = platform_device_register(&dma40_device); if (ret) dev_err(&dma40_device.dev, "unable to register device: %d\n", diff --git a/arch/arm/mach-ux500/include/mach/setup.h b/arch/arm/mach-ux500/include/mach/setup.h index 1998b84b50a..5caffc97e36 100644 --- a/arch/arm/mach-ux500/include/mach/setup.h +++ b/arch/arm/mach-ux500/include/mach/setup.h @@ -28,7 +28,7 @@ extern void __init ux500_init_irq(void); extern void __init u5500_sdi_init(struct device *parent); extern void __init db5500_dma_init(struct device *parent); -extern void __init db8500_dma_init(void); +extern void __init db8500_dma_init(struct device *parent); extern struct device *ux500_soc_device_init(const char *soc_id); |