diff options
| author |   Shawn Guo <shawn.guo@linaro.org> | 2012-09-15 21:11:28 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-15 10:03:17 +0800 |
| commit | e51d0f0ac4b7f513808743c6a62f0387eebd0144 (patch) | |
| tree | 1efe37ce7bf87694ea8c79fe06256b131db5658d /arch/arm/mach-imx/clk-imx1.c | |
| parent | dma: imx-dma: retrieve MEM and IRQ from resources (diff) | |
| download | linux-dev-e51d0f0ac4b7f513808743c6a62f0387eebd0144.tar.xz linux-dev-e51d0f0ac4b7f513808743c6a62f0387eebd0144.zip | |
dma: imx-dma: remove cpu_is_xxx by using platform_device_id
It changes the driver to use platform_device_id rather than cpu_is_xxx
to determine the controller type, and updates the platform code
accordingly.
As the result, mach/hardware.h inclusion gets removed from the driver.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Javier Martin <javier.martin@vista-silicon.com>
Cc: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'arch/arm/mach-imx/clk-imx1.c')
| -rw-r--r-- | arch/arm/mach-imx/clk-imx1.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk-imx1.c b/arch/arm/mach-imx/clk-imx1.c index 1cc7a735ed19..49a74440bc48 100644 --- a/arch/arm/mach-imx/clk-imx1.c +++ b/arch/arm/mach-imx/clk-imx1.c @@ -83,7 +83,8 @@ int __init mx1_clocks_init(unsigned long fref) pr_err("imx1 clk %d: register failed with %ld\n", i, PTR_ERR(clk[i])); - clk_register_clkdev(clk[dma_gate], "ahb", "imx-dma"); + clk_register_clkdev(clk[dma_gate], "ahb", "imx1-dma"); + clk_register_clkdev(clk[hclk], "ipg", "imx1-dma"); clk_register_clkdev(clk[csi_gate], NULL, "mx1-camera.0"); clk_register_clkdev(clk[mma_gate], "mma", NULL); clk_register_clkdev(clk[usbd_gate], NULL, "imx_udc.0"); |