diff options
-rw-r--r-- | arch/arm/configs/da8xx_omapl_defconfig | 3 | ||||
-rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 3 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-da850-evm.c | 102 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-omapl138-hawk.c | 30 |
4 files changed, 60 insertions, 78 deletions
diff --git a/arch/arm/configs/da8xx_omapl_defconfig b/arch/arm/configs/da8xx_omapl_defconfig index f29223954af8..6b36a5ae03c2 100644 --- a/arch/arm/configs/da8xx_omapl_defconfig +++ b/arch/arm/configs/da8xx_omapl_defconfig | |||
@@ -36,6 +36,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=m | |||
36 | CONFIG_CPU_FREQ_GOV_POWERSAVE=m | 36 | CONFIG_CPU_FREQ_GOV_POWERSAVE=m |
37 | CONFIG_CPU_FREQ_GOV_ONDEMAND=m | 37 | CONFIG_CPU_FREQ_GOV_ONDEMAND=m |
38 | CONFIG_CPU_IDLE=y | 38 | CONFIG_CPU_IDLE=y |
39 | CONFIG_PM_RUNTIME=y | ||
39 | CONFIG_NET=y | 40 | CONFIG_NET=y |
40 | CONFIG_PACKET=y | 41 | CONFIG_PACKET=y |
41 | CONFIG_UNIX=y | 42 | CONFIG_UNIX=y |
@@ -45,6 +46,8 @@ CONFIG_IP_PNP_DHCP=y | |||
45 | # CONFIG_INET_LRO is not set | 46 | # CONFIG_INET_LRO is not set |
46 | CONFIG_NETFILTER=y | 47 | CONFIG_NETFILTER=y |
47 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 48 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
49 | CONFIG_DEVTMPFS=y | ||
50 | CONFIG_DEVTMPFS_MOUNT=y | ||
48 | # CONFIG_FW_LOADER is not set | 51 | # CONFIG_FW_LOADER is not set |
49 | CONFIG_BLK_DEV_LOOP=m | 52 | CONFIG_BLK_DEV_LOOP=m |
50 | CONFIG_BLK_DEV_RAM=y | 53 | CONFIG_BLK_DEV_RAM=y |
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 4ea7c95719d2..3edc78a40b66 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig | |||
@@ -33,6 +33,7 @@ CONFIG_AEABI=y | |||
33 | CONFIG_LEDS=y | 33 | CONFIG_LEDS=y |
34 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 34 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
35 | CONFIG_ZBOOT_ROM_BSS=0x0 | 35 | CONFIG_ZBOOT_ROM_BSS=0x0 |
36 | CONFIG_PM_RUNTIME=y | ||
36 | CONFIG_NET=y | 37 | CONFIG_NET=y |
37 | CONFIG_PACKET=y | 38 | CONFIG_PACKET=y |
38 | CONFIG_UNIX=y | 39 | CONFIG_UNIX=y |
@@ -42,6 +43,8 @@ CONFIG_IP_PNP_DHCP=y | |||
42 | # CONFIG_INET_LRO is not set | 43 | # CONFIG_INET_LRO is not set |
43 | CONFIG_NETFILTER=y | 44 | CONFIG_NETFILTER=y |
44 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 45 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
46 | CONFIG_DEVTMPFS=y | ||
47 | CONFIG_DEVTMPFS_MOUNT=y | ||
45 | # CONFIG_FW_LOADER is not set | 48 | # CONFIG_FW_LOADER is not set |
46 | CONFIG_MTD=m | 49 | CONFIG_MTD=m |
47 | CONFIG_MTD_PARTITIONS=y | 50 | CONFIG_MTD_PARTITIONS=y |
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 0299915575a8..fae66e37f6e6 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c | |||
@@ -349,13 +349,13 @@ static inline void da850_evm_setup_nor_nand(void) | |||
349 | if (!HAS_MMC) { | 349 | if (!HAS_MMC) { |
350 | ret = davinci_cfg_reg_list(da850_evm_nand_pins); | 350 | ret = davinci_cfg_reg_list(da850_evm_nand_pins); |
351 | if (ret) | 351 | if (ret) |
352 | pr_warning("da850_evm_init: nand mux setup failed: " | 352 | pr_warn("%s: NAND mux setup failed: %d\n", |
353 | "%d\n", ret); | 353 | __func__, ret); |
354 | 354 | ||
355 | ret = davinci_cfg_reg_list(da850_evm_nor_pins); | 355 | ret = davinci_cfg_reg_list(da850_evm_nor_pins); |
356 | if (ret) | 356 | if (ret) |
357 | pr_warning("da850_evm_init: nor mux setup failed: %d\n", | 357 | pr_warn("%s: NOR mux setup failed: %d\n", |
358 | ret); | 358 | __func__, ret); |
359 | 359 | ||
360 | da850_evm_init_nor(); | 360 | da850_evm_init_nor(); |
361 | 361 | ||
@@ -477,19 +477,19 @@ static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio, | |||
477 | 477 | ||
478 | ret = gpio_request(sel_a, da850_evm_ui_exp[DA850_EVM_UI_EXP_SEL_A]); | 478 | ret = gpio_request(sel_a, da850_evm_ui_exp[DA850_EVM_UI_EXP_SEL_A]); |
479 | if (ret) { | 479 | if (ret) { |
480 | pr_warning("Cannot open UI expander pin %d\n", sel_a); | 480 | pr_warn("Cannot open UI expander pin %d\n", sel_a); |
481 | goto exp_setup_sela_fail; | 481 | goto exp_setup_sela_fail; |
482 | } | 482 | } |
483 | 483 | ||
484 | ret = gpio_request(sel_b, da850_evm_ui_exp[DA850_EVM_UI_EXP_SEL_B]); | 484 | ret = gpio_request(sel_b, da850_evm_ui_exp[DA850_EVM_UI_EXP_SEL_B]); |
485 | if (ret) { | 485 | if (ret) { |
486 | pr_warning("Cannot open UI expander pin %d\n", sel_b); | 486 | pr_warn("Cannot open UI expander pin %d\n", sel_b); |
487 | goto exp_setup_selb_fail; | 487 | goto exp_setup_selb_fail; |
488 | } | 488 | } |
489 | 489 | ||
490 | ret = gpio_request(sel_c, da850_evm_ui_exp[DA850_EVM_UI_EXP_SEL_C]); | 490 | ret = gpio_request(sel_c, da850_evm_ui_exp[DA850_EVM_UI_EXP_SEL_C]); |
491 | if (ret) { | 491 | if (ret) { |
492 | pr_warning("Cannot open UI expander pin %d\n", sel_c); | 492 | pr_warn("Cannot open UI expander pin %d\n", sel_c); |
493 | goto exp_setup_selc_fail; | 493 | goto exp_setup_selc_fail; |
494 | } | 494 | } |
495 | 495 | ||
@@ -501,7 +501,7 @@ static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio, | |||
501 | da850_evm_ui_keys_init(gpio); | 501 | da850_evm_ui_keys_init(gpio); |
502 | ret = platform_device_register(&da850_evm_ui_keys_device); | 502 | ret = platform_device_register(&da850_evm_ui_keys_device); |
503 | if (ret) { | 503 | if (ret) { |
504 | pr_warning("Could not register UI GPIO expander push-buttons"); | 504 | pr_warn("Could not register UI GPIO expander push-buttons"); |
505 | goto exp_setup_keys_fail; | 505 | goto exp_setup_keys_fail; |
506 | } | 506 | } |
507 | 507 | ||
@@ -690,14 +690,14 @@ static int da850_evm_bb_expander_setup(struct i2c_client *client, | |||
690 | da850_evm_bb_keys_init(gpio); | 690 | da850_evm_bb_keys_init(gpio); |
691 | ret = platform_device_register(&da850_evm_bb_keys_device); | 691 | ret = platform_device_register(&da850_evm_bb_keys_device); |
692 | if (ret) { | 692 | if (ret) { |
693 | pr_warning("Could not register baseboard GPIO expander keys"); | 693 | pr_warn("Could not register baseboard GPIO expander keys"); |
694 | goto io_exp_setup_sw_fail; | 694 | goto io_exp_setup_sw_fail; |
695 | } | 695 | } |
696 | 696 | ||
697 | da850_evm_bb_leds_init(gpio); | 697 | da850_evm_bb_leds_init(gpio); |
698 | ret = platform_device_register(&da850_evm_bb_leds_device); | 698 | ret = platform_device_register(&da850_evm_bb_leds_device); |
699 | if (ret) { | 699 | if (ret) { |
700 | pr_warning("Could not register baseboard GPIO expander LEDS"); | 700 | pr_warn("Could not register baseboard GPIO expander LEDs"); |
701 | goto io_exp_setup_leds_fail; | 701 | goto io_exp_setup_leds_fail; |
702 | } | 702 | } |
703 | 703 | ||
@@ -1065,21 +1065,19 @@ static int __init da850_evm_config_emac(void) | |||
1065 | } | 1065 | } |
1066 | 1066 | ||
1067 | if (ret) | 1067 | if (ret) |
1068 | pr_warning("da850_evm_init: cpgmac/rmii mux setup failed: %d\n", | 1068 | pr_warn("%s: CPGMAC/RMII mux setup failed: %d\n", |
1069 | ret); | 1069 | __func__, ret); |
1070 | 1070 | ||
1071 | /* configure the CFGCHIP3 register for RMII or MII */ | 1071 | /* configure the CFGCHIP3 register for RMII or MII */ |
1072 | __raw_writel(val, cfg_chip3_base); | 1072 | __raw_writel(val, cfg_chip3_base); |
1073 | 1073 | ||
1074 | ret = davinci_cfg_reg(DA850_GPIO2_6); | 1074 | ret = davinci_cfg_reg(DA850_GPIO2_6); |
1075 | if (ret) | 1075 | if (ret) |
1076 | pr_warning("da850_evm_init:GPIO(2,6) mux setup " | 1076 | pr_warn("%s:GPIO(2,6) mux setup failed\n", __func__); |
1077 | "failed\n"); | ||
1078 | 1077 | ||
1079 | ret = gpio_request(DA850_MII_MDIO_CLKEN_PIN, "mdio_clk_en"); | 1078 | ret = gpio_request(DA850_MII_MDIO_CLKEN_PIN, "mdio_clk_en"); |
1080 | if (ret) { | 1079 | if (ret) { |
1081 | pr_warning("Cannot open GPIO %d\n", | 1080 | pr_warn("Cannot open GPIO %d\n", DA850_MII_MDIO_CLKEN_PIN); |
1082 | DA850_MII_MDIO_CLKEN_PIN); | ||
1083 | return ret; | 1081 | return ret; |
1084 | } | 1082 | } |
1085 | 1083 | ||
@@ -1090,8 +1088,7 @@ static int __init da850_evm_config_emac(void) | |||
1090 | 1088 | ||
1091 | ret = da8xx_register_emac(); | 1089 | ret = da8xx_register_emac(); |
1092 | if (ret) | 1090 | if (ret) |
1093 | pr_warning("da850_evm_init: emac registration failed: %d\n", | 1091 | pr_warn("%s: EMAC registration failed: %d\n", __func__, ret); |
1094 | ret); | ||
1095 | 1092 | ||
1096 | return 0; | 1093 | return 0; |
1097 | } | 1094 | } |
@@ -1443,57 +1440,53 @@ static __init void da850_evm_init(void) | |||
1443 | 1440 | ||
1444 | ret = pmic_tps65070_init(); | 1441 | ret = pmic_tps65070_init(); |
1445 | if (ret) | 1442 | if (ret) |
1446 | pr_warning("da850_evm_init: TPS65070 PMIC init failed: %d\n", | 1443 | pr_warn("%s: TPS65070 PMIC init failed: %d\n", __func__, ret); |
1447 | ret); | ||
1448 | 1444 | ||
1449 | ret = da850_register_edma(da850_edma_rsv); | 1445 | ret = da850_register_edma(da850_edma_rsv); |
1450 | if (ret) | 1446 | if (ret) |
1451 | pr_warning("da850_evm_init: edma registration failed: %d\n", | 1447 | pr_warn("%s: EDMA registration failed: %d\n", __func__, ret); |
1452 | ret); | ||
1453 | 1448 | ||
1454 | ret = davinci_cfg_reg_list(da850_i2c0_pins); | 1449 | ret = davinci_cfg_reg_list(da850_i2c0_pins); |
1455 | if (ret) | 1450 | if (ret) |
1456 | pr_warning("da850_evm_init: i2c0 mux setup failed: %d\n", | 1451 | pr_warn("%s: I2C0 mux setup failed: %d\n", __func__, ret); |
1457 | ret); | ||
1458 | 1452 | ||
1459 | ret = da8xx_register_i2c(0, &da850_evm_i2c_0_pdata); | 1453 | ret = da8xx_register_i2c(0, &da850_evm_i2c_0_pdata); |
1460 | if (ret) | 1454 | if (ret) |
1461 | pr_warning("da850_evm_init: i2c0 registration failed: %d\n", | 1455 | pr_warn("%s: I2C0 registration failed: %d\n", __func__, ret); |
1462 | ret); | ||
1463 | 1456 | ||
1464 | 1457 | ||
1465 | ret = da8xx_register_watchdog(); | 1458 | ret = da8xx_register_watchdog(); |
1466 | if (ret) | 1459 | if (ret) |
1467 | pr_warning("da830_evm_init: watchdog registration failed: %d\n", | 1460 | pr_warn("%s: watchdog registration failed: %d\n", |
1468 | ret); | 1461 | __func__, ret); |
1469 | 1462 | ||
1470 | if (HAS_MMC) { | 1463 | if (HAS_MMC) { |
1471 | ret = davinci_cfg_reg_list(da850_evm_mmcsd0_pins); | 1464 | ret = davinci_cfg_reg_list(da850_evm_mmcsd0_pins); |
1472 | if (ret) | 1465 | if (ret) |
1473 | pr_warning("da850_evm_init: mmcsd0 mux setup failed:" | 1466 | pr_warn("%s: MMCSD0 mux setup failed: %d\n", |
1474 | " %d\n", ret); | 1467 | __func__, ret); |
1475 | 1468 | ||
1476 | ret = gpio_request(DA850_MMCSD_CD_PIN, "MMC CD\n"); | 1469 | ret = gpio_request(DA850_MMCSD_CD_PIN, "MMC CD\n"); |
1477 | if (ret) | 1470 | if (ret) |
1478 | pr_warning("da850_evm_init: can not open GPIO %d\n", | 1471 | pr_warn("%s: can not open GPIO %d\n", |
1479 | DA850_MMCSD_CD_PIN); | 1472 | __func__, DA850_MMCSD_CD_PIN); |
1480 | gpio_direction_input(DA850_MMCSD_CD_PIN); | 1473 | gpio_direction_input(DA850_MMCSD_CD_PIN); |
1481 | 1474 | ||
1482 | ret = gpio_request(DA850_MMCSD_WP_PIN, "MMC WP\n"); | 1475 | ret = gpio_request(DA850_MMCSD_WP_PIN, "MMC WP\n"); |
1483 | if (ret) | 1476 | if (ret) |
1484 | pr_warning("da850_evm_init: can not open GPIO %d\n", | 1477 | pr_warn("%s: can not open GPIO %d\n", |
1485 | DA850_MMCSD_WP_PIN); | 1478 | __func__, DA850_MMCSD_WP_PIN); |
1486 | gpio_direction_input(DA850_MMCSD_WP_PIN); | 1479 | gpio_direction_input(DA850_MMCSD_WP_PIN); |
1487 | 1480 | ||
1488 | ret = da8xx_register_mmcsd0(&da850_mmc_config); | 1481 | ret = da8xx_register_mmcsd0(&da850_mmc_config); |
1489 | if (ret) | 1482 | if (ret) |
1490 | pr_warning("da850_evm_init: mmcsd0 registration failed:" | 1483 | pr_warn("%s: MMCSD0 registration failed: %d\n", |
1491 | " %d\n", ret); | 1484 | __func__, ret); |
1492 | 1485 | ||
1493 | ret = da850_wl12xx_init(); | 1486 | ret = da850_wl12xx_init(); |
1494 | if (ret) | 1487 | if (ret) |
1495 | pr_warning("da850_evm_init: wl12xx initialization" | 1488 | pr_warn("%s: WL12xx initialization failed: %d\n", |
1496 | " failed: %d\n", ret); | 1489 | __func__, ret); |
1497 | } | 1490 | } |
1498 | 1491 | ||
1499 | davinci_serial_init(&da850_evm_uart_config); | 1492 | davinci_serial_init(&da850_evm_uart_config); |
@@ -1511,16 +1504,14 @@ static __init void da850_evm_init(void) | |||
1511 | 1504 | ||
1512 | ret = davinci_cfg_reg_list(da850_evm_mcasp_pins); | 1505 | ret = davinci_cfg_reg_list(da850_evm_mcasp_pins); |
1513 | if (ret) | 1506 | if (ret) |
1514 | pr_warning("da850_evm_init: mcasp mux setup failed: %d\n", | 1507 | pr_warn("%s: McASP mux setup failed: %d\n", __func__, ret); |
1515 | ret); | ||
1516 | 1508 | ||
1517 | da850_evm_snd_data.sram_pool = sram_get_gen_pool(); | 1509 | da850_evm_snd_data.sram_pool = sram_get_gen_pool(); |
1518 | da8xx_register_mcasp(0, &da850_evm_snd_data); | 1510 | da8xx_register_mcasp(0, &da850_evm_snd_data); |
1519 | 1511 | ||
1520 | ret = davinci_cfg_reg_list(da850_lcdcntl_pins); | 1512 | ret = davinci_cfg_reg_list(da850_lcdcntl_pins); |
1521 | if (ret) | 1513 | if (ret) |
1522 | pr_warning("da850_evm_init: lcdcntl mux setup failed: %d\n", | 1514 | pr_warn("%s: LCDC mux setup failed: %d\n", __func__, ret); |
1523 | ret); | ||
1524 | 1515 | ||
1525 | ret = da8xx_register_uio_pruss(); | 1516 | ret = da8xx_register_uio_pruss(); |
1526 | if (ret) | 1517 | if (ret) |
@@ -1530,51 +1521,44 @@ static __init void da850_evm_init(void) | |||
1530 | /* Handle board specific muxing for LCD here */ | 1521 | /* Handle board specific muxing for LCD here */ |
1531 | ret = davinci_cfg_reg_list(da850_evm_lcdc_pins); | 1522 | ret = davinci_cfg_reg_list(da850_evm_lcdc_pins); |
1532 | if (ret) | 1523 | if (ret) |
1533 | pr_warning("da850_evm_init: evm specific lcd mux setup " | 1524 | pr_warn("%s: EVM specific LCD mux setup failed: %d\n", |
1534 | "failed: %d\n", ret); | 1525 | __func__, ret); |
1535 | 1526 | ||
1536 | ret = da850_lcd_hw_init(); | 1527 | ret = da850_lcd_hw_init(); |
1537 | if (ret) | 1528 | if (ret) |
1538 | pr_warning("da850_evm_init: lcd initialization failed: %d\n", | 1529 | pr_warn("%s: LCD initialization failed: %d\n", __func__, ret); |
1539 | ret); | ||
1540 | 1530 | ||
1541 | sharp_lk043t1dg01_pdata.panel_power_ctrl = da850_panel_power_ctrl, | 1531 | sharp_lk043t1dg01_pdata.panel_power_ctrl = da850_panel_power_ctrl, |
1542 | ret = da8xx_register_lcdc(&sharp_lk043t1dg01_pdata); | 1532 | ret = da8xx_register_lcdc(&sharp_lk043t1dg01_pdata); |
1543 | if (ret) | 1533 | if (ret) |
1544 | pr_warning("da850_evm_init: lcdc registration failed: %d\n", | 1534 | pr_warn("%s: LCDC registration failed: %d\n", __func__, ret); |
1545 | ret); | ||
1546 | 1535 | ||
1547 | ret = da8xx_register_rtc(); | 1536 | ret = da8xx_register_rtc(); |
1548 | if (ret) | 1537 | if (ret) |
1549 | pr_warning("da850_evm_init: rtc setup failed: %d\n", ret); | 1538 | pr_warn("%s: RTC setup failed: %d\n", __func__, ret); |
1550 | 1539 | ||
1551 | ret = da850_evm_init_cpufreq(); | 1540 | ret = da850_evm_init_cpufreq(); |
1552 | if (ret) | 1541 | if (ret) |
1553 | pr_warning("da850_evm_init: cpufreq registration failed: %d\n", | 1542 | pr_warn("%s: cpufreq registration failed: %d\n", __func__, ret); |
1554 | ret); | ||
1555 | 1543 | ||
1556 | ret = da8xx_register_cpuidle(); | 1544 | ret = da8xx_register_cpuidle(); |
1557 | if (ret) | 1545 | if (ret) |
1558 | pr_warning("da850_evm_init: cpuidle registration failed: %d\n", | 1546 | pr_warn("%s: cpuidle registration failed: %d\n", __func__, ret); |
1559 | ret); | ||
1560 | 1547 | ||
1561 | ret = da850_register_pm(&da850_pm_device); | 1548 | ret = da850_register_pm(&da850_pm_device); |
1562 | if (ret) | 1549 | if (ret) |
1563 | pr_warning("da850_evm_init: suspend registration failed: %d\n", | 1550 | pr_warn("%s: suspend registration failed: %d\n", __func__, ret); |
1564 | ret); | ||
1565 | 1551 | ||
1566 | da850_vpif_init(); | 1552 | da850_vpif_init(); |
1567 | 1553 | ||
1568 | ret = da8xx_register_spi(1, da850evm_spi_info, | 1554 | ret = da8xx_register_spi(1, da850evm_spi_info, |
1569 | ARRAY_SIZE(da850evm_spi_info)); | 1555 | ARRAY_SIZE(da850evm_spi_info)); |
1570 | if (ret) | 1556 | if (ret) |
1571 | pr_warning("da850_evm_init: spi 1 registration failed: %d\n", | 1557 | pr_warn("%s: SPI 1 registration failed: %d\n", __func__, ret); |
1572 | ret); | ||
1573 | 1558 | ||
1574 | ret = da850_register_sata(DA850EVM_SATA_REFCLKPN_RATE); | 1559 | ret = da850_register_sata(DA850EVM_SATA_REFCLKPN_RATE); |
1575 | if (ret) | 1560 | if (ret) |
1576 | pr_warning("da850_evm_init: sata registration failed: %d\n", | 1561 | pr_warn("%s: SATA registration failed: %d\n", __func__, ret); |
1577 | ret); | ||
1578 | 1562 | ||
1579 | da850_evm_setup_mac_addr(); | 1563 | da850_evm_setup_mac_addr(); |
1580 | } | 1564 | } |
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index dc1208e9e664..d5a6bcd38903 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c | |||
@@ -48,8 +48,7 @@ static __init void omapl138_hawk_config_emac(void) | |||
48 | val &= ~BIT(8); | 48 | val &= ~BIT(8); |
49 | ret = davinci_cfg_reg_list(omapl138_hawk_mii_pins); | 49 | ret = davinci_cfg_reg_list(omapl138_hawk_mii_pins); |
50 | if (ret) { | 50 | if (ret) { |
51 | pr_warning("%s: cpgmac/mii mux setup failed: %d\n", | 51 | pr_warn("%s: CPGMAC/MII mux setup failed: %d\n", __func__, ret); |
52 | __func__, ret); | ||
53 | return; | 52 | return; |
54 | } | 53 | } |
55 | 54 | ||
@@ -61,8 +60,7 @@ static __init void omapl138_hawk_config_emac(void) | |||
61 | 60 | ||
62 | ret = da8xx_register_emac(); | 61 | ret = da8xx_register_emac(); |
63 | if (ret) | 62 | if (ret) |
64 | pr_warning("%s: emac registration failed: %d\n", | 63 | pr_warn("%s: EMAC registration failed: %d\n", __func__, ret); |
65 | __func__, ret); | ||
66 | } | 64 | } |
67 | 65 | ||
68 | /* | 66 | /* |
@@ -147,15 +145,14 @@ static __init void omapl138_hawk_mmc_init(void) | |||
147 | 145 | ||
148 | ret = davinci_cfg_reg_list(hawk_mmcsd0_pins); | 146 | ret = davinci_cfg_reg_list(hawk_mmcsd0_pins); |
149 | if (ret) { | 147 | if (ret) { |
150 | pr_warning("%s: MMC/SD0 mux setup failed: %d\n", | 148 | pr_warn("%s: MMC/SD0 mux setup failed: %d\n", __func__, ret); |
151 | __func__, ret); | ||
152 | return; | 149 | return; |
153 | } | 150 | } |
154 | 151 | ||
155 | ret = gpio_request_one(DA850_HAWK_MMCSD_CD_PIN, | 152 | ret = gpio_request_one(DA850_HAWK_MMCSD_CD_PIN, |
156 | GPIOF_DIR_IN, "MMC CD"); | 153 | GPIOF_DIR_IN, "MMC CD"); |
157 | if (ret < 0) { | 154 | if (ret < 0) { |
158 | pr_warning("%s: can not open GPIO %d\n", | 155 | pr_warn("%s: can not open GPIO %d\n", |
159 | __func__, DA850_HAWK_MMCSD_CD_PIN); | 156 | __func__, DA850_HAWK_MMCSD_CD_PIN); |
160 | return; | 157 | return; |
161 | } | 158 | } |
@@ -163,15 +160,14 @@ static __init void omapl138_hawk_mmc_init(void) | |||
163 | ret = gpio_request_one(DA850_HAWK_MMCSD_WP_PIN, | 160 | ret = gpio_request_one(DA850_HAWK_MMCSD_WP_PIN, |
164 | GPIOF_DIR_IN, "MMC WP"); | 161 | GPIOF_DIR_IN, "MMC WP"); |
165 | if (ret < 0) { | 162 | if (ret < 0) { |
166 | pr_warning("%s: can not open GPIO %d\n", | 163 | pr_warn("%s: can not open GPIO %d\n", |
167 | __func__, DA850_HAWK_MMCSD_WP_PIN); | 164 | __func__, DA850_HAWK_MMCSD_WP_PIN); |
168 | goto mmc_setup_wp_fail; | 165 | goto mmc_setup_wp_fail; |
169 | } | 166 | } |
170 | 167 | ||
171 | ret = da8xx_register_mmcsd0(&da850_mmc_config); | 168 | ret = da8xx_register_mmcsd0(&da850_mmc_config); |
172 | if (ret) { | 169 | if (ret) { |
173 | pr_warning("%s: MMC/SD0 registration failed: %d\n", | 170 | pr_warn("%s: MMC/SD0 registration failed: %d\n", __func__, ret); |
174 | __func__, ret); | ||
175 | goto mmc_setup_mmcsd_fail; | 171 | goto mmc_setup_mmcsd_fail; |
176 | } | 172 | } |
177 | 173 | ||
@@ -250,8 +246,7 @@ static __init void omapl138_hawk_usb_init(void) | |||
250 | 246 | ||
251 | ret = davinci_cfg_reg_list(da850_hawk_usb11_pins); | 247 | ret = davinci_cfg_reg_list(da850_hawk_usb11_pins); |
252 | if (ret) { | 248 | if (ret) { |
253 | pr_warning("%s: USB 1.1 PinMux setup failed: %d\n", | 249 | pr_warn("%s: USB 1.1 PinMux setup failed: %d\n", __func__, ret); |
254 | __func__, ret); | ||
255 | return; | 250 | return; |
256 | } | 251 | } |
257 | 252 | ||
@@ -280,8 +275,7 @@ static __init void omapl138_hawk_usb_init(void) | |||
280 | 275 | ||
281 | ret = da8xx_register_usb11(&omapl138_hawk_usb11_pdata); | 276 | ret = da8xx_register_usb11(&omapl138_hawk_usb11_pdata); |
282 | if (ret) { | 277 | if (ret) { |
283 | pr_warning("%s: USB 1.1 registration failed: %d\n", | 278 | pr_warn("%s: USB 1.1 registration failed: %d\n", __func__, ret); |
284 | __func__, ret); | ||
285 | goto usb11_setup_fail; | 279 | goto usb11_setup_fail; |
286 | } | 280 | } |
287 | 281 | ||
@@ -307,8 +301,7 @@ static __init void omapl138_hawk_init(void) | |||
307 | 301 | ||
308 | ret = da850_register_edma(da850_edma_rsv); | 302 | ret = da850_register_edma(da850_edma_rsv); |
309 | if (ret) | 303 | if (ret) |
310 | pr_warning("%s: EDMA registration failed: %d\n", | 304 | pr_warn("%s: EDMA registration failed: %d\n", __func__, ret); |
311 | __func__, ret); | ||
312 | 305 | ||
313 | omapl138_hawk_mmc_init(); | 306 | omapl138_hawk_mmc_init(); |
314 | 307 | ||
@@ -316,9 +309,8 @@ static __init void omapl138_hawk_init(void) | |||
316 | 309 | ||
317 | ret = da8xx_register_watchdog(); | 310 | ret = da8xx_register_watchdog(); |
318 | if (ret) | 311 | if (ret) |
319 | pr_warning("omapl138_hawk_init: " | 312 | pr_warn("%s: watchdog registration failed: %d\n", |
320 | "watchdog registration failed: %d\n", | 313 | __func__, ret); |
321 | ret); | ||
322 | } | 314 | } |
323 | 315 | ||
324 | #ifdef CONFIG_SERIAL_8250_CONSOLE | 316 | #ifdef CONFIG_SERIAL_8250_CONSOLE |