From patchwork Tue May 17 16:57:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 791852 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4HGJktd001995 for ; Tue, 17 May 2011 16:19:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755707Ab1EQQTo (ORCPT ); Tue, 17 May 2011 12:19:44 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:34390 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755665Ab1EQQTo (ORCPT ); Tue, 17 May 2011 12:19:44 -0400 Received: by mail-ew0-f46.google.com with SMTP id 4so187375ewy.19 for ; Tue, 17 May 2011 09:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:mime-version:content-type :content-transfer-encoding; bh=vvvvSXyJkzMy6P+8N6BrpqL5OSxaYf3Fqaq0un4GjSQ=; b=gMFzHmPgCytjo13nwkx5LrLYmQIP9egCUSpwE1AJAhhTOIr6TLycvMEkPE07t1bQDq knZ0UGHJHAUfWVouMu3x+rf+2g432ekN+yEJ9Bp9st1MM6deXpqXU2JmC2WaQqcqcbUy /42+Mzqbrk/p6gHEmniV8D41tbcKwl/Sa83mg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=MoHFKp/+95pIB+Im7mb1zZiD+3dd9H9yoH+f2OuLQMa8m7otJpzYbOet4iJqZJ0MZT wWyEawwxugvKkqmJrRW3kWFN6Cpat7ollQX3bZ+46+ecL09rlVkyCv663Etn0+BA1c6K zVdo9AMkoz74I3BLAx+Z7v5XqzSLsCfeET7JQ= Received: by 10.14.2.93 with SMTP id 69mr284051eee.211.1305649183249; Tue, 17 May 2011 09:19:43 -0700 (PDT) Received: from localhost.localdomain (c14-108.icpnet.pl [62.21.14.108]) by mx.google.com with ESMTPS id z1sm501382eeb.21.2011.05.17.09.19.41 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 May 2011 09:19:41 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: linux-wireless@vger.kernel.org, "John W. Linville" Cc: b43-dev@lists.infradead.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH 2/2] b43: separate ssb core reset Date: Tue, 17 May 2011 18:57:28 +0200 Message-Id: <1305651448-23947-2-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1305651448-23947-1-git-send-email-zajec5@gmail.com> References: <1305651448-23947-1-git-send-email-zajec5@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 17 May 2011 16:19:46 +0000 (UTC) Signed-off-by: Rafa? Mi?ecki --- drivers/net/wireless/b43/main.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 57fd7dd..9380842 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -1144,10 +1144,9 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags) } } -void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags) +static void b43_ssb_wireless_core_reset(struct b43_wldev *dev, u32 flags) { u32 tmslow; - u32 macctl; flags |= B43_TMSLOW_PHYCLKEN; flags |= B43_TMSLOW_PHYRESET; @@ -1167,6 +1166,13 @@ void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags) ssb_write32(dev->sdev, SSB_TMSLOW, tmslow); ssb_read32(dev->sdev, SSB_TMSLOW); /* flush */ msleep(1); +} + +void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags) +{ + u32 macctl; + + b43_ssb_wireless_core_reset(dev, flags); /* Turn Analog ON, but only if we already know the PHY-type. * This protects against very early setup where we don't know the