From 0e2876295b55b5ba6d6aa34c49be17e2fefa371a Mon Sep 17 00:00:00 2001
From: Franky Lin <frankyl@broadcom.com>
Date: Fri, 4 Nov 2011 22:23:27 +0100
Subject: [PATCH] --- yaml --- r: 277791 b: refs/heads/master c:
 718897eb3f90a47a56acb504762d521388a3231c h: refs/heads/master i:   277789:
 893eb5f9bffabbe27ad03d6f85ab2ad3134f2b32   277787:
 69659a4841b8fe7fd0d8bfe84b9ef9363f93bf7b   277783:
 62fd9cf06c18ae8b910110988ef4b38a31c1aa78   277775:
 190073c293bd5b8e3928150c2d2da215762b6446   277759:
 fc39efcb18cbec5b99728e8beff4508b58d47726 v: v3

---
 [refs]                                               |  2 +-
 .../net/wireless/brcm80211/brcmfmac/dhd_sdio.c       | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 65ffc9ddf84c..da545a450a0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e247bd9068e3e86c3571147c128883596ace9d05
+refs/heads/master: 718897eb3f90a47a56acb504762d521388a3231c
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 6de489b1a162..2c409ca68ea7 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -812,10 +812,6 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok)
 		clkreq =
 		    bus->alp_only ? SBSDIO_ALP_AVAIL_REQ : SBSDIO_HT_AVAIL_REQ;
 
-		if ((bus->ci->chip == BCM4329_CHIP_ID)
-		    && (bus->ci->chiprev == 0))
-			clkreq |= SBSDIO_FORCE_ALP;
-
 		brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
 				       SBSDIO_FUNC1_CHIPCLKCSR, clkreq, &err);
 		if (err) {
@@ -1034,11 +1030,9 @@ static int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep)
 			SBSDIO_FORCE_HW_CLKREQ_OFF, NULL);
 
 		/* Isolate the bus */
-		if (bus->ci->chip != BCM4329_CHIP_ID) {
-			brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
-				SBSDIO_DEVICE_CTL,
-				SBSDIO_DEVCTL_PADS_ISO, NULL);
-		}
+		brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,
+			SBSDIO_DEVICE_CTL,
+			SBSDIO_DEVCTL_PADS_ISO, NULL);
 
 		/* Change state */
 		bus->sleeping = true;