From 94b69c6913251c508dcc545f847472433ae22fa0 Mon Sep 17 00:00:00 2001 From: Ulf Hansson Date: Tue, 6 Sep 2011 16:55:44 +0200 Subject: mach-ux500: Solved rebase conflict for sd/mmc U8500: From commit 69a86710 by Philippe Langlais, corrections done for MCI defines. From commit 2e7233f2 by Philippe Langlais, corrections done for SDIO_CMD53 workaround. U5500: From commit be4f9997 by Philippe Langlais, corrections done for SDIO_CMD53 workaround. Change-Id: I3d5bb2565bb4ba5e86308108db77c192ffcdb690 --- arch/arm/mach-ux500/board-mop500-sdi.c | 3 +-- arch/arm/mach-ux500/board-u5500-sdi.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'arch') diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index 2720fbc5fa8..a69cb13ba43 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c @@ -127,8 +127,7 @@ static struct mmci_platform_data mop500_sdi1_data = { .ocr_mask = MMC_VDD_29_30, .f_max = 15000000, .capabilities = MMC_CAP_4_BIT_DATA | - MMC_CAP_SDIO_IRQ | - MMC_CAP_BROKEN_SDIO_CMD53, + MMC_CAP_SDIO_IRQ, .gpio_cd = -1, .gpio_wp = -1, #ifdef CONFIG_STE_DMA40 diff --git a/arch/arm/mach-ux500/board-u5500-sdi.c b/arch/arm/mach-ux500/board-u5500-sdi.c index 495734ca072..abad7fb1cbc 100644 --- a/arch/arm/mach-ux500/board-u5500-sdi.c +++ b/arch/arm/mach-ux500/board-u5500-sdi.c @@ -175,8 +175,7 @@ static struct mmci_platform_data u5500_sdi3_data = { .ocr_mask = MMC_VDD_29_30, .f_max = 50000000, .capabilities = MMC_CAP_4_BIT_DATA | - MMC_CAP_SDIO_IRQ | - MMC_CAP_BROKEN_SDIO_CMD53, + MMC_CAP_SDIO_IRQ, .gpio_cd = -1, .gpio_wp = -1, #ifdef CONFIG_STE_DMA40 -- cgit v1.2.3