Merge branch 'next' into for-linus

[~andy/linux] / arch / arm / mach-davinci / board-da850-evm.c

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 1b6775ab3b5a7f5fe3531e90d8185eb05860a068..bea6793a7ede41cb04822303956d28347037460b 100644 (file)
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -335,12 +335,7 @@ static const short da850_evm_nor_pins[] = {
        -1
 };
 
-#if defined(CONFIG_MMC_DAVINCI) || \
-    defined(CONFIG_MMC_DAVINCI_MODULE)
-#define HAS_MMC 1
-#else
-#define HAS_MMC 0
-#endif
+#define HAS_MMC                IS_ENABLED(CONFIG_MMC_DAVINCI)
 
 static inline void da850_evm_setup_nor_nand(void)
 {
@@ -401,7 +396,7 @@ enum da850_evm_ui_exp_pins {
        DA850_EVM_UI_EXP_PB1,
 };
 
-static const char const *da850_evm_ui_exp[] = {
+static const char * const da850_evm_ui_exp[] = {
        [DA850_EVM_UI_EXP_SEL_C]        = "sel_c",
        [DA850_EVM_UI_EXP_SEL_B]        = "sel_b",
        [DA850_EVM_UI_EXP_SEL_A]        = "sel_a",
@@ -565,7 +560,7 @@ enum da850_evm_bb_exp_pins {
        DA850_EVM_BB_EXP_USER_SW8
 };
 
-static const char const *da850_evm_bb_exp[] = {
+static const char * const da850_evm_bb_exp[] = {
        [DA850_EVM_BB_EXP_DEEP_SLEEP_EN]        = "deep_sleep_en",
        [DA850_EVM_BB_EXP_SW_RST]               = "sw_rst",
        [DA850_EVM_BB_EXP_TP_23]                = "tp_23",
@@ -802,7 +797,6 @@ static struct davinci_mmc_config da850_mmc_config = {
        .wires          = 4,
        .max_freq       = 50000000,
        .caps           = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,
-       .version        = MMC_CTLR_VERSION_2,
 };
 
 static const short da850_evm_mmcsd0_pins[] __initconst = {
@@ -1371,7 +1365,6 @@ static struct davinci_mmc_config da850_wl12xx_mmc_config = {
        .max_freq       = 25000000,
        .caps           = MMC_CAP_4_BIT_DATA | MMC_CAP_NONREMOVABLE |
                          MMC_CAP_POWER_OFF_CARD,
-       .version        = MMC_CTLR_VERSION_2,
 };
 
 static const short da850_wl12xx_pins[] __initconst = {
@@ -1578,6 +1571,11 @@ static __init void da850_evm_init(void)
                pr_warn("%s: SATA registration failed: %d\n", __func__, ret);
 
        da850_evm_setup_mac_addr();
+
+       ret = da8xx_register_rproc();
+       if (ret)
+               pr_warn("%s: dsp/rproc registration failed: %d\n",
+                       __func__, ret);
 }
 
 #ifdef CONFIG_SERIAL_8250_CONSOLE
@@ -1605,4 +1603,5 @@ MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM")
        .init_late      = davinci_init_late,
        .dma_zone_size  = SZ_128M,
        .restart        = da8xx_restart,
+       .reserve        = da8xx_rproc_reserve_cma,
 MACHINE_END