From 5172d663997e1ba33679cc7559e4900c5d4163be Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Tue, 11 Feb 2014 19:09:28 +0100 Subject: imx233: cleanup in sdmmc Change-Id: I82eac65b1bf9f2e963c4ebfb7c22da678ae63642 --- firmware/target/arm/imx233/sdmmc-imx233.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'firmware') diff --git a/firmware/target/arm/imx233/sdmmc-imx233.c b/firmware/target/arm/imx233/sdmmc-imx233.c index 7df0e412e5..dbca78be79 100644 --- a/firmware/target/arm/imx233/sdmmc-imx233.c +++ b/firmware/target/arm/imx233/sdmmc-imx233.c @@ -427,17 +427,15 @@ static int init_sd_card(int drive) /* Try to switch V2 cards to HS timings, non HS seem to ignore this */ if(sd_v2) { + /* only transfer 64 bytes */ + imx233_ssp_set_block_size(ssp, /*log2(64)*/6); /* CMD6 switch to HS */ - { - /* only transfer 64 bytes */ - imx233_ssp_set_block_size(ssp, /*log2(64)*/6); - if(imx233_ssp_sd_mmc_transfer(ssp, SD_SWITCH_FUNC, 0x80fffff1, - SSP_SHORT_RESP, aligned_buffer[drive], 1, true, true, NULL)) - return -12; - imx233_ssp_set_block_size(ssp, /*log2(512)*/9); - if((aligned_buffer[drive][16] & 0xf) == 1) - sd_hs = true; - } + if(imx233_ssp_sd_mmc_transfer(ssp, SD_SWITCH_FUNC, 0x80fffff1, + SSP_SHORT_RESP, aligned_buffer[drive], 1, true, true, NULL)) + return -12; + imx233_ssp_set_block_size(ssp, /*log2(512)*/9); + if((aligned_buffer[drive][16] & 0xf) == 1) + sd_hs = true; } /* probe for CMD23 support */ @@ -954,7 +952,7 @@ int mmc_init(void) if(SDMMC_FLAGS(drive) & PROBE) continue; else - panicf("init_drive(%d) failed: %d (mmc)", ret); + panicf("init_drive(%d) failed: %d (mmc)", drive, ret); } mmc_map[_mmc_num_drives++] = drive; } -- cgit v1.2.3