>> CLK(NULL, "rto", &rto_clk),
>> CLK(NULL, "usb", &usb_clk),
>> + CLK("dm355_ccdc", "master", &vpss_master_clk),
>> + CLK("dm355_ccdc", "slave", &vpss_slave_clk),
>
>I still don't understand why you have to add new entries here and
>can't simply rename the existing CLK nodes using vpss_*_clk.
>
[MK] This will allow multiple drivers define their own clocks derived from
these. ccdc driver is not the only driver using these clocks. Your earlier
suggestion was to use as follows :-
- CLK(NULL, "vpss_master", &vpss_master_clk),
- CLK(NULL, "vpss_slave", &vpss_slave_clk),
+ CLK("vpfe-capture", "master", &vpss_master_clk),
+ CLK("vpfe-capture", "slave", &vpss_slave_clk),
I am not sure if the following will work so that it can be used across
multiple drivers.
+ CLK(NULL, "master", &vpss_master_clk),
+ CLK(NULL, "slave", &vpss_slave_clk),
If yes, I can re-do this patch. Please confirm.
>Same comment for dm644x.c changes.
>
>Kevin
>
>> CLK(NULL, NULL, NULL),
>> };
>>
>> @@ -665,6 +667,17 @@ static struct platform_device dm355_asp1_device = {
>> .resource = dm355_asp1_resources,
>> };
>>
>> +static void dm355_ccdc_setup_pinmux(void)
>> +{
>> + davinci_cfg_reg(DM355_VIN_PCLK);
>> + davinci_cfg_reg(DM355_VIN_CAM_WEN);
>> + davinci_cfg_reg(DM355_VIN_CAM_VD);
>> + davinci_cfg_reg(DM355_VIN_CAM_HD);
>> + davinci_cfg_reg(DM355_VIN_YIN_EN);
>> + davinci_cfg_reg(DM355_VIN_CINL_EN);
>> + davinci_cfg_reg(DM355_VIN_CINH_EN);
>> +}
>> +
>> static struct resource dm355_vpss_resources[] = {
>> {
>> /* VPSS BL Base address */
>> @@ -701,6 +714,10 @@ static struct resource vpfe_resources[] = {
>> .end = IRQ_VDINT1,
>> .flags = IORESOURCE_IRQ,
>> },
>> +};
>> +
>> +static u64 vpfe_capture_dma_mask = DMA_BIT_MASK(32);
>> +static struct resource dm355_ccdc_resource[] = {
>> /* CCDC Base address */
>> {
>> .flags = IORESOURCE_MEM,
>> @@ -708,8 +725,18 @@ static struct resource vpfe_resources[] = {
>> .end = 0x01c70600 + 0x1ff,
>> },
>> };
>> +static struct platform_device dm355_ccdc_dev = {
>> + .name = "dm355_ccdc",
>> + .id = -1,
>> + .num_resources = ARRAY_SIZE(dm355_ccdc_resource),
>> + .resource = dm355_ccdc_resource,
>> + .dev = {
>> + .dma_mask = &vpfe_capture_dma_mask,
>> + .coherent_dma_mask = DMA_BIT_MASK(32),
>> + .platform_data = dm355_ccdc_setup_pinmux,
>> + },
>> +};
>>
>> -static u64 vpfe_capture_dma_mask = DMA_BIT_MASK(32);
>> static struct platform_device vpfe_capture_dev = {
>> .name = CAPTURE_DRV_NAME,
>> .id = -1,
>> @@ -860,17 +887,7 @@ static int __init dm355_init_devices(void)
>> davinci_cfg_reg(DM355_INT_EDMA_CC);
>> platform_device_register(&dm355_edma_device);
>> platform_device_register(&dm355_vpss_device);
>> - /*
>> - * setup Mux configuration for vpfe input and register
>> - * vpfe capture platform device
>> - */
>> - davinci_cfg_reg(DM355_VIN_PCLK);
>> - davinci_cfg_reg(DM355_VIN_CAM_WEN);
>> - davinci_cfg_reg(DM355_VIN_CAM_VD);
>> - davinci_cfg_reg(DM355_VIN_CAM_HD);
>> - davinci_cfg_reg(DM355_VIN_YIN_EN);
>> - davinci_cfg_reg(DM355_VIN_CINL_EN);
>> - davinci_cfg_reg(DM355_VIN_CINH_EN);
>> + platform_device_register(&dm355_ccdc_dev);
>> platform_device_register(&vpfe_capture_dev);
>>
>> return 0;
>> diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-
>davinci/dm644x.c
>> index e65e29e..e5f1ee9 100644
>> --- a/arch/arm/mach-davinci/dm644x.c
>> +++ b/arch/arm/mach-davinci/dm644x.c
>> @@ -315,6 +315,8 @@ struct davinci_clk dm644x_clks[] = {
>> CLK(NULL, "timer0", &timer0_clk),
>> CLK(NULL, "timer1", &timer1_clk),
>> CLK("watchdog", NULL, &timer2_clk),
>> + CLK("dm644x_ccdc", "master", &vpss_master_clk),
>> + CLK("dm644x_ccdc", "slave", &vpss_slave_clk),
>> CLK(NULL, NULL, NULL),
>> };
>>
>> @@ -612,6 +614,11 @@ static struct resource vpfe_resources[] = {
>> .end = IRQ_VDINT1,
>> .flags = IORESOURCE_IRQ,
>> },
>> +};
>> +
>> +static u64 vpfe_capture_dma_mask = DMA_BIT_MASK(32);
>> +static struct resource dm644x_ccdc_resource[] = {
>> + /* CCDC Base address */
>> {
>> .start = 0x01c70400,
>> .end = 0x01c70400 + 0xff,
>> @@ -619,7 +626,17 @@ static struct resource vpfe_resources[] = {
>> },
>> };
>>
>> -static u64 vpfe_capture_dma_mask = DMA_BIT_MASK(32);
>> +static struct platform_device dm644x_ccdc_dev = {
>> + .name = "dm644x_ccdc",
>> + .id = -1,
>> + .num_resources = ARRAY_SIZE(dm644x_ccdc_resource),
>> + .resource = dm644x_ccdc_resource,
>> + .dev = {
>> + .dma_mask = &vpfe_capture_dma_mask,
>> + .coherent_dma_mask = DMA_BIT_MASK(32),
>> + },
>> +};
>> +
>> static struct platform_device vpfe_capture_dev = {
>> .name = CAPTURE_DRV_NAME,
>> .id = -1,
>> @@ -772,6 +789,7 @@ static int __init dm644x_init_devices(void)
>> platform_device_register(&dm644x_edma_device);
>> platform_device_register(&dm644x_emac_device);
>> platform_device_register(&dm644x_vpss_device);
>> + platform_device_register(&dm644x_ccdc_dev);
>> platform_device_register(&vpfe_capture_dev);
>>
>> return 0;
>> --
>> 1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
