diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-12-27 05:23:09 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-05 03:16:08 -0500 |
commit | 0851d50dc12a844778a9b243e141f713cd8f074f (patch) | |
tree | 97ad0f8e1cf23ddfe12bf1f0574e905a1a85910d /arch/arm/mach-shmobile/board-ap4evb.c | |
parent | 236782a5f3674d06865d822092b8a1ea65a44f96 (diff) |
ARM: mach-shmobile: improve MIPI DSI clock configuration
Now, that the MIPI DSI driver implements runtime PM, we don't need anymore to
configure clocks statically in the platform code. This patch also adds a DSITX1
clock definition for sh7372 and attaches PHY clocks to respective devices.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/mach-shmobile/board-ap4evb.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-ap4evb.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index 2f8c83703572..87f9ee9eda41 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c | |||
@@ -526,44 +526,6 @@ static struct platform_device mipidsi0_device = { | |||
526 | }, | 526 | }, |
527 | }; | 527 | }; |
528 | 528 | ||
529 | /* This function will disappear when we switch to (runtime) PM */ | ||
530 | static int __init ap4evb_init_display_clk(void) | ||
531 | { | ||
532 | struct clk *lcdc_clk; | ||
533 | struct clk *dsitx_clk; | ||
534 | int ret; | ||
535 | |||
536 | lcdc_clk = clk_get(&lcdc_device.dev, "sh_mobile_lcdc_fb.0"); | ||
537 | if (IS_ERR(lcdc_clk)) | ||
538 | return PTR_ERR(lcdc_clk); | ||
539 | |||
540 | dsitx_clk = clk_get(&mipidsi0_device.dev, "sh-mipi-dsi.0"); | ||
541 | if (IS_ERR(dsitx_clk)) { | ||
542 | ret = PTR_ERR(dsitx_clk); | ||
543 | goto eclkdsitxget; | ||
544 | } | ||
545 | |||
546 | ret = clk_enable(lcdc_clk); | ||
547 | if (ret < 0) | ||
548 | goto eclklcdcon; | ||
549 | |||
550 | ret = clk_enable(dsitx_clk); | ||
551 | if (ret < 0) | ||
552 | goto eclkdsitxon; | ||
553 | |||
554 | return 0; | ||
555 | |||
556 | eclkdsitxon: | ||
557 | clk_disable(lcdc_clk); | ||
558 | eclklcdcon: | ||
559 | clk_put(dsitx_clk); | ||
560 | eclkdsitxget: | ||
561 | clk_put(lcdc_clk); | ||
562 | |||
563 | return ret; | ||
564 | } | ||
565 | device_initcall(ap4evb_init_display_clk); | ||
566 | |||
567 | static struct platform_device *qhd_devices[] __initdata = { | 529 | static struct platform_device *qhd_devices[] __initdata = { |
568 | &mipidsi0_device, | 530 | &mipidsi0_device, |
569 | &keysc_device, | 531 | &keysc_device, |