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>
This commit is contained in:
parent
78be63252b
commit
6e2d410724
|
@ -135,21 +135,21 @@ static void __init ams_delta_init_irq(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct map_desc ams_delta_io_desc[] __initdata = {
|
static struct map_desc ams_delta_io_desc[] __initdata = {
|
||||||
// AMS_DELTA_LATCH1
|
/* AMS_DELTA_LATCH1 */
|
||||||
{
|
{
|
||||||
.virtual = AMS_DELTA_LATCH1_VIRT,
|
.virtual = AMS_DELTA_LATCH1_VIRT,
|
||||||
.pfn = __phys_to_pfn(AMS_DELTA_LATCH1_PHYS),
|
.pfn = __phys_to_pfn(AMS_DELTA_LATCH1_PHYS),
|
||||||
.length = 0x01000000,
|
.length = 0x01000000,
|
||||||
.type = MT_DEVICE
|
.type = MT_DEVICE
|
||||||
},
|
},
|
||||||
// AMS_DELTA_LATCH2
|
/* AMS_DELTA_LATCH2 */
|
||||||
{
|
{
|
||||||
.virtual = AMS_DELTA_LATCH2_VIRT,
|
.virtual = AMS_DELTA_LATCH2_VIRT,
|
||||||
.pfn = __phys_to_pfn(AMS_DELTA_LATCH2_PHYS),
|
.pfn = __phys_to_pfn(AMS_DELTA_LATCH2_PHYS),
|
||||||
.length = 0x01000000,
|
.length = 0x01000000,
|
||||||
.type = MT_DEVICE
|
.type = MT_DEVICE
|
||||||
},
|
},
|
||||||
// AMS_DELTA_MODEM
|
/* AMS_DELTA_MODEM */
|
||||||
{
|
{
|
||||||
.virtual = AMS_DELTA_MODEM_VIRT,
|
.virtual = AMS_DELTA_MODEM_VIRT,
|
||||||
.pfn = __phys_to_pfn(AMS_DELTA_MODEM_PHYS),
|
.pfn = __phys_to_pfn(AMS_DELTA_MODEM_PHYS),
|
||||||
|
|
|
@ -309,18 +309,18 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = {
|
||||||
.srgr2 = GSYNC | CLKSP | FSGM | FPER(31),
|
.srgr2 = GSYNC | CLKSP | FSGM | FPER(31),
|
||||||
|
|
||||||
.pcr0 = CLKXM | CLKRM | FSXP | FSRP | CLKXP | CLKRP,
|
.pcr0 = CLKXM | CLKRM | FSXP | FSRP | CLKXP | CLKRP,
|
||||||
//.pcr0 = CLKXP | CLKRP, /* mcbsp: slave */
|
/*.pcr0 = CLKXP | CLKRP,*/ /* mcbsp: slave */
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct omap_alsa_codec_config alsa_config = {
|
static struct omap_alsa_codec_config alsa_config = {
|
||||||
.name = "H2 TSC2101",
|
.name = "H2 TSC2101",
|
||||||
.mcbsp_regs_alsa = &mcbsp_regs,
|
.mcbsp_regs_alsa = &mcbsp_regs,
|
||||||
.codec_configure_dev = NULL, // tsc2101_configure,
|
.codec_configure_dev = NULL, /* tsc2101_configure, */
|
||||||
.codec_set_samplerate = NULL, // tsc2101_set_samplerate,
|
.codec_set_samplerate = NULL, /* tsc2101_set_samplerate, */
|
||||||
.codec_clock_setup = NULL, // tsc2101_clock_setup,
|
.codec_clock_setup = NULL, /* tsc2101_clock_setup, */
|
||||||
.codec_clock_on = NULL, // tsc2101_clock_on,
|
.codec_clock_on = NULL, /* tsc2101_clock_on, */
|
||||||
.codec_clock_off = NULL, // tsc2101_clock_off,
|
.codec_clock_off = NULL, /* tsc2101_clock_off, */
|
||||||
.get_default_samplerate = NULL, // tsc2101_get_default_samplerate,
|
.get_default_samplerate = NULL, /* tsc2101_get_default_samplerate, */
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_device h2_mcbsp1_device = {
|
static struct platform_device h2_mcbsp1_device = {
|
||||||
|
@ -378,11 +378,11 @@ static struct omap_usb_config h2_usb_config __initdata = {
|
||||||
.otg = 2,
|
.otg = 2,
|
||||||
|
|
||||||
#ifdef CONFIG_USB_GADGET_OMAP
|
#ifdef CONFIG_USB_GADGET_OMAP
|
||||||
.hmc_mode = 19, // 0:host(off) 1:dev|otg 2:disabled
|
.hmc_mode = 19, /* 0:host(off) 1:dev|otg 2:disabled */
|
||||||
// .hmc_mode = 21, // 0:host(off) 1:dev(loopback) 2:host(loopback)
|
/* .hmc_mode = 21,*/ /* 0:host(off) 1:dev(loopback) 2:host(loopback) */
|
||||||
#elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
|
#elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
|
||||||
/* needs OTG cable, or NONSTANDARD (B-to-MiniB) */
|
/* needs OTG cable, or NONSTANDARD (B-to-MiniB) */
|
||||||
.hmc_mode = 20, // 1:dev|otg(off) 1:host 2:disabled
|
.hmc_mode = 20, /* 1:dev|otg(off) 1:host 2:disabled */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
.pins[1] = 3,
|
.pins[1] = 3,
|
||||||
|
@ -443,7 +443,7 @@ static void __init h2_init(void)
|
||||||
omap_cfg_reg(M8_1610_FLASH_CS2B_WE);
|
omap_cfg_reg(M8_1610_FLASH_CS2B_WE);
|
||||||
|
|
||||||
/* MMC: card detect and WP */
|
/* MMC: card detect and WP */
|
||||||
// omap_cfg_reg(U19_ARMIO1); /* CD */
|
/* omap_cfg_reg(U19_ARMIO1); */ /* CD */
|
||||||
omap_cfg_reg(BALLOUT_V8_ARMIO3); /* WP */
|
omap_cfg_reg(BALLOUT_V8_ARMIO3); /* WP */
|
||||||
|
|
||||||
/* Irda */
|
/* Irda */
|
||||||
|
|
|
@ -388,18 +388,18 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = {
|
||||||
.srgr2 = GSYNC | CLKSP | FSGM | FPER(31),
|
.srgr2 = GSYNC | CLKSP | FSGM | FPER(31),
|
||||||
|
|
||||||
.pcr0 = CLKRM | SCLKME | FSXP | FSRP | CLKXP | CLKRP,
|
.pcr0 = CLKRM | SCLKME | FSXP | FSRP | CLKXP | CLKRP,
|
||||||
//.pcr0 = CLKXP | CLKRP, /* mcbsp: slave */
|
/*.pcr0 = CLKXP | CLKRP,*/ /* mcbsp: slave */
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct omap_alsa_codec_config alsa_config = {
|
static struct omap_alsa_codec_config alsa_config = {
|
||||||
.name = "H3 TSC2101",
|
.name = "H3 TSC2101",
|
||||||
.mcbsp_regs_alsa = &mcbsp_regs,
|
.mcbsp_regs_alsa = &mcbsp_regs,
|
||||||
.codec_configure_dev = NULL, // tsc2101_configure,
|
.codec_configure_dev = NULL, /* tsc2101_configure, */
|
||||||
.codec_set_samplerate = NULL, // tsc2101_set_samplerate,
|
.codec_set_samplerate = NULL, /* tsc2101_set_samplerate, */
|
||||||
.codec_clock_setup = NULL, // tsc2101_clock_setup,
|
.codec_clock_setup = NULL, /* tsc2101_clock_setup, */
|
||||||
.codec_clock_on = NULL, // tsc2101_clock_on,
|
.codec_clock_on = NULL, /* tsc2101_clock_on, */
|
||||||
.codec_clock_off = NULL, // tsc2101_clock_off,
|
.codec_clock_off = NULL, /* tsc2101_clock_off, */
|
||||||
.get_default_samplerate = NULL, // tsc2101_get_default_samplerate,
|
.get_default_samplerate = NULL, /* tsc2101_get_default_samplerate, */
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_device h3_mcbsp1_device = {
|
static struct platform_device h3_mcbsp1_device = {
|
||||||
|
|
|
@ -134,12 +134,12 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = {
|
||||||
static struct omap_alsa_codec_config alsa_config = {
|
static struct omap_alsa_codec_config alsa_config = {
|
||||||
.name = "OMAP Innovator AIC23",
|
.name = "OMAP Innovator AIC23",
|
||||||
.mcbsp_regs_alsa = &mcbsp_regs,
|
.mcbsp_regs_alsa = &mcbsp_regs,
|
||||||
.codec_configure_dev = NULL, // aic23_configure,
|
.codec_configure_dev = NULL, /* aic23_configure, */
|
||||||
.codec_set_samplerate = NULL, // aic23_set_samplerate,
|
.codec_set_samplerate = NULL, /* aic23_set_samplerate, */
|
||||||
.codec_clock_setup = NULL, // aic23_clock_setup,
|
.codec_clock_setup = NULL, /* aic23_clock_setup, */
|
||||||
.codec_clock_on = NULL, // aic23_clock_on,
|
.codec_clock_on = NULL, /* aic23_clock_on, */
|
||||||
.codec_clock_off = NULL, // aic23_clock_off,
|
.codec_clock_off = NULL, /* aic23_clock_off, */
|
||||||
.get_default_samplerate = NULL, // aic23_get_default_samplerate,
|
.get_default_samplerate = NULL, /* aic23_get_default_samplerate, */
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_device innovator_mcbsp1_device = {
|
static struct platform_device innovator_mcbsp1_device = {
|
||||||
|
@ -345,11 +345,11 @@ static struct omap_usb_config h2_usb_config __initdata = {
|
||||||
.otg = 2,
|
.otg = 2,
|
||||||
|
|
||||||
#ifdef CONFIG_USB_GADGET_OMAP
|
#ifdef CONFIG_USB_GADGET_OMAP
|
||||||
.hmc_mode = 19, // 0:host(off) 1:dev|otg 2:disabled
|
.hmc_mode = 19, /* 0:host(off) 1:dev|otg 2:disabled */
|
||||||
// .hmc_mode = 21, // 0:host(off) 1:dev(loopback) 2:host(loopback)
|
/* .hmc_mode = 21,*/ /* 0:host(off) 1:dev(loopback) 2:host(loopback) */
|
||||||
#elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
|
#elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
|
||||||
/* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */
|
/* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */
|
||||||
.hmc_mode = 20, // 1:dev|otg(off) 1:host 2:disabled
|
.hmc_mode = 20, /* 1:dev|otg(off) 1:host 2:disabled */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
.pins[1] = 3,
|
.pins[1] = 3,
|
||||||
|
|
|
@ -160,12 +160,12 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = {
|
||||||
static struct omap_alsa_codec_config alsa_config = {
|
static struct omap_alsa_codec_config alsa_config = {
|
||||||
.name = "OSK AIC23",
|
.name = "OSK AIC23",
|
||||||
.mcbsp_regs_alsa = &mcbsp_regs,
|
.mcbsp_regs_alsa = &mcbsp_regs,
|
||||||
.codec_configure_dev = NULL, // aic23_configure,
|
.codec_configure_dev = NULL, /* aic23_configure, */
|
||||||
.codec_set_samplerate = NULL, // aic23_set_samplerate,
|
.codec_set_samplerate = NULL, /* aic23_set_samplerate, */
|
||||||
.codec_clock_setup = NULL, // aic23_clock_setup,
|
.codec_clock_setup = NULL, /* aic23_clock_setup, */
|
||||||
.codec_clock_on = NULL, // aic23_clock_on,
|
.codec_clock_on = NULL, /* aic23_clock_on, */
|
||||||
.codec_clock_off = NULL, // aic23_clock_off,
|
.codec_clock_off = NULL, /* aic23_clock_off, */
|
||||||
.get_default_samplerate = NULL, // aic23_get_default_samplerate,
|
.get_default_samplerate = NULL, /* aic23_get_default_samplerate, */
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_device osk5912_mcbsp1_device = {
|
static struct platform_device osk5912_mcbsp1_device = {
|
||||||
|
@ -392,7 +392,7 @@ static void __init osk_mistral_init(void)
|
||||||
omap_cfg_reg(W13_1610_CCP_CLKM);
|
omap_cfg_reg(W13_1610_CCP_CLKM);
|
||||||
omap_cfg_reg(Y12_1610_CCP_CLKP);
|
omap_cfg_reg(Y12_1610_CCP_CLKP);
|
||||||
/* CCP_DATAM CONFLICTS WITH UART1.TX (and serial console) */
|
/* CCP_DATAM CONFLICTS WITH UART1.TX (and serial console) */
|
||||||
// omap_cfg_reg(Y14_1610_CCP_DATAM);
|
/* omap_cfg_reg(Y14_1610_CCP_DATAM); */
|
||||||
omap_cfg_reg(W14_1610_CCP_DATAP);
|
omap_cfg_reg(W14_1610_CCP_DATAP);
|
||||||
|
|
||||||
/* CAM_PWDN */
|
/* CAM_PWDN */
|
||||||
|
@ -404,8 +404,8 @@ static void __init osk_mistral_init(void)
|
||||||
pr_debug("OSK+Mistral: CAM_PWDN is awol\n");
|
pr_debug("OSK+Mistral: CAM_PWDN is awol\n");
|
||||||
|
|
||||||
|
|
||||||
// omap_cfg_reg(P19_1610_GPIO6); // BUSY
|
/* omap_cfg_reg(P19_1610_GPIO6); */ /* BUSY */
|
||||||
omap_cfg_reg(P20_1610_GPIO4); // PENIRQ
|
omap_cfg_reg(P20_1610_GPIO4); /* PENIRQ */
|
||||||
set_irq_type(OMAP_GPIO_IRQ(4), IRQT_FALLING);
|
set_irq_type(OMAP_GPIO_IRQ(4), IRQT_FALLING);
|
||||||
spi_register_board_info(mistral_boardinfo,
|
spi_register_board_info(mistral_boardinfo,
|
||||||
ARRAY_SIZE(mistral_boardinfo));
|
ARRAY_SIZE(mistral_boardinfo));
|
||||||
|
|
|
@ -144,12 +144,12 @@ static struct omap_mcbsp_reg_cfg mcbsp_regs = {
|
||||||
static struct omap_alsa_codec_config alsa_config = {
|
static struct omap_alsa_codec_config alsa_config = {
|
||||||
.name = "PalmTT AIC23",
|
.name = "PalmTT AIC23",
|
||||||
.mcbsp_regs_alsa = &mcbsp_regs,
|
.mcbsp_regs_alsa = &mcbsp_regs,
|
||||||
.codec_configure_dev = NULL, // aic23_configure,
|
.codec_configure_dev = NULL, /* aic23_configure, */
|
||||||
.codec_set_samplerate = NULL, // aic23_set_samplerate,
|
.codec_set_samplerate = NULL, /* aic23_set_samplerate, */
|
||||||
.codec_clock_setup = NULL, // aic23_clock_setup,
|
.codec_clock_setup = NULL, /* aic23_clock_setup, */
|
||||||
.codec_clock_on = NULL, // aic23_clock_on,
|
.codec_clock_on = NULL, /* aic23_clock_on, */
|
||||||
.codec_clock_off = NULL, // aic23_clock_off,
|
.codec_clock_off = NULL, /* aic23_clock_off, */
|
||||||
.get_default_samplerate = NULL, // aic23_get_default_samplerate,
|
.get_default_samplerate = NULL, /* aic23_get_default_samplerate, */
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_device palmtt_mcbsp1_device = {
|
static struct platform_device palmtt_mcbsp1_device = {
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
//kernel/linux-omap-fsample/arch/arm/mach-omap1/clock.c#2 - edit change 3808 (text)
|
|
||||||
/*
|
/*
|
||||||
* linux/arch/arm/mach-omap1/clock.c
|
* linux/arch/arm/mach-omap1/clock.c
|
||||||
*
|
*
|
||||||
|
@ -650,9 +649,9 @@ static void __init omap1_clk_disable_unused(struct clk *clk)
|
||||||
|
|
||||||
/* FIXME: This clock seems to be necessary but no-one
|
/* FIXME: This clock seems to be necessary but no-one
|
||||||
* has asked for its activation. */
|
* has asked for its activation. */
|
||||||
if (clk == &tc2_ck // FIX: pm.c (SRAM), CCP, Camera
|
if (clk == &tc2_ck /* FIX: pm.c (SRAM), CCP, Camera */
|
||||||
|| clk == &ck_dpll1out.clk // FIX: SoSSI, SSR
|
|| clk == &ck_dpll1out.clk /* FIX: SoSSI, SSR */
|
||||||
|| clk == &arm_gpio_ck // FIX: GPIO code for 1510
|
|| clk == &arm_gpio_ck /* FIX: GPIO code for 1510 */
|
||||||
) {
|
) {
|
||||||
printk(KERN_INFO "FIXME: Clock \"%s\" seems unused\n",
|
printk(KERN_INFO "FIXME: Clock \"%s\" seems unused\n",
|
||||||
clk->name);
|
clk->name);
|
||||||
|
|
|
@ -82,7 +82,7 @@ static void mistral_setled(void)
|
||||||
red = 1;
|
red = 1;
|
||||||
else if (hw_led_state & IDLE_LED)
|
else if (hw_led_state & IDLE_LED)
|
||||||
green = 1;
|
green = 1;
|
||||||
// else both sides are disabled
|
/* else both sides are disabled */
|
||||||
|
|
||||||
omap_set_gpio_dataout(GPIO_LED_GREEN, green);
|
omap_set_gpio_dataout(GPIO_LED_GREEN, green);
|
||||||
omap_set_gpio_dataout(GPIO_LED_RED, red);
|
omap_set_gpio_dataout(GPIO_LED_RED, red);
|
||||||
|
@ -112,7 +112,7 @@ void osk_leds_event(led_event_t evt)
|
||||||
case led_stop:
|
case led_stop:
|
||||||
led_state &= ~LED_STATE_ENABLED;
|
led_state &= ~LED_STATE_ENABLED;
|
||||||
hw_led_state = 0;
|
hw_led_state = 0;
|
||||||
// NOTE: work may still be pending!!
|
/* NOTE: work may still be pending!! */
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case led_claim:
|
case led_claim:
|
||||||
|
|
Loading…
Reference in New Issue