diff options
author | David Cohen <david.cohen@indt.org.br> | 2007-12-13 21:27:15 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2008-02-08 13:38:00 -0500 |
commit | 6e2d4107245cc0411959e91d7a1613e15097f117 (patch) | |
tree | 36de41b7a938e19cbbf09aa80b38ca2d6b1dd5b3 /arch | |
parent | 78be63252bc9065dd0a12c106135655b7d4db1ec (diff) |
ARM: OMAP1: Change the comments to C style
Change the comments to C style
Signed-off-by: David Cohen <david.cohen@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap1/board-ams-delta.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 22 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-h3.c | 14 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-innovator.c | 18 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 18 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-palmtt.c | 12 | ||||
-rw-r--r-- | arch/arm/mach-omap1/clock.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-omap1/leds-osk.c | 4 |
8 files changed, 50 insertions, 51 deletions
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index c73ca61e585..6aac72dc430 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c | |||
@@ -135,21 +135,21 @@ static void __init ams_delta_init_irq(void) | |||
135 | } | 135 | } |
136 | 136 | ||
137 | static struct map_desc ams_delta_io_desc[] __initdata = { | 137 | static struct map_desc ams_delta_io_desc[] __initdata = { |
138 | // AMS_DELTA_LATCH1 | 138 | /* AMS_DELTA_LATCH1 */ |
139 | { | 139 | { |
140 | .virtual = AMS_DELTA_LATCH1_VIRT, | 140 | .virtual = AMS_DELTA_LATCH1_VIRT, |
141 | .pfn = __phys_to_pfn(AMS_DELTA_LATCH1_PHYS), | 141 | .pfn = __phys_to_pfn(AMS_DELTA_LATCH1_PHYS), |
142 | .length = 0x01000000, | 142 | .length = 0x01000000, |
143 | .type = MT_DEVICE | 143 | .type = MT_DEVICE |
144 | }, | 144 | }, |
145 | // AMS_DELTA_LATCH2 | 145 | /* AMS_DELTA_LATCH2 */ |
146 | { | 146 | { |
147 | .virtual = AMS_DELTA_LATCH2_VIRT, | 147 | .virtual = AMS_DELTA_LATCH2_VIRT, |
148 | .pfn = __phys_to_pfn(AMS_DELTA_LATCH2_PHYS), | 148 | .pfn = __phys_to_pfn(AMS_DELTA_LATCH2_PHYS), |
149 | .length = 0x01000000, | 149 | .length = 0x01000000, |
150 | .type = MT_DEVICE | 150 | .type = MT_DEVICE |
151 | }, | 151 | }, |
152 | // AMS_DELTA_MODEM | 152 | /* AMS_DELTA_MODEM */ |
153 | { | 153 | { |
154 | .virtual = AMS_DELTA_MODEM_VIRT, | 154 | .virtual = AMS_DELTA_MODEM_VIRT, |
155 | .pfn = __phys_to_pfn(AMS_DELTA_MODEM_PHYS), | 155 | .pfn = __phys_to_pfn(AMS_DELTA_MODEM_PHYS), |
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 1a69002e3f8..18899d74d4c 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
@@ -309,18 +309,18 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = { | |||
309 | .srgr2 = GSYNC | CLKSP | FSGM | FPER(31), | 309 | .srgr2 = GSYNC | CLKSP | FSGM | FPER(31), |
310 | 310 | ||
311 | .pcr0 = CLKXM | CLKRM | FSXP | FSRP | CLKXP | CLKRP, | 311 | .pcr0 = CLKXM | CLKRM | FSXP | FSRP | CLKXP | CLKRP, |
312 | //.pcr0 = CLKXP | CLKRP, /* mcbsp: slave */ | 312 | /*.pcr0 = CLKXP | CLKRP,*/ /* mcbsp: slave */ |
313 | }; | 313 | }; |
314 | 314 | ||
315 | static struct omap_alsa_codec_config alsa_config = { | 315 | static struct omap_alsa_codec_config alsa_config = { |
316 | .name = "H2 TSC2101", | 316 | .name = "H2 TSC2101", |
317 | .mcbsp_regs_alsa = &mcbsp_regs, | 317 | .mcbsp_regs_alsa = &mcbsp_regs, |
318 | .codec_configure_dev = NULL, // tsc2101_configure, | 318 | .codec_configure_dev = NULL, /* tsc2101_configure, */ |
319 | .codec_set_samplerate = NULL, // tsc2101_set_samplerate, | 319 | .codec_set_samplerate = NULL, /* tsc2101_set_samplerate, */ |
320 | .codec_clock_setup = NULL, // tsc2101_clock_setup, | 320 | .codec_clock_setup = NULL, /* tsc2101_clock_setup, */ |
321 | .codec_clock_on = NULL, // tsc2101_clock_on, | 321 | .codec_clock_on = NULL, /* tsc2101_clock_on, */ |
322 | .codec_clock_off = NULL, // tsc2101_clock_off, | 322 | .codec_clock_off = NULL, /* tsc2101_clock_off, */ |
323 | .get_default_samplerate = NULL, // tsc2101_get_default_samplerate, | 323 | .get_default_samplerate = NULL, /* tsc2101_get_default_samplerate, */ |
324 | }; | 324 | }; |
325 | 325 | ||
326 | static struct platform_device h2_mcbsp1_device = { | 326 | static struct platform_device h2_mcbsp1_device = { |
@@ -378,11 +378,11 @@ static struct omap_usb_config h2_usb_config __initdata = { | |||
378 | .otg = 2, | 378 | .otg = 2, |
379 | 379 | ||
380 | #ifdef CONFIG_USB_GADGET_OMAP | 380 | #ifdef CONFIG_USB_GADGET_OMAP |
381 | .hmc_mode = 19, // 0:host(off) 1:dev|otg 2:disabled | 381 | .hmc_mode = 19, /* 0:host(off) 1:dev|otg 2:disabled */ |
382 | // .hmc_mode = 21, // 0:host(off) 1:dev(loopback) 2:host(loopback) | 382 | /* .hmc_mode = 21,*/ /* 0:host(off) 1:dev(loopback) 2:host(loopback) */ |
383 | #elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) | 383 | #elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) |
384 | /* needs OTG cable, or NONSTANDARD (B-to-MiniB) */ | 384 | /* needs OTG cable, or NONSTANDARD (B-to-MiniB) */ |
385 | .hmc_mode = 20, // 1:dev|otg(off) 1:host 2:disabled | 385 | .hmc_mode = 20, /* 1:dev|otg(off) 1:host 2:disabled */ |
386 | #endif | 386 | #endif |
387 | 387 | ||
388 | .pins[1] = 3, | 388 | .pins[1] = 3, |
@@ -443,7 +443,7 @@ static void __init h2_init(void) | |||
443 | omap_cfg_reg(M8_1610_FLASH_CS2B_WE); | 443 | omap_cfg_reg(M8_1610_FLASH_CS2B_WE); |
444 | 444 | ||
445 | /* MMC: card detect and WP */ | 445 | /* MMC: card detect and WP */ |
446 | // omap_cfg_reg(U19_ARMIO1); /* CD */ | 446 | /* omap_cfg_reg(U19_ARMIO1); */ /* CD */ |
447 | omap_cfg_reg(BALLOUT_V8_ARMIO3); /* WP */ | 447 | omap_cfg_reg(BALLOUT_V8_ARMIO3); /* WP */ |
448 | 448 | ||
449 | /* Irda */ | 449 | /* Irda */ |
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index c4a7141bb78..67ae5035a7e 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c | |||
@@ -388,18 +388,18 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = { | |||
388 | .srgr2 = GSYNC | CLKSP | FSGM | FPER(31), | 388 | .srgr2 = GSYNC | CLKSP | FSGM | FPER(31), |
389 | 389 | ||
390 | .pcr0 = CLKRM | SCLKME | FSXP | FSRP | CLKXP | CLKRP, | 390 | .pcr0 = CLKRM | SCLKME | FSXP | FSRP | CLKXP | CLKRP, |
391 | //.pcr0 = CLKXP | CLKRP, /* mcbsp: slave */ | 391 | /*.pcr0 = CLKXP | CLKRP,*/ /* mcbsp: slave */ |
392 | }; | 392 | }; |
393 | 393 | ||
394 | static struct omap_alsa_codec_config alsa_config = { | 394 | static struct omap_alsa_codec_config alsa_config = { |
395 | .name = "H3 TSC2101", | 395 | .name = "H3 TSC2101", |
396 | .mcbsp_regs_alsa = &mcbsp_regs, | 396 | .mcbsp_regs_alsa = &mcbsp_regs, |
397 | .codec_configure_dev = NULL, // tsc2101_configure, | 397 | .codec_configure_dev = NULL, /* tsc2101_configure, */ |
398 | .codec_set_samplerate = NULL, // tsc2101_set_samplerate, | 398 | .codec_set_samplerate = NULL, /* tsc2101_set_samplerate, */ |
399 | .codec_clock_setup = NULL, // tsc2101_clock_setup, | 399 | .codec_clock_setup = NULL, /* tsc2101_clock_setup, */ |
400 | .codec_clock_on = NULL, // tsc2101_clock_on, | 400 | .codec_clock_on = NULL, /* tsc2101_clock_on, */ |
401 | .codec_clock_off = NULL, // tsc2101_clock_off, | 401 | .codec_clock_off = NULL, /* tsc2101_clock_off, */ |
402 | .get_default_samplerate = NULL, // tsc2101_get_default_samplerate, | 402 | .get_default_samplerate = NULL, /* tsc2101_get_default_samplerate, */ |
403 | }; | 403 | }; |
404 | 404 | ||
405 | static struct platform_device h3_mcbsp1_device = { | 405 | static struct platform_device h3_mcbsp1_device = { |
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index 7d2d8af155a..92c14d364b5 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c | |||
@@ -134,12 +134,12 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = { | |||
134 | static struct omap_alsa_codec_config alsa_config = { | 134 | static struct omap_alsa_codec_config alsa_config = { |
135 | .name = "OMAP Innovator AIC23", | 135 | .name = "OMAP Innovator AIC23", |
136 | .mcbsp_regs_alsa = &mcbsp_regs, | 136 | .mcbsp_regs_alsa = &mcbsp_regs, |
137 | .codec_configure_dev = NULL, // aic23_configure, | 137 | .codec_configure_dev = NULL, /* aic23_configure, */ |
138 | .codec_set_samplerate = NULL, // aic23_set_samplerate, | 138 | .codec_set_samplerate = NULL, /* aic23_set_samplerate, */ |
139 | .codec_clock_setup = NULL, // aic23_clock_setup, | 139 | .codec_clock_setup = NULL, /* aic23_clock_setup, */ |
140 | .codec_clock_on = NULL, // aic23_clock_on, | 140 | .codec_clock_on = NULL, /* aic23_clock_on, */ |
141 | .codec_clock_off = NULL, // aic23_clock_off, | 141 | .codec_clock_off = NULL, /* aic23_clock_off, */ |
142 | .get_default_samplerate = NULL, // aic23_get_default_samplerate, | 142 | .get_default_samplerate = NULL, /* aic23_get_default_samplerate, */ |
143 | }; | 143 | }; |
144 | 144 | ||
145 | static struct platform_device innovator_mcbsp1_device = { | 145 | static struct platform_device innovator_mcbsp1_device = { |
@@ -345,11 +345,11 @@ static struct omap_usb_config h2_usb_config __initdata = { | |||
345 | .otg = 2, | 345 | .otg = 2, |
346 | 346 | ||
347 | #ifdef CONFIG_USB_GADGET_OMAP | 347 | #ifdef CONFIG_USB_GADGET_OMAP |
348 | .hmc_mode = 19, // 0:host(off) 1:dev|otg 2:disabled | 348 | .hmc_mode = 19, /* 0:host(off) 1:dev|otg 2:disabled */ |
349 | // .hmc_mode = 21, // 0:host(off) 1:dev(loopback) 2:host(loopback) | 349 | /* .hmc_mode = 21,*/ /* 0:host(off) 1:dev(loopback) 2:host(loopback) */ |
350 | #elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) | 350 | #elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) |
351 | /* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */ | 351 | /* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */ |
352 | .hmc_mode = 20, // 1:dev|otg(off) 1:host 2:disabled | 352 | .hmc_mode = 20, /* 1:dev|otg(off) 1:host 2:disabled */ |
353 | #endif | 353 | #endif |
354 | 354 | ||
355 | .pins[1] = 3, | 355 | .pins[1] = 3, |
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index 84333440008..e1f813d4417 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c | |||
@@ -160,12 +160,12 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = { | |||
160 | static struct omap_alsa_codec_config alsa_config = { | 160 | static struct omap_alsa_codec_config alsa_config = { |
161 | .name = "OSK AIC23", | 161 | .name = "OSK AIC23", |
162 | .mcbsp_regs_alsa = &mcbsp_regs, | 162 | .mcbsp_regs_alsa = &mcbsp_regs, |
163 | .codec_configure_dev = NULL, // aic23_configure, | 163 | .codec_configure_dev = NULL, /* aic23_configure, */ |
164 | .codec_set_samplerate = NULL, // aic23_set_samplerate, | 164 | .codec_set_samplerate = NULL, /* aic23_set_samplerate, */ |
165 | .codec_clock_setup = NULL, // aic23_clock_setup, | 165 | .codec_clock_setup = NULL, /* aic23_clock_setup, */ |
166 | .codec_clock_on = NULL, // aic23_clock_on, | 166 | .codec_clock_on = NULL, /* aic23_clock_on, */ |
167 | .codec_clock_off = NULL, // aic23_clock_off, | 167 | .codec_clock_off = NULL, /* aic23_clock_off, */ |
168 | .get_default_samplerate = NULL, // aic23_get_default_samplerate, | 168 | .get_default_samplerate = NULL, /* aic23_get_default_samplerate, */ |
169 | }; | 169 | }; |
170 | 170 | ||
171 | static struct platform_device osk5912_mcbsp1_device = { | 171 | static struct platform_device osk5912_mcbsp1_device = { |
@@ -392,7 +392,7 @@ static void __init osk_mistral_init(void) | |||
392 | omap_cfg_reg(W13_1610_CCP_CLKM); | 392 | omap_cfg_reg(W13_1610_CCP_CLKM); |
393 | omap_cfg_reg(Y12_1610_CCP_CLKP); | 393 | omap_cfg_reg(Y12_1610_CCP_CLKP); |
394 | /* CCP_DATAM CONFLICTS WITH UART1.TX (and serial console) */ | 394 | /* CCP_DATAM CONFLICTS WITH UART1.TX (and serial console) */ |
395 | // omap_cfg_reg(Y14_1610_CCP_DATAM); | 395 | /* omap_cfg_reg(Y14_1610_CCP_DATAM); */ |
396 | omap_cfg_reg(W14_1610_CCP_DATAP); | 396 | omap_cfg_reg(W14_1610_CCP_DATAP); |
397 | 397 | ||
398 | /* CAM_PWDN */ | 398 | /* CAM_PWDN */ |
@@ -404,8 +404,8 @@ static void __init osk_mistral_init(void) | |||
404 | pr_debug("OSK+Mistral: CAM_PWDN is awol\n"); | 404 | pr_debug("OSK+Mistral: CAM_PWDN is awol\n"); |
405 | 405 | ||
406 | 406 | ||
407 | // omap_cfg_reg(P19_1610_GPIO6); // BUSY | 407 | /* omap_cfg_reg(P19_1610_GPIO6); */ /* BUSY */ |
408 | omap_cfg_reg(P20_1610_GPIO4); // PENIRQ | 408 | omap_cfg_reg(P20_1610_GPIO4); /* PENIRQ */ |
409 | set_irq_type(OMAP_GPIO_IRQ(4), IRQT_FALLING); | 409 | set_irq_type(OMAP_GPIO_IRQ(4), IRQT_FALLING); |
410 | spi_register_board_info(mistral_boardinfo, | 410 | spi_register_board_info(mistral_boardinfo, |
411 | ARRAY_SIZE(mistral_boardinfo)); | 411 | ARRAY_SIZE(mistral_boardinfo)); |
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c index ed7094a7006..772daed493c 100644 --- a/arch/arm/mach-omap1/board-palmtt.c +++ b/arch/arm/mach-omap1/board-palmtt.c | |||
@@ -144,12 +144,12 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = { | |||
144 | static struct omap_alsa_codec_config alsa_config = { | 144 | static struct omap_alsa_codec_config alsa_config = { |
145 | .name = "PalmTT AIC23", | 145 | .name = "PalmTT AIC23", |
146 | .mcbsp_regs_alsa = &mcbsp_regs, | 146 | .mcbsp_regs_alsa = &mcbsp_regs, |
147 | .codec_configure_dev = NULL, // aic23_configure, | 147 | .codec_configure_dev = NULL, /* aic23_configure, */ |
148 | .codec_set_samplerate = NULL, // aic23_set_samplerate, | 148 | .codec_set_samplerate = NULL, /* aic23_set_samplerate, */ |
149 | .codec_clock_setup = NULL, // aic23_clock_setup, | 149 | .codec_clock_setup = NULL, /* aic23_clock_setup, */ |
150 | .codec_clock_on = NULL, // aic23_clock_on, | 150 | .codec_clock_on = NULL, /* aic23_clock_on, */ |
151 | .codec_clock_off = NULL, // aic23_clock_off, | 151 | .codec_clock_off = NULL, /* aic23_clock_off, */ |
152 | .get_default_samplerate = NULL, // aic23_get_default_samplerate, | 152 | .get_default_samplerate = NULL, /* aic23_get_default_samplerate, */ |
153 | }; | 153 | }; |
154 | 154 | ||
155 | static struct platform_device palmtt_mcbsp1_device = { | 155 | static struct platform_device palmtt_mcbsp1_device = { |
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 5d9faa68d2e..4ea2933f887 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c | |||
@@ -1,4 +1,3 @@ | |||
1 | //kernel/linux-omap-fsample/arch/arm/mach-omap1/clock.c#2 - edit change 3808 (text) | ||
2 | /* | 1 | /* |
3 | * linux/arch/arm/mach-omap1/clock.c | 2 | * linux/arch/arm/mach-omap1/clock.c |
4 | * | 3 | * |
@@ -650,9 +649,9 @@ static void __init omap1_clk_disable_unused(struct clk *clk) | |||
650 | 649 | ||
651 | /* FIXME: This clock seems to be necessary but no-one | 650 | /* FIXME: This clock seems to be necessary but no-one |
652 | * has asked for its activation. */ | 651 | * has asked for its activation. */ |
653 | if (clk == &tc2_ck // FIX: pm.c (SRAM), CCP, Camera | 652 | if (clk == &tc2_ck /* FIX: pm.c (SRAM), CCP, Camera */ |
654 | || clk == &ck_dpll1out.clk // FIX: SoSSI, SSR | 653 | || clk == &ck_dpll1out.clk /* FIX: SoSSI, SSR */ |
655 | || clk == &arm_gpio_ck // FIX: GPIO code for 1510 | 654 | || clk == &arm_gpio_ck /* FIX: GPIO code for 1510 */ |
656 | ) { | 655 | ) { |
657 | printk(KERN_INFO "FIXME: Clock \"%s\" seems unused\n", | 656 | printk(KERN_INFO "FIXME: Clock \"%s\" seems unused\n", |
658 | clk->name); | 657 | clk->name); |
diff --git a/arch/arm/mach-omap1/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c index 6939d5e7569..026685ed461 100644 --- a/arch/arm/mach-omap1/leds-osk.c +++ b/arch/arm/mach-omap1/leds-osk.c | |||
@@ -82,7 +82,7 @@ static void mistral_setled(void) | |||
82 | red = 1; | 82 | red = 1; |
83 | else if (hw_led_state & IDLE_LED) | 83 | else if (hw_led_state & IDLE_LED) |
84 | green = 1; | 84 | green = 1; |
85 | // else both sides are disabled | 85 | /* else both sides are disabled */ |
86 | 86 | ||
87 | omap_set_gpio_dataout(GPIO_LED_GREEN, green); | 87 | omap_set_gpio_dataout(GPIO_LED_GREEN, green); |
88 | omap_set_gpio_dataout(GPIO_LED_RED, red); | 88 | omap_set_gpio_dataout(GPIO_LED_RED, red); |
@@ -112,7 +112,7 @@ void osk_leds_event(led_event_t evt) | |||
112 | case led_stop: | 112 | case led_stop: |
113 | led_state &= ~LED_STATE_ENABLED; | 113 | led_state &= ~LED_STATE_ENABLED; |
114 | hw_led_state = 0; | 114 | hw_led_state = 0; |
115 | // NOTE: work may still be pending!! | 115 | /* NOTE: work may still be pending!! */ |
116 | break; | 116 | break; |
117 | 117 | ||
118 | case led_claim: | 118 | case led_claim: |