evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: davinci: dm644x: fix inconsistent variable naming

Browse source 
Add dm644x_ prefix to names of v4l2 variables in dm644x.c
Add dm644xevm_ prefix to names of v4l2 variables in board-dm644x-evm.c.

This makes the code consistent with rest of these files.

Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
This commit is contained in:
Manjunath Hadli 2011-12-21 19:13:38 +05:30 • committed by Sekhar Nori
parent 51f31cb3a2
commit 314d738960
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
arch/arm/mach-davinci/board-dm644x-evm.c
View file

@ -190,7 +190,7 @@ static struct platform_device davinci_fb_device = {
.num_resources = 0, .num_resources = 0,
}; };
static struct tvp514x_platform_data tvp5146_pdata = { static struct tvp514x_platform_data dm644xevm_tvp5146_pdata = {
.clk_polarity = 0, .clk_polarity = 0,
.hs_polarity = 1, .hs_polarity = 1,
.vs_polarity = 1 .vs_polarity = 1
@ -198,7 +198,7 @@ static struct tvp514x_platform_data tvp5146_pdata = {
#define TVP514X_STD_ALL (V4L2_STD_NTSC | V4L2_STD_PAL) #define TVP514X_STD_ALL (V4L2_STD_NTSC | V4L2_STD_PAL)
/* Inputs available at the TVP5146 */ /* Inputs available at the TVP5146 */
static struct v4l2_input tvp5146_inputs[] = { static struct v4l2_input dm644xevm_tvp5146_inputs[] = {
{ {
.index = 0, .index = 0,
.name = "Composite", .name = "Composite",
@ -218,7 +218,7 @@ static struct v4l2_input tvp5146_inputs[] = {
* ouput that goes to vpfe. There is a one to one correspondence * ouput that goes to vpfe. There is a one to one correspondence
* with tvp5146_inputs * with tvp5146_inputs
*/ */
static struct vpfe_route tvp5146_routes[] = { static struct vpfe_route dm644xevm_tvp5146_routes[] = {
{ {
.input = INPUT_CVBS_VI2B, .input = INPUT_CVBS_VI2B,
.output = OUTPUT_10BIT_422_EMBEDDED_SYNC, .output = OUTPUT_10BIT_422_EMBEDDED_SYNC,
@ -229,13 +229,13 @@ static struct vpfe_route tvp5146_routes[] = {
}, },
}; };
static struct vpfe_subdev_info vpfe_sub_devs[] = { static struct vpfe_subdev_info dm644xevm_vpfe_sub_devs[] = {
{ {
.name = "tvp5146", .name = "tvp5146",
.grp_id = 0, .grp_id = 0,
.num_inputs = ARRAY_SIZE(tvp5146_inputs), .num_inputs = ARRAY_SIZE(dm644xevm_tvp5146_inputs),
.inputs = tvp5146_inputs, .inputs = dm644xevm_tvp5146_inputs,
.routes = tvp5146_routes, .routes = dm644xevm_tvp5146_routes,
.can_route = 1, .can_route = 1,
.ccdc_if_params = { .ccdc_if_params = {
.if_type = VPFE_BT656, .if_type = VPFE_BT656,
@ -244,15 +244,15 @@ static struct vpfe_subdev_info vpfe_sub_devs[] = {
}, },
.board_info = { .board_info = {
I2C_BOARD_INFO("tvp5146", 0x5d), I2C_BOARD_INFO("tvp5146", 0x5d),
.platform_data = &tvp5146_pdata, .platform_data = &dm644xevm_tvp5146_pdata,
}, },
}, },
}; };
static struct vpfe_config vpfe_cfg = { static struct vpfe_config dm644xevm_capture_cfg = {
.num_subdevs = ARRAY_SIZE(vpfe_sub_devs), .num_subdevs = ARRAY_SIZE(dm644xevm_vpfe_sub_devs),
.i2c_adapter_id = 1, .i2c_adapter_id = 1,
.sub_devs = vpfe_sub_devs, .sub_devs = dm644xevm_vpfe_sub_devs,
.card_name = "DM6446 EVM", .card_name = "DM6446 EVM",
.ccdc = "DM6446 CCDC", .ccdc = "DM6446 CCDC",
}; };
@ -626,7 +626,7 @@ static void __init
davinci_evm_map_io(void) davinci_evm_map_io(void)
{ {
/* setup input configuration for VPFE input devices */ /* setup input configuration for VPFE input devices */
dm644x_set_vpfe_config(&vpfe_cfg); dm644x_set_vpfe_config(&dm644xevm_capture_cfg);
dm644x_init(); dm644x_init();
} }

12
arch/arm/mach-davinci/dm644x.c
View file

@ -614,7 +614,7 @@ static struct platform_device dm644x_vpss_device = {
.resource = dm644x_vpss_resources, .resource = dm644x_vpss_resources,
}; };
static struct resource vpfe_resources[] = { static struct resource dm644x_vpfe_resources[] = {
{ {
.start = IRQ_VDINT0, .start = IRQ_VDINT0,
.end = IRQ_VDINT0, .end = IRQ_VDINT0,
@ -648,11 +648,11 @@ static struct platform_device dm644x_ccdc_dev = {
}, },
}; };
static struct platform_device vpfe_capture_dev = { static struct platform_device dm644x_vpfe_dev = {
.name = CAPTURE_DRV_NAME, .name = CAPTURE_DRV_NAME,
.id = -1, .id = -1,
.num_resources = ARRAY_SIZE(vpfe_resources), .num_resources = ARRAY_SIZE(dm644x_vpfe_resources),
.resource = vpfe_resources, .resource = dm644x_vpfe_resources,
.dev = { .dev = {
.dma_mask = &vpfe_capture_dma_mask, .dma_mask = &vpfe_capture_dma_mask,
.coherent_dma_mask = DMA_BIT_MASK(32), .coherent_dma_mask = DMA_BIT_MASK(32),
@ -661,7 +661,7 @@ static struct platform_device vpfe_capture_dev = {
void dm644x_set_vpfe_config(struct vpfe_config *cfg) void dm644x_set_vpfe_config(struct vpfe_config *cfg)
{ {
vpfe_capture_dev.dev.platform_data = cfg; dm644x_vpfe_dev.dev.platform_data = cfg;
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
@ -808,7 +808,7 @@ static int __init dm644x_init_devices(void)
platform_device_register(&dm644x_vpss_device); platform_device_register(&dm644x_vpss_device);
platform_device_register(&dm644x_ccdc_dev); platform_device_register(&dm644x_ccdc_dev);
platform_device_register(&vpfe_capture_dev); platform_device_register(&dm644x_vpfe_dev);
return 0; return 0;
} }