diff options
author | Muralidharan Karicheri <m-karicheri2@ti.com> | 2010-01-13 18:27:08 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 13:10:45 -0500 |
commit | 77c8b5fb0ee6e367332167eaa26470d843596270 (patch) | |
tree | a0c2da16cd8be786d4e7c974bd34e97154f73a0b /arch/arm/mach-davinci/dm644x.c | |
parent | 8d1b5946bf53b2593e633caba2330863838b7bf7 (diff) |
V4L/DVB: vpfe-capture: converting ccdc drivers to platform-drivers
This adds platform code for ccdc driver on DM355 and DM6446.
1) new ccdc platform devices added
2) added clock aliases master and slave for CCDC clocks
3) added dm355_ccdc_setup_pinmux() pin-mux setup hook in dm355 ccdc driver platform data
Reviewed-by: Vaibhav Hiremath <hvaibhav@ti.com>
Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com>
Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Muralidharan Karicheri <m-karicheri2@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'arch/arm/mach-davinci/dm644x.c')
-rw-r--r-- | arch/arm/mach-davinci/dm644x.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 2cd008156dea..92aeb5600680 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c | |||
@@ -612,6 +612,11 @@ static struct resource vpfe_resources[] = { | |||
612 | .end = IRQ_VDINT1, | 612 | .end = IRQ_VDINT1, |
613 | .flags = IORESOURCE_IRQ, | 613 | .flags = IORESOURCE_IRQ, |
614 | }, | 614 | }, |
615 | }; | ||
616 | |||
617 | static u64 vpfe_capture_dma_mask = DMA_BIT_MASK(32); | ||
618 | static struct resource dm644x_ccdc_resource[] = { | ||
619 | /* CCDC Base address */ | ||
615 | { | 620 | { |
616 | .start = 0x01c70400, | 621 | .start = 0x01c70400, |
617 | .end = 0x01c70400 + 0xff, | 622 | .end = 0x01c70400 + 0xff, |
@@ -619,7 +624,17 @@ static struct resource vpfe_resources[] = { | |||
619 | }, | 624 | }, |
620 | }; | 625 | }; |
621 | 626 | ||
622 | static u64 vpfe_capture_dma_mask = DMA_BIT_MASK(32); | 627 | static struct platform_device dm644x_ccdc_dev = { |
628 | .name = "dm644x_ccdc", | ||
629 | .id = -1, | ||
630 | .num_resources = ARRAY_SIZE(dm644x_ccdc_resource), | ||
631 | .resource = dm644x_ccdc_resource, | ||
632 | .dev = { | ||
633 | .dma_mask = &vpfe_capture_dma_mask, | ||
634 | .coherent_dma_mask = DMA_BIT_MASK(32), | ||
635 | }, | ||
636 | }; | ||
637 | |||
623 | static struct platform_device vpfe_capture_dev = { | 638 | static struct platform_device vpfe_capture_dev = { |
624 | .name = CAPTURE_DRV_NAME, | 639 | .name = CAPTURE_DRV_NAME, |
625 | .id = -1, | 640 | .id = -1, |
@@ -769,9 +784,13 @@ static int __init dm644x_init_devices(void) | |||
769 | if (!cpu_is_davinci_dm644x()) | 784 | if (!cpu_is_davinci_dm644x()) |
770 | return 0; | 785 | return 0; |
771 | 786 | ||
787 | /* Add ccdc clock aliases */ | ||
788 | clk_add_alias("master", dm644x_ccdc_dev.name, "vpss_master", NULL); | ||
789 | clk_add_alias("slave", dm644x_ccdc_dev.name, "vpss_slave", NULL); | ||
772 | platform_device_register(&dm644x_edma_device); | 790 | platform_device_register(&dm644x_edma_device); |
773 | platform_device_register(&dm644x_emac_device); | 791 | platform_device_register(&dm644x_emac_device); |
774 | platform_device_register(&dm644x_vpss_device); | 792 | platform_device_register(&dm644x_vpss_device); |
793 | platform_device_register(&dm644x_ccdc_dev); | ||
775 | platform_device_register(&vpfe_capture_dev); | 794 | platform_device_register(&vpfe_capture_dev); |
776 | 795 | ||
777 | return 0; | 796 | return 0; |