diff options
Diffstat (limited to 'arch/arm/mach-davinci/board-da850-evm.c')
-rw-r--r-- | arch/arm/mach-davinci/board-da850-evm.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index a74dec756647..8a24b6c6339f 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c | |||
@@ -396,7 +396,7 @@ enum da850_evm_ui_exp_pins { | |||
396 | DA850_EVM_UI_EXP_PB1, | 396 | DA850_EVM_UI_EXP_PB1, |
397 | }; | 397 | }; |
398 | 398 | ||
399 | static const char const *da850_evm_ui_exp[] = { | 399 | static const char * const da850_evm_ui_exp[] = { |
400 | [DA850_EVM_UI_EXP_SEL_C] = "sel_c", | 400 | [DA850_EVM_UI_EXP_SEL_C] = "sel_c", |
401 | [DA850_EVM_UI_EXP_SEL_B] = "sel_b", | 401 | [DA850_EVM_UI_EXP_SEL_B] = "sel_b", |
402 | [DA850_EVM_UI_EXP_SEL_A] = "sel_a", | 402 | [DA850_EVM_UI_EXP_SEL_A] = "sel_a", |
@@ -560,7 +560,7 @@ enum da850_evm_bb_exp_pins { | |||
560 | DA850_EVM_BB_EXP_USER_SW8 | 560 | DA850_EVM_BB_EXP_USER_SW8 |
561 | }; | 561 | }; |
562 | 562 | ||
563 | static const char const *da850_evm_bb_exp[] = { | 563 | static const char * const da850_evm_bb_exp[] = { |
564 | [DA850_EVM_BB_EXP_DEEP_SLEEP_EN] = "deep_sleep_en", | 564 | [DA850_EVM_BB_EXP_DEEP_SLEEP_EN] = "deep_sleep_en", |
565 | [DA850_EVM_BB_EXP_SW_RST] = "sw_rst", | 565 | [DA850_EVM_BB_EXP_SW_RST] = "sw_rst", |
566 | [DA850_EVM_BB_EXP_TP_23] = "tp_23", | 566 | [DA850_EVM_BB_EXP_TP_23] = "tp_23", |
@@ -797,7 +797,6 @@ static struct davinci_mmc_config da850_mmc_config = { | |||
797 | .wires = 4, | 797 | .wires = 4, |
798 | .max_freq = 50000000, | 798 | .max_freq = 50000000, |
799 | .caps = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED, | 799 | .caps = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED, |
800 | .version = MMC_CTLR_VERSION_2, | ||
801 | }; | 800 | }; |
802 | 801 | ||
803 | static const short da850_evm_mmcsd0_pins[] __initconst = { | 802 | static const short da850_evm_mmcsd0_pins[] __initconst = { |
@@ -1367,7 +1366,6 @@ static struct davinci_mmc_config da850_wl12xx_mmc_config = { | |||
1367 | .max_freq = 25000000, | 1366 | .max_freq = 25000000, |
1368 | .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_NONREMOVABLE | | 1367 | .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_NONREMOVABLE | |
1369 | MMC_CAP_POWER_OFF_CARD, | 1368 | MMC_CAP_POWER_OFF_CARD, |
1370 | .version = MMC_CTLR_VERSION_2, | ||
1371 | }; | 1369 | }; |
1372 | 1370 | ||
1373 | static const short da850_wl12xx_pins[] __initconst = { | 1371 | static const short da850_wl12xx_pins[] __initconst = { |
@@ -1574,6 +1572,11 @@ static __init void da850_evm_init(void) | |||
1574 | pr_warn("%s: SATA registration failed: %d\n", __func__, ret); | 1572 | pr_warn("%s: SATA registration failed: %d\n", __func__, ret); |
1575 | 1573 | ||
1576 | da850_evm_setup_mac_addr(); | 1574 | da850_evm_setup_mac_addr(); |
1575 | |||
1576 | ret = da8xx_register_rproc(); | ||
1577 | if (ret) | ||
1578 | pr_warn("%s: dsp/rproc registration failed: %d\n", | ||
1579 | __func__, ret); | ||
1577 | } | 1580 | } |
1578 | 1581 | ||
1579 | #ifdef CONFIG_SERIAL_8250_CONSOLE | 1582 | #ifdef CONFIG_SERIAL_8250_CONSOLE |
@@ -1601,4 +1604,5 @@ MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM") | |||
1601 | .init_late = davinci_init_late, | 1604 | .init_late = davinci_init_late, |
1602 | .dma_zone_size = SZ_128M, | 1605 | .dma_zone_size = SZ_128M, |
1603 | .restart = da8xx_restart, | 1606 | .restart = da8xx_restart, |
1607 | .reserve = da8xx_rproc_reserve_cma, | ||
1604 | MACHINE_END | 1608 | MACHINE_END |