From patchwork Sat Jan 24 17:47:20 2015 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: 5700001 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D522DC058D for ; Sat, 24 Jan 2015 17:47:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A79B202E5 for ; Sat, 24 Jan 2015 17:47:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2760D20254 for ; Sat, 24 Jan 2015 17:47:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754149AbbAXRrd (ORCPT ); Sat, 24 Jan 2015 12:47:33 -0500 Received: from mail-wi0-f169.google.com ([209.85.212.169]:41255 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753169AbbAXRrd (ORCPT ); Sat, 24 Jan 2015 12:47:33 -0500 Received: by mail-wi0-f169.google.com with SMTP id h11so2247135wiw.0 for ; Sat, 24 Jan 2015 09:47:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=yzj4gfTH/NGqNLaZciAFHse06sb/xf06oJaVTr2qgvA=; b=XJCd6aUI5dm8YAOliLSME49gYtVdWB2aJzhxQbQHBT90FSRS2/jfRJv3KsqGZ9Ygp6 xVLbSnrpr7L3o9Ci1CES8x5KYGhb6U3xTyoxR2EW0EYHLJREBI0klKJDie1NO1jErl4o 9+8yVRzcKeNrqYoxj17mVV4z93XdlMgYbIwZT/4H8MRKLPBRyoK/AGc7YvmZNm8Giwa3 j27ulzJ6I90Nh1/g5ohaNQW8EDuNmVev7YuU/rHxlJW3RtgcvZgoyaLAqvhtMyVyZM2z hOIA/bLRIFrQlVGBPAezX4Wvld7HjRhTw59bXNicEsF44IyAJe86x6IUjM3McOmgIKK6 S4Dg== X-Received: by 10.194.175.69 with SMTP id by5mr26311911wjc.32.1422121651862; Sat, 24 Jan 2015 09:47:31 -0800 (PST) Received: from linux-tdhb.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by mx.google.com with ESMTPSA id x10sm6675763wif.15.2015.01.24.09.47.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Jan 2015 09:47:31 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Kalle Valo , linux-wireless@vger.kernel.org Cc: Hauke Mehrtens , =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH] bcma: detect SPROM revision 11 Date: Sat, 24 Jan 2015 18:47:20 +0100 Message-Id: <1422121640-9227-2-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1422121640-9227-1-git-send-email-zajec5@gmail.com> References: <1422121640-9227-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-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Extracting values from it is still unsupported, but at least we'll display some meaningful error now. Signed-off-by: Rafa? Mi?ecki --- drivers/bcma/sprom.c | 3 ++- include/linux/ssb/ssb_regs.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/bcma/sprom.c b/drivers/bcma/sprom.c index efb037f..206edd3 100644 --- a/drivers/bcma/sprom.c +++ b/drivers/bcma/sprom.c @@ -579,7 +579,8 @@ int bcma_sprom_get(struct bcma_bus *bus) u16 offset = BCMA_CC_SPROM; u16 *sprom; size_t sprom_sizes[] = { SSB_SPROMSIZE_WORDS_R4, - SSB_SPROMSIZE_WORDS_R10, }; + SSB_SPROMSIZE_WORDS_R10, + SSB_SPROMSIZE_WORDS_R11, }; int i, err = 0; if (!bus->drv_cc.core) diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h index f7b9100..c0f707a 100644 --- a/include/linux/ssb/ssb_regs.h +++ b/include/linux/ssb/ssb_regs.h @@ -173,6 +173,7 @@ #define SSB_SPROMSIZE_BYTES_R123 (SSB_SPROMSIZE_WORDS_R123 * sizeof(u16)) #define SSB_SPROMSIZE_BYTES_R4 (SSB_SPROMSIZE_WORDS_R4 * sizeof(u16)) #define SSB_SPROMSIZE_WORDS_R10 230 +#define SSB_SPROMSIZE_WORDS_R11 234 #define SSB_SPROM_BASE1 0x1000 #define SSB_SPROM_BASE31 0x0800 #define SSB_SPROM_REVISION 0x007E