tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by David Cohen and committed by Tony Lindgren 6e2d4107 78be6325

+50 -51
unified split
+3 -3
arch/arm/mach-omap1/board-ams-delta.c
··· 135 } 136 137 static struct map_desc ams_delta_io_desc[] __initdata = { 138 - // AMS_DELTA_LATCH1 139 { 140 .virtual = AMS_DELTA_LATCH1_VIRT, 141 .pfn = __phys_to_pfn(AMS_DELTA_LATCH1_PHYS), 142 .length = 0x01000000, 143 .type = MT_DEVICE 144 }, 145 - // AMS_DELTA_LATCH2 146 { 147 .virtual = AMS_DELTA_LATCH2_VIRT, 148 .pfn = __phys_to_pfn(AMS_DELTA_LATCH2_PHYS), 149 .length = 0x01000000, 150 .type = MT_DEVICE 151 }, 152 - // AMS_DELTA_MODEM 153 { 154 .virtual = AMS_DELTA_MODEM_VIRT, 155 .pfn = __phys_to_pfn(AMS_DELTA_MODEM_PHYS),
··· 135 } 136 137 static struct map_desc ams_delta_io_desc[] __initdata = { 138 + /* AMS_DELTA_LATCH1 */ 139 { 140 .virtual = AMS_DELTA_LATCH1_VIRT, 141 .pfn = __phys_to_pfn(AMS_DELTA_LATCH1_PHYS), 142 .length = 0x01000000, 143 .type = MT_DEVICE 144 }, 145 + /* AMS_DELTA_LATCH2 */ 146 { 147 .virtual = AMS_DELTA_LATCH2_VIRT, 148 .pfn = __phys_to_pfn(AMS_DELTA_LATCH2_PHYS), 149 .length = 0x01000000, 150 .type = MT_DEVICE 151 }, 152 + /* AMS_DELTA_MODEM */ 153 { 154 .virtual = AMS_DELTA_MODEM_VIRT, 155 .pfn = __phys_to_pfn(AMS_DELTA_MODEM_PHYS),
+11 -11
arch/arm/mach-omap1/board-h2.c
··· 309 .srgr2 = GSYNC | CLKSP | FSGM | FPER(31), 310 311 .pcr0 = CLKXM | CLKRM | FSXP | FSRP | CLKXP | CLKRP, 312 - //.pcr0 = CLKXP | CLKRP, /* mcbsp: slave */ 313 }; 314 315 static struct omap_alsa_codec_config alsa_config = { 316 .name = "H2 TSC2101", 317 .mcbsp_regs_alsa = &mcbsp_regs, 318 - .codec_configure_dev = NULL, // tsc2101_configure, 319 - .codec_set_samplerate = NULL, // tsc2101_set_samplerate, 320 - .codec_clock_setup = NULL, // tsc2101_clock_setup, 321 - .codec_clock_on = NULL, // tsc2101_clock_on, 322 - .codec_clock_off = NULL, // tsc2101_clock_off, 323 - .get_default_samplerate = NULL, // tsc2101_get_default_samplerate, 324 }; 325 326 static struct platform_device h2_mcbsp1_device = { ··· 378 .otg = 2, 379 380 #ifdef CONFIG_USB_GADGET_OMAP 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) 383 #elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) 384 /* needs OTG cable, or NONSTANDARD (B-to-MiniB) */ 385 - .hmc_mode = 20, // 1:dev|otg(off) 1:host 2:disabled 386 #endif 387 388 .pins[1] = 3, ··· 443 omap_cfg_reg(M8_1610_FLASH_CS2B_WE); 444 445 /* MMC: card detect and WP */ 446 - // omap_cfg_reg(U19_ARMIO1); /* CD */ 447 omap_cfg_reg(BALLOUT_V8_ARMIO3); /* WP */ 448 449 /* Irda */
··· 309 .srgr2 = GSYNC | CLKSP | FSGM | FPER(31), 310 311 .pcr0 = CLKXM | CLKRM | FSXP | FSRP | CLKXP | CLKRP, 312 + /*.pcr0 = CLKXP | CLKRP,*/ /* mcbsp: slave */ 313 }; 314 315 static struct omap_alsa_codec_config alsa_config = { 316 .name = "H2 TSC2101", 317 .mcbsp_regs_alsa = &mcbsp_regs, 318 + .codec_configure_dev = NULL, /* tsc2101_configure, */ 319 + .codec_set_samplerate = NULL, /* tsc2101_set_samplerate, */ 320 + .codec_clock_setup = NULL, /* tsc2101_clock_setup, */ 321 + .codec_clock_on = NULL, /* tsc2101_clock_on, */ 322 + .codec_clock_off = NULL, /* tsc2101_clock_off, */ 323 + .get_default_samplerate = NULL, /* tsc2101_get_default_samplerate, */ 324 }; 325 326 static struct platform_device h2_mcbsp1_device = { ··· 378 .otg = 2, 379 380 #ifdef CONFIG_USB_GADGET_OMAP 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) */ 383 #elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) 384 /* needs OTG cable, or NONSTANDARD (B-to-MiniB) */ 385 + .hmc_mode = 20, /* 1:dev|otg(off) 1:host 2:disabled */ 386 #endif 387 388 .pins[1] = 3, ··· 443 omap_cfg_reg(M8_1610_FLASH_CS2B_WE); 444 445 /* MMC: card detect and WP */ 446 + /* omap_cfg_reg(U19_ARMIO1); */ /* CD */ 447 omap_cfg_reg(BALLOUT_V8_ARMIO3); /* WP */ 448 449 /* Irda */
+7 -7
arch/arm/mach-omap1/board-h3.c
··· 388 .srgr2 = GSYNC | CLKSP | FSGM | FPER(31), 389 390 .pcr0 = CLKRM | SCLKME | FSXP | FSRP | CLKXP | CLKRP, 391 - //.pcr0 = CLKXP | CLKRP, /* mcbsp: slave */ 392 }; 393 394 static struct omap_alsa_codec_config alsa_config = { 395 .name = "H3 TSC2101", 396 .mcbsp_regs_alsa = &mcbsp_regs, 397 - .codec_configure_dev = NULL, // tsc2101_configure, 398 - .codec_set_samplerate = NULL, // tsc2101_set_samplerate, 399 - .codec_clock_setup = NULL, // tsc2101_clock_setup, 400 - .codec_clock_on = NULL, // tsc2101_clock_on, 401 - .codec_clock_off = NULL, // tsc2101_clock_off, 402 - .get_default_samplerate = NULL, // tsc2101_get_default_samplerate, 403 }; 404 405 static struct platform_device h3_mcbsp1_device = {
··· 388 .srgr2 = GSYNC | CLKSP | FSGM | FPER(31), 389 390 .pcr0 = CLKRM | SCLKME | FSXP | FSRP | CLKXP | CLKRP, 391 + /*.pcr0 = CLKXP | CLKRP,*/ /* mcbsp: slave */ 392 }; 393 394 static struct omap_alsa_codec_config alsa_config = { 395 .name = "H3 TSC2101", 396 .mcbsp_regs_alsa = &mcbsp_regs, 397 + .codec_configure_dev = NULL, /* tsc2101_configure, */ 398 + .codec_set_samplerate = NULL, /* tsc2101_set_samplerate, */ 399 + .codec_clock_setup = NULL, /* tsc2101_clock_setup, */ 400 + .codec_clock_on = NULL, /* tsc2101_clock_on, */ 401 + .codec_clock_off = NULL, /* tsc2101_clock_off, */ 402 + .get_default_samplerate = NULL, /* tsc2101_get_default_samplerate, */ 403 }; 404 405 static struct platform_device h3_mcbsp1_device = {
+9 -9
arch/arm/mach-omap1/board-innovator.c
··· 134 static struct omap_alsa_codec_config alsa_config = { 135 .name = "OMAP Innovator AIC23", 136 .mcbsp_regs_alsa = &mcbsp_regs, 137 - .codec_configure_dev = NULL, // aic23_configure, 138 - .codec_set_samplerate = NULL, // aic23_set_samplerate, 139 - .codec_clock_setup = NULL, // aic23_clock_setup, 140 - .codec_clock_on = NULL, // aic23_clock_on, 141 - .codec_clock_off = NULL, // aic23_clock_off, 142 - .get_default_samplerate = NULL, // aic23_get_default_samplerate, 143 }; 144 145 static struct platform_device innovator_mcbsp1_device = { ··· 345 .otg = 2, 346 347 #ifdef CONFIG_USB_GADGET_OMAP 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) 350 #elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) 351 /* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */ 352 - .hmc_mode = 20, // 1:dev|otg(off) 1:host 2:disabled 353 #endif 354 355 .pins[1] = 3,
··· 134 static struct omap_alsa_codec_config alsa_config = { 135 .name = "OMAP Innovator AIC23", 136 .mcbsp_regs_alsa = &mcbsp_regs, 137 + .codec_configure_dev = NULL, /* aic23_configure, */ 138 + .codec_set_samplerate = NULL, /* aic23_set_samplerate, */ 139 + .codec_clock_setup = NULL, /* aic23_clock_setup, */ 140 + .codec_clock_on = NULL, /* aic23_clock_on, */ 141 + .codec_clock_off = NULL, /* aic23_clock_off, */ 142 + .get_default_samplerate = NULL, /* aic23_get_default_samplerate, */ 143 }; 144 145 static struct platform_device innovator_mcbsp1_device = { ··· 345 .otg = 2, 346 347 #ifdef CONFIG_USB_GADGET_OMAP 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) */ 350 #elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) 351 /* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */ 352 + .hmc_mode = 20, /* 1:dev|otg(off) 1:host 2:disabled */ 353 #endif 354 355 .pins[1] = 3,
+9 -9
arch/arm/mach-omap1/board-osk.c
··· 160 static struct omap_alsa_codec_config alsa_config = { 161 .name = "OSK AIC23", 162 .mcbsp_regs_alsa = &mcbsp_regs, 163 - .codec_configure_dev = NULL, // aic23_configure, 164 - .codec_set_samplerate = NULL, // aic23_set_samplerate, 165 - .codec_clock_setup = NULL, // aic23_clock_setup, 166 - .codec_clock_on = NULL, // aic23_clock_on, 167 - .codec_clock_off = NULL, // aic23_clock_off, 168 - .get_default_samplerate = NULL, // aic23_get_default_samplerate, 169 }; 170 171 static struct platform_device osk5912_mcbsp1_device = { ··· 392 omap_cfg_reg(W13_1610_CCP_CLKM); 393 omap_cfg_reg(Y12_1610_CCP_CLKP); 394 /* CCP_DATAM CONFLICTS WITH UART1.TX (and serial console) */ 395 - // omap_cfg_reg(Y14_1610_CCP_DATAM); 396 omap_cfg_reg(W14_1610_CCP_DATAP); 397 398 /* CAM_PWDN */ ··· 404 pr_debug("OSK+Mistral: CAM_PWDN is awol\n"); 405 406 407 - // omap_cfg_reg(P19_1610_GPIO6); // BUSY 408 - omap_cfg_reg(P20_1610_GPIO4); // PENIRQ 409 set_irq_type(OMAP_GPIO_IRQ(4), IRQT_FALLING); 410 spi_register_board_info(mistral_boardinfo, 411 ARRAY_SIZE(mistral_boardinfo));
··· 160 static struct omap_alsa_codec_config alsa_config = { 161 .name = "OSK AIC23", 162 .mcbsp_regs_alsa = &mcbsp_regs, 163 + .codec_configure_dev = NULL, /* aic23_configure, */ 164 + .codec_set_samplerate = NULL, /* aic23_set_samplerate, */ 165 + .codec_clock_setup = NULL, /* aic23_clock_setup, */ 166 + .codec_clock_on = NULL, /* aic23_clock_on, */ 167 + .codec_clock_off = NULL, /* aic23_clock_off, */ 168 + .get_default_samplerate = NULL, /* aic23_get_default_samplerate, */ 169 }; 170 171 static struct platform_device osk5912_mcbsp1_device = { ··· 392 omap_cfg_reg(W13_1610_CCP_CLKM); 393 omap_cfg_reg(Y12_1610_CCP_CLKP); 394 /* CCP_DATAM CONFLICTS WITH UART1.TX (and serial console) */ 395 + /* omap_cfg_reg(Y14_1610_CCP_DATAM); */ 396 omap_cfg_reg(W14_1610_CCP_DATAP); 397 398 /* CAM_PWDN */ ··· 404 pr_debug("OSK+Mistral: CAM_PWDN is awol\n"); 405 406 407 + /* omap_cfg_reg(P19_1610_GPIO6); */ /* BUSY */ 408 + omap_cfg_reg(P20_1610_GPIO4); /* PENIRQ */ 409 set_irq_type(OMAP_GPIO_IRQ(4), IRQT_FALLING); 410 spi_register_board_info(mistral_boardinfo, 411 ARRAY_SIZE(mistral_boardinfo));
+6 -6
arch/arm/mach-omap1/board-palmtt.c
··· 144 static struct omap_alsa_codec_config alsa_config = { 145 .name = "PalmTT AIC23", 146 .mcbsp_regs_alsa = &mcbsp_regs, 147 - .codec_configure_dev = NULL, // aic23_configure, 148 - .codec_set_samplerate = NULL, // aic23_set_samplerate, 149 - .codec_clock_setup = NULL, // aic23_clock_setup, 150 - .codec_clock_on = NULL, // aic23_clock_on, 151 - .codec_clock_off = NULL, // aic23_clock_off, 152 - .get_default_samplerate = NULL, // aic23_get_default_samplerate, 153 }; 154 155 static struct platform_device palmtt_mcbsp1_device = {
··· 144 static struct omap_alsa_codec_config alsa_config = { 145 .name = "PalmTT AIC23", 146 .mcbsp_regs_alsa = &mcbsp_regs, 147 + .codec_configure_dev = NULL, /* aic23_configure, */ 148 + .codec_set_samplerate = NULL, /* aic23_set_samplerate, */ 149 + .codec_clock_setup = NULL, /* aic23_clock_setup, */ 150 + .codec_clock_on = NULL, /* aic23_clock_on, */ 151 + .codec_clock_off = NULL, /* aic23_clock_off, */ 152 + .get_default_samplerate = NULL, /* aic23_get_default_samplerate, */ 153 }; 154 155 static struct platform_device palmtt_mcbsp1_device = {
+3 -4
arch/arm/mach-omap1/clock.c
··· 1 - //kernel/linux-omap-fsample/arch/arm/mach-omap1/clock.c#2 - edit change 3808 (text) 2 /* 3 * linux/arch/arm/mach-omap1/clock.c 4 * ··· 649 650 /* FIXME: This clock seems to be necessary but no-one 651 * has asked for its activation. */ 652 - if (clk == &tc2_ck // FIX: pm.c (SRAM), CCP, Camera 653 - || clk == &ck_dpll1out.clk // FIX: SoSSI, SSR 654 - || clk == &arm_gpio_ck // FIX: GPIO code for 1510 655 ) { 656 printk(KERN_INFO "FIXME: Clock \"%s\" seems unused\n", 657 clk->name);
··· 1 /* 2 * linux/arch/arm/mach-omap1/clock.c 3 * ··· 650 651 /* FIXME: This clock seems to be necessary but no-one 652 * has asked for its activation. */ 653 + if (clk == &tc2_ck /* FIX: pm.c (SRAM), CCP, Camera */ 654 + || clk == &ck_dpll1out.clk /* FIX: SoSSI, SSR */ 655 + || clk == &arm_gpio_ck /* FIX: GPIO code for 1510 */ 656 ) { 657 printk(KERN_INFO "FIXME: Clock \"%s\" seems unused\n", 658 clk->name);
+2 -2
arch/arm/mach-omap1/leds-osk.c
··· 82 red = 1; 83 else if (hw_led_state & IDLE_LED) 84 green = 1; 85 - // else both sides are disabled 86 87 omap_set_gpio_dataout(GPIO_LED_GREEN, green); 88 omap_set_gpio_dataout(GPIO_LED_RED, red); ··· 112 case led_stop: 113 led_state &= ~LED_STATE_ENABLED; 114 hw_led_state = 0; 115 - // NOTE: work may still be pending!! 116 break; 117 118 case led_claim:
··· 82 red = 1; 83 else if (hw_led_state & IDLE_LED) 84 green = 1; 85 + /* else both sides are disabled */ 86 87 omap_set_gpio_dataout(GPIO_LED_GREEN, green); 88 omap_set_gpio_dataout(GPIO_LED_RED, red); ··· 112 case led_stop: 113 led_state &= ~LED_STATE_ENABLED; 114 hw_led_state = 0; 115 + /* NOTE: work may still be pending!! */ 116 break; 117 118 case led_claim: