|
@@ -95,17 +95,17 @@ omap_otg_init(struct omap_usb_config *config)
|
|
|
|
|
|
printk("USB: hmc %d", config->hmc_mode);
|
|
|
if (!alt_pingroup)
|
|
|
- printk(", usb2 alt %d wires", config->pins[2]);
|
|
|
+ pr_cont(", usb2 alt %d wires", config->pins[2]);
|
|
|
else if (config->pins[0])
|
|
|
- printk(", usb0 %d wires%s", config->pins[0],
|
|
|
+ pr_cont(", usb0 %d wires%s", config->pins[0],
|
|
|
is_usb0_device(config) ? " (dev)" : "");
|
|
|
if (config->pins[1])
|
|
|
- printk(", usb1 %d wires", config->pins[1]);
|
|
|
+ pr_cont(", usb1 %d wires", config->pins[1]);
|
|
|
if (!alt_pingroup && config->pins[2])
|
|
|
- printk(", usb2 %d wires", config->pins[2]);
|
|
|
+ pr_cont(", usb2 %d wires", config->pins[2]);
|
|
|
if (config->otg)
|
|
|
- printk(", Mini-AB on usb%d", config->otg - 1);
|
|
|
- printk("\n");
|
|
|
+ pr_cont(", Mini-AB on usb%d", config->otg - 1);
|
|
|
+ pr_cont("\n");
|
|
|
|
|
|
if (cpu_class_is_omap1()) {
|
|
|
u16 w;
|
|
@@ -573,13 +573,13 @@ static void __init omap_1510_usb_init(struct omap_usb_config *config)
|
|
|
|
|
|
printk("USB: hmc %d", config->hmc_mode);
|
|
|
if (config->pins[0])
|
|
|
- printk(", usb0 %d wires%s", config->pins[0],
|
|
|
+ pr_cont(", usb0 %d wires%s", config->pins[0],
|
|
|
is_usb0_device(config) ? " (dev)" : "");
|
|
|
if (config->pins[1])
|
|
|
- printk(", usb1 %d wires", config->pins[1]);
|
|
|
+ pr_cont(", usb1 %d wires", config->pins[1]);
|
|
|
if (config->pins[2])
|
|
|
- printk(", usb2 %d wires", config->pins[2]);
|
|
|
- printk("\n");
|
|
|
+ pr_cont(", usb2 %d wires", config->pins[2]);
|
|
|
+ pr_cont("\n");
|
|
|
|
|
|
/* use DPLL for 48 MHz function clock */
|
|
|
pr_debug("APLL %04x DPLL %04x REQ %04x\n", omap_readw(ULPD_APLL_CTRL),
|