|
@@ -80,8 +80,8 @@ static int da830_evm_usb_ocic_notify(da8xx_ocic_handler_t handler)
|
|
|
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
|
|
|
"OHCI over-current indicator", NULL);
|
|
|
if (error)
|
|
|
- printk(KERN_ERR "%s: could not request IRQ to watch "
|
|
|
- "over-current indicator changes\n", __func__);
|
|
|
+ pr_err("%s: could not request IRQ to watch over-current indicator changes\n",
|
|
|
+ __func__);
|
|
|
} else
|
|
|
free_irq(irq, NULL);
|
|
|
|
|
@@ -145,8 +145,7 @@ static __init void da830_evm_usb_init(void)
|
|
|
/* USB_REFCLKIN is not used. */
|
|
|
ret = davinci_cfg_reg(DA830_USB0_DRVVBUS);
|
|
|
if (ret)
|
|
|
- pr_warning("%s: USB 2.0 PinMux setup failed: %d\n",
|
|
|
- __func__, ret);
|
|
|
+ pr_warn("%s: USB 2.0 PinMux setup failed: %d\n", __func__, ret);
|
|
|
else {
|
|
|
/*
|
|
|
* TPS2065 switch @ 5V supplies 1 A (sustains 1.5 A),
|
|
@@ -154,37 +153,35 @@ static __init void da830_evm_usb_init(void)
|
|
|
*/
|
|
|
ret = da8xx_register_usb20(1000, 3);
|
|
|
if (ret)
|
|
|
- pr_warning("%s: USB 2.0 registration failed: %d\n",
|
|
|
- __func__, ret);
|
|
|
+ pr_warn("%s: USB 2.0 registration failed: %d\n",
|
|
|
+ __func__, ret);
|
|
|
}
|
|
|
|
|
|
ret = davinci_cfg_reg_list(da830_evm_usb11_pins);
|
|
|
if (ret) {
|
|
|
- pr_warning("%s: USB 1.1 PinMux setup failed: %d\n",
|
|
|
- __func__, ret);
|
|
|
+ pr_warn("%s: USB 1.1 PinMux setup failed: %d\n", __func__, ret);
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
ret = gpio_request(ON_BD_USB_DRV, "ON_BD_USB_DRV");
|
|
|
if (ret) {
|
|
|
- printk(KERN_ERR "%s: failed to request GPIO for USB 1.1 port "
|
|
|
- "power control: %d\n", __func__, ret);
|
|
|
+ pr_err("%s: failed to request GPIO for USB 1.1 port power control: %d\n",
|
|
|
+ __func__, ret);
|
|
|
return;
|
|
|
}
|
|
|
gpio_direction_output(ON_BD_USB_DRV, 0);
|
|
|
|
|
|
ret = gpio_request(ON_BD_USB_OVC, "ON_BD_USB_OVC");
|
|
|
if (ret) {
|
|
|
- printk(KERN_ERR "%s: failed to request GPIO for USB 1.1 port "
|
|
|
- "over-current indicator: %d\n", __func__, ret);
|
|
|
+ pr_err("%s: failed to request GPIO for USB 1.1 port over-current indicator: %d\n",
|
|
|
+ __func__, ret);
|
|
|
return;
|
|
|
}
|
|
|
gpio_direction_input(ON_BD_USB_OVC);
|
|
|
|
|
|
ret = da8xx_register_usb11(&da830_evm_usb11_pdata);
|
|
|
if (ret)
|
|
|
- pr_warning("%s: USB 1.1 registration failed: %d\n",
|
|
|
- __func__, ret);
|
|
|
+ pr_warn("%s: USB 1.1 registration failed: %d\n", __func__, ret);
|
|
|
}
|
|
|
|
|
|
static const short da830_evm_mcasp1_pins[] = {
|
|
@@ -252,31 +249,29 @@ static inline void da830_evm_init_mmc(void)
|
|
|
|
|
|
ret = davinci_cfg_reg_list(da830_evm_mmc_sd_pins);
|
|
|
if (ret) {
|
|
|
- pr_warning("da830_evm_init: mmc/sd mux setup failed: %d\n",
|
|
|
- ret);
|
|
|
+ pr_warn("%s: mmc/sd mux setup failed: %d\n", __func__, ret);
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
ret = gpio_request(DA830_MMCSD_WP_PIN, "MMC WP");
|
|
|
if (ret) {
|
|
|
- pr_warning("da830_evm_init: can not open GPIO %d\n",
|
|
|
- DA830_MMCSD_WP_PIN);
|
|
|
+ pr_warn("%s: can not open GPIO %d\n",
|
|
|
+ __func__, DA830_MMCSD_WP_PIN);
|
|
|
return;
|
|
|
}
|
|
|
gpio_direction_input(DA830_MMCSD_WP_PIN);
|
|
|
|
|
|
ret = gpio_request(DA830_MMCSD_CD_PIN, "MMC CD\n");
|
|
|
if (ret) {
|
|
|
- pr_warning("da830_evm_init: can not open GPIO %d\n",
|
|
|
- DA830_MMCSD_CD_PIN);
|
|
|
+ pr_warn("%s: can not open GPIO %d\n",
|
|
|
+ __func__, DA830_MMCSD_CD_PIN);
|
|
|
return;
|
|
|
}
|
|
|
gpio_direction_input(DA830_MMCSD_CD_PIN);
|
|
|
|
|
|
ret = da8xx_register_mmcsd0(&da830_evm_mmc_config);
|
|
|
if (ret) {
|
|
|
- pr_warning("da830_evm_init: mmc/sd registration failed: %d\n",
|
|
|
- ret);
|
|
|
+ pr_warn("%s: mmc/sd registration failed: %d\n", __func__, ret);
|
|
|
gpio_free(DA830_MMCSD_WP_PIN);
|
|
|
}
|
|
|
}
|
|
@@ -404,23 +399,21 @@ static inline void da830_evm_init_nand(int mux_mode)
|
|
|
int ret;
|
|
|
|
|
|
if (HAS_MMC) {
|
|
|
- pr_warning("WARNING: both MMC/SD and NAND are "
|
|
|
- "enabled, but they share AEMIF pins.\n"
|
|
|
- "\tDisable MMC/SD for NAND support.\n");
|
|
|
+ pr_warn("WARNING: both MMC/SD and NAND are enabled, but they share AEMIF pins\n"
|
|
|
+ "\tDisable MMC/SD for NAND support\n");
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
ret = davinci_cfg_reg_list(da830_evm_emif25_pins);
|
|
|
if (ret)
|
|
|
- pr_warning("da830_evm_init: emif25 mux setup failed: %d\n",
|
|
|
- ret);
|
|
|
+ pr_warn("%s: emif25 mux setup failed: %d\n", __func__, ret);
|
|
|
|
|
|
ret = platform_device_register(&da830_evm_nand_device);
|
|
|
if (ret)
|
|
|
- pr_warning("da830_evm_init: NAND device not registered.\n");
|
|
|
+ pr_warn("%s: NAND device not registered\n", __func__);
|
|
|
|
|
|
if (davinci_aemif_setup(&da830_evm_nand_device))
|
|
|
- pr_warn("%s: Cannot configure AEMIF.\n", __func__);
|
|
|
+ pr_warn("%s: Cannot configure AEMIF\n", __func__);
|
|
|
|
|
|
gpio_direction_output(mux_mode, 1);
|
|
|
}
|
|
@@ -435,12 +428,11 @@ static inline void da830_evm_init_lcdc(int mux_mode)
|
|
|
|
|
|
ret = davinci_cfg_reg_list(da830_lcdcntl_pins);
|
|
|
if (ret)
|
|
|
- pr_warning("da830_evm_init: lcdcntl mux setup failed: %d\n",
|
|
|
- ret);
|
|
|
+ pr_warn("%s: lcdcntl mux setup failed: %d\n", __func__, ret);
|
|
|
|
|
|
ret = da8xx_register_lcdc(&sharp_lcd035q3dg01_pdata);
|
|
|
if (ret)
|
|
|
- pr_warning("da830_evm_init: lcd setup failed: %d\n", ret);
|
|
|
+ pr_warn("%s: lcd setup failed: %d\n", __func__, ret);
|
|
|
|
|
|
gpio_direction_output(mux_mode, 0);
|
|
|
}
|
|
@@ -598,22 +590,19 @@ static __init void da830_evm_init(void)
|
|
|
|
|
|
ret = da830_register_gpio();
|
|
|
if (ret)
|
|
|
- pr_warn("da830_evm_init: GPIO init failed: %d\n", ret);
|
|
|
+ pr_warn("%s: GPIO init failed: %d\n", __func__, ret);
|
|
|
|
|
|
ret = da830_register_edma(da830_edma_rsv);
|
|
|
if (ret)
|
|
|
- pr_warning("da830_evm_init: edma registration failed: %d\n",
|
|
|
- ret);
|
|
|
+ pr_warn("%s: edma registration failed: %d\n", __func__, ret);
|
|
|
|
|
|
ret = davinci_cfg_reg_list(da830_i2c0_pins);
|
|
|
if (ret)
|
|
|
- pr_warning("da830_evm_init: i2c0 mux setup failed: %d\n",
|
|
|
- ret);
|
|
|
+ pr_warn("%s: i2c0 mux setup failed: %d\n", __func__, ret);
|
|
|
|
|
|
ret = da8xx_register_i2c(0, &da830_evm_i2c_0_pdata);
|
|
|
if (ret)
|
|
|
- pr_warning("da830_evm_init: i2c0 registration failed: %d\n",
|
|
|
- ret);
|
|
|
+ pr_warn("%s: i2c0 registration failed: %d\n", __func__, ret);
|
|
|
|
|
|
da830_evm_usb_init();
|
|
|
|
|
@@ -622,18 +611,16 @@ static __init void da830_evm_init(void)
|
|
|
|
|
|
ret = davinci_cfg_reg_list(da830_cpgmac_pins);
|
|
|
if (ret)
|
|
|
- pr_warning("da830_evm_init: cpgmac mux setup failed: %d\n",
|
|
|
- ret);
|
|
|
+ pr_warn("%s: cpgmac mux setup failed: %d\n", __func__, ret);
|
|
|
|
|
|
ret = da8xx_register_emac();
|
|
|
if (ret)
|
|
|
- pr_warning("da830_evm_init: emac registration failed: %d\n",
|
|
|
- ret);
|
|
|
+ pr_warn("%s: emac registration failed: %d\n", __func__, ret);
|
|
|
|
|
|
ret = da8xx_register_watchdog();
|
|
|
if (ret)
|
|
|
- pr_warning("da830_evm_init: watchdog registration failed: %d\n",
|
|
|
- ret);
|
|
|
+ pr_warn("%s: watchdog registration failed: %d\n",
|
|
|
+ __func__, ret);
|
|
|
|
|
|
davinci_serial_init(da8xx_serial_device);
|
|
|
i2c_register_board_info(1, da830_evm_i2c_devices,
|
|
@@ -641,8 +628,7 @@ static __init void da830_evm_init(void)
|
|
|
|
|
|
ret = davinci_cfg_reg_list(da830_evm_mcasp1_pins);
|
|
|
if (ret)
|
|
|
- pr_warning("da830_evm_init: mcasp1 mux setup failed: %d\n",
|
|
|
- ret);
|
|
|
+ pr_warn("%s: mcasp1 mux setup failed: %d\n", __func__, ret);
|
|
|
|
|
|
da8xx_register_mcasp(1, &da830_evm_snd_data);
|
|
|
|
|
@@ -650,18 +636,17 @@ static __init void da830_evm_init(void)
|
|
|
|
|
|
ret = da8xx_register_rtc();
|
|
|
if (ret)
|
|
|
- pr_warning("da830_evm_init: rtc setup failed: %d\n", ret);
|
|
|
+ pr_warn("%s: rtc setup failed: %d\n", __func__, ret);
|
|
|
|
|
|
ret = spi_register_board_info(da830evm_spi_info,
|
|
|
ARRAY_SIZE(da830evm_spi_info));
|
|
|
if (ret)
|
|
|
- pr_warn("%s: spi info registration failed: %d\n", __func__,
|
|
|
- ret);
|
|
|
+ pr_warn("%s: spi info registration failed: %d\n",
|
|
|
+ __func__, ret);
|
|
|
|
|
|
ret = da8xx_register_spi_bus(0, ARRAY_SIZE(da830evm_spi_info));
|
|
|
if (ret)
|
|
|
- pr_warning("da830_evm_init: spi 0 registration failed: %d\n",
|
|
|
- ret);
|
|
|
+ pr_warn("%s: spi 0 registration failed: %d\n", __func__, ret);
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_SERIAL_8250_CONSOLE
|