aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci
diff options
context:
space:
mode:
authorManjunath Hadli <manjunath.hadli@ti.com>2011-12-21 08:43:38 -0500
committerSekhar Nori <nsekhar@ti.com>2012-02-24 16:10:22 -0500
commit314d7389608831202f5b445d9154e30161935630 (patch)
treefd4495203b830fe560ea5c03fd73c56941028217 /arch/arm/mach-davinci
parent51f31cb3a22da0fdae69052a98d976fb4ff5857d (diff)
ARM: davinci: dm644x: fix inconsistent variable naming
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>
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r--arch/arm/mach-davinci/board-dm644x-evm.c24
-rw-r--r--arch/arm/mach-davinci/dm644x.c12
2 files changed, 18 insertions, 18 deletions
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index fb8b6bb42cc9..14dd390f6da8 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -190,7 +190,7 @@ static struct platform_device davinci_fb_device = {
190 .num_resources = 0, 190 .num_resources = 0,
191}; 191};
192 192
193static struct tvp514x_platform_data tvp5146_pdata = { 193static struct tvp514x_platform_data dm644xevm_tvp5146_pdata = {
194 .clk_polarity = 0, 194 .clk_polarity = 0,
195 .hs_polarity = 1, 195 .hs_polarity = 1,
196 .vs_polarity = 1 196 .vs_polarity = 1
@@ -198,7 +198,7 @@ static struct tvp514x_platform_data tvp5146_pdata = {
198 198
199#define TVP514X_STD_ALL (V4L2_STD_NTSC | V4L2_STD_PAL) 199#define TVP514X_STD_ALL (V4L2_STD_NTSC | V4L2_STD_PAL)
200/* Inputs available at the TVP5146 */ 200/* Inputs available at the TVP5146 */
201static struct v4l2_input tvp5146_inputs[] = { 201static struct v4l2_input dm644xevm_tvp5146_inputs[] = {
202 { 202 {
203 .index = 0, 203 .index = 0,
204 .name = "Composite", 204 .name = "Composite",
@@ -218,7 +218,7 @@ static struct v4l2_input tvp5146_inputs[] = {
218 * ouput that goes to vpfe. There is a one to one correspondence 218 * ouput that goes to vpfe. There is a one to one correspondence
219 * with tvp5146_inputs 219 * with tvp5146_inputs
220 */ 220 */
221static struct vpfe_route tvp5146_routes[] = { 221static struct vpfe_route dm644xevm_tvp5146_routes[] = {
222 { 222 {
223 .input = INPUT_CVBS_VI2B, 223 .input = INPUT_CVBS_VI2B,
224 .output = OUTPUT_10BIT_422_EMBEDDED_SYNC, 224 .output = OUTPUT_10BIT_422_EMBEDDED_SYNC,
@@ -229,13 +229,13 @@ static struct vpfe_route tvp5146_routes[] = {
229 }, 229 },
230}; 230};
231 231
232static struct vpfe_subdev_info vpfe_sub_devs[] = { 232static struct vpfe_subdev_info dm644xevm_vpfe_sub_devs[] = {
233 { 233 {
234 .name = "tvp5146", 234 .name = "tvp5146",
235 .grp_id = 0, 235 .grp_id = 0,
236 .num_inputs = ARRAY_SIZE(tvp5146_inputs), 236 .num_inputs = ARRAY_SIZE(dm644xevm_tvp5146_inputs),
237 .inputs = tvp5146_inputs, 237 .inputs = dm644xevm_tvp5146_inputs,
238 .routes = tvp5146_routes, 238 .routes = dm644xevm_tvp5146_routes,
239 .can_route = 1, 239 .can_route = 1,
240 .ccdc_if_params = { 240 .ccdc_if_params = {
241 .if_type = VPFE_BT656, 241 .if_type = VPFE_BT656,
@@ -244,15 +244,15 @@ static struct vpfe_subdev_info vpfe_sub_devs[] = {
244 }, 244 },
245 .board_info = { 245 .board_info = {
246 I2C_BOARD_INFO("tvp5146", 0x5d), 246 I2C_BOARD_INFO("tvp5146", 0x5d),
247 .platform_data = &tvp5146_pdata, 247 .platform_data = &dm644xevm_tvp5146_pdata,
248 }, 248 },
249 }, 249 },
250}; 250};
251 251
252static struct vpfe_config vpfe_cfg = { 252static struct vpfe_config dm644xevm_capture_cfg = {
253 .num_subdevs = ARRAY_SIZE(vpfe_sub_devs), 253 .num_subdevs = ARRAY_SIZE(dm644xevm_vpfe_sub_devs),
254 .i2c_adapter_id = 1, 254 .i2c_adapter_id = 1,
255 .sub_devs = vpfe_sub_devs, 255 .sub_devs = dm644xevm_vpfe_sub_devs,
256 .card_name = "DM6446 EVM", 256 .card_name = "DM6446 EVM",
257 .ccdc = "DM6446 CCDC", 257 .ccdc = "DM6446 CCDC",
258}; 258};
@@ -626,7 +626,7 @@ static void __init
626davinci_evm_map_io(void) 626davinci_evm_map_io(void)
627{ 627{
628 /* setup input configuration for VPFE input devices */ 628 /* setup input configuration for VPFE input devices */
629 dm644x_set_vpfe_config(&vpfe_cfg); 629 dm644x_set_vpfe_config(&dm644xevm_capture_cfg);
630 dm644x_init(); 630 dm644x_init();
631} 631}
632 632
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index b5377a2ee230..fc48faec57ec 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -614,7 +614,7 @@ static struct platform_device dm644x_vpss_device = {
614 .resource = dm644x_vpss_resources, 614 .resource = dm644x_vpss_resources,
615}; 615};
616 616
617static struct resource vpfe_resources[] = { 617static struct resource dm644x_vpfe_resources[] = {
618 { 618 {
619 .start = IRQ_VDINT0, 619 .start = IRQ_VDINT0,
620 .end = IRQ_VDINT0, 620 .end = IRQ_VDINT0,
@@ -648,11 +648,11 @@ static struct platform_device dm644x_ccdc_dev = {
648 }, 648 },
649}; 649};
650 650
651static struct platform_device vpfe_capture_dev = { 651static struct platform_device dm644x_vpfe_dev = {
652 .name = CAPTURE_DRV_NAME, 652 .name = CAPTURE_DRV_NAME,
653 .id = -1, 653 .id = -1,
654 .num_resources = ARRAY_SIZE(vpfe_resources), 654 .num_resources = ARRAY_SIZE(dm644x_vpfe_resources),
655 .resource = vpfe_resources, 655 .resource = dm644x_vpfe_resources,
656 .dev = { 656 .dev = {
657 .dma_mask = &vpfe_capture_dma_mask, 657 .dma_mask = &vpfe_capture_dma_mask,
658 .coherent_dma_mask = DMA_BIT_MASK(32), 658 .coherent_dma_mask = DMA_BIT_MASK(32),
@@ -661,7 +661,7 @@ static struct platform_device vpfe_capture_dev = {
661 661
662void dm644x_set_vpfe_config(struct vpfe_config *cfg) 662void dm644x_set_vpfe_config(struct vpfe_config *cfg)
663{ 663{
664 vpfe_capture_dev.dev.platform_data = cfg; 664 dm644x_vpfe_dev.dev.platform_data = cfg;
665} 665}
666 666
667/*----------------------------------------------------------------------*/ 667/*----------------------------------------------------------------------*/
@@ -808,7 +808,7 @@ static int __init dm644x_init_devices(void)
808 808
809 platform_device_register(&dm644x_vpss_device); 809 platform_device_register(&dm644x_vpss_device);
810 platform_device_register(&dm644x_ccdc_dev); 810 platform_device_register(&dm644x_ccdc_dev);
811 platform_device_register(&vpfe_capture_dev); 811 platform_device_register(&dm644x_vpfe_dev);
812 812
813 return 0; 813 return 0;
814} 814}