Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a623fb5 authored by Andrew Bresticker's avatar Andrew Bresticker Committed by Dmitry Shmidt
Browse files

ANDROID: mmc: sdio: Disable retuning in sdio_reset_comm() 



Since sdio_reset_comm() re-initializes the SDIO card, disable retuning
before idling and shutting down the card.  Tuning will be re-enabled (if
necessary) in mmc_sdio_init_card().

BUG=chrome-os-partner:46444
TEST=With CL:311815, toggle WiFi on/off on Smaug and observe that the
WiFi card comes back up and is able to tune successfully.

Change-Id: Ib4a5cfd4d75fc9e3ed7bb3f1e2ffd30de16c5d28
Signed-off-by: default avatarAndrew Bresticker <abrestic@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/311797


Reviewed-by: default avatarDerek Basehore <dbasehore@chromium.org>

[briannorris: brought from Chromium kernel in 3.18 -> 4.4 rebase]

Signed-off-by: default avatarBrian Norris <briannorris@google.com>
parent b5ea92ff

drivers/mmc/core/sdio.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 




#include "core.h"

#include "core.h"

#include "bus.h"

#include "bus.h"

#include "host.h"

#include "sd.h"

#include "sd.h"

#include "sdio_bus.h"

#include "sdio_bus.h"

#include "mmc_ops.h"

#include "mmc_ops.h"
@@ -1226,6 +1227,8 @@ int sdio_reset_comm(struct mmc_card *card) 
	printk("%s():\n", __func__);

	printk("%s():\n", __func__);

	mmc_claim_host(host);

	mmc_claim_host(host);





	mmc_retune_disable(host);



	mmc_go_idle(host);

	mmc_go_idle(host);





	mmc_set_clock(host, host->f_min);

	mmc_set_clock(host, host->f_min);