aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/board-da850-evm.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-davinci/board-da850-evm.c')
-rw-r--r--arch/arm/mach-davinci/board-da850-evm.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 0aef6b2eb13d..a7b41bf505f1 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -298,8 +298,6 @@ static const short da850_evm_nor_pins[] = {
298 -1 298 -1
299}; 299};
300 300
301static u32 ui_card_detected;
302
303#if defined(CONFIG_MMC_DAVINCI) || \ 301#if defined(CONFIG_MMC_DAVINCI) || \
304 defined(CONFIG_MMC_DAVINCI_MODULE) 302 defined(CONFIG_MMC_DAVINCI_MODULE)
305#define HAS_MMC 1 303#define HAS_MMC 1
@@ -311,7 +309,7 @@ static inline void da850_evm_setup_nor_nand(void)
311{ 309{
312 int ret = 0; 310 int ret = 0;
313 311
314 if (ui_card_detected & !HAS_MMC) { 312 if (!HAS_MMC) {
315 ret = davinci_cfg_reg_list(da850_evm_nand_pins); 313 ret = davinci_cfg_reg_list(da850_evm_nand_pins);
316 if (ret) 314 if (ret)
317 pr_warning("da850_evm_init: nand mux setup failed: " 315 pr_warning("da850_evm_init: nand mux setup failed: "
@@ -461,7 +459,6 @@ static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio,
461 goto exp_setup_keys_fail; 459 goto exp_setup_keys_fail;
462 } 460 }
463 461
464 ui_card_detected = 1;
465 pr_info("DA850/OMAP-L138 EVM UI card detected\n"); 462 pr_info("DA850/OMAP-L138 EVM UI card detected\n");
466 463
467 da850_evm_setup_nor_nand(); 464 da850_evm_setup_nor_nand();