From f72606ab1e40707a3dc9243e0d0b87b98654e02b Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 1 Jul 2015 12:51:52 +0100 Subject: [PATCH] bcm2835-sdhost: Clear HBLC for PIO mode Also update pio_limit default in overlay README. --- arch/arm/boot/dts/overlays/README | 2 +- drivers/mmc/host/bcm2835-sdhost.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README index d81d41ac5a208b..980d3583b2a36d 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -441,7 +441,7 @@ Params: overclock_50 Clock (in MHz) to use when the MMC framework force_pio Disable DMA support (default off) pio_limit Number of blocks above which to use DMA - (default 2) + (default 1) debug Enable debug output (default off) diff --git a/drivers/mmc/host/bcm2835-sdhost.c b/drivers/mmc/host/bcm2835-sdhost.c index a03db06d3240f9..d65870a1157f02 100644 --- a/drivers/mmc/host/bcm2835-sdhost.c +++ b/drivers/mmc/host/bcm2835-sdhost.c @@ -699,8 +699,7 @@ static void bcm2835_sdhost_prepare_data(struct bcm2835_host *host, struct mmc_co bcm2835_sdhost_set_transfer_irqs(host); bcm2835_sdhost_write(host, data->blksz, SDHBCT); - if (host->use_dma) - bcm2835_sdhost_write(host, data->blocks, SDHBLC); + bcm2835_sdhost_write(host, host->use_dma ? data->blocks : 0, SDHBLC); BUG_ON(!host->data); }