From patchwork Sun Jan 18 05:10:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: warmcat X-Patchwork-Id: 43271 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 142FE240BA for ; Sun, 18 Jan 2015 05:10:57 +0000 (UTC) Received: by mail-wg0-f69.google.com with SMTP id x13sf2114068wgg.0 for ; Sat, 17 Jan 2015 21:10:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:subject:from:to:cc:date:message-id :in-reply-to:references:user-agent:mime-version:content-type :content-transfer-encoding:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=QUOxsHP13PU5fgyWMKOb+J7/vtkrBVqoF4eqOmXAjOY=; b=Hd9Ae843jm+cMHCg6de1LJk8ZfCvzed0/Xt/JRnNiTbl5WC7mrqZh5D1+yEUG5cBQa jSo/ySOj8JCrAwtqmIOxzD1Lzxd6q/c0LiUTZXpryfVYDIc3lrpMoNXgTpD2eZkKNMmu PVoMfPSXWuqVh/6npJo16v0lrwl2Ak5TDm5EhD6qj8dXzZrFUrhW4yZCRvg3tVvhpHlj CGoa9ZrAP1Grz4Zf0BdgXEikxoQhvIYYb3MhnJooao21BJhTqCSd6OdYCLOPU6w9t2Cv oXNPsdk5O3Sw9Isozgs9GzE+DVaYyYB92GT6EU79FEmgkP+ITWQc65WD+O/i8C/FtPu0 z9Kg== X-Gm-Message-State: ALoCoQnY1HSQsJKq73XSWZdk+zpOd1z9/mftQlWmWjm+iVhcqM/LOr8XKfpZH7MoZiGyQyGZvjwK X-Received: by 10.194.178.234 with SMTP id db10mr2839190wjc.2.1421557856396; Sat, 17 Jan 2015 21:10:56 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.116.14 with SMTP id js14ls489430lab.69.gmail; Sat, 17 Jan 2015 21:10:56 -0800 (PST) X-Received: by 10.112.150.102 with SMTP id uh6mr23006459lbb.66.1421557856235; Sat, 17 Jan 2015 21:10:56 -0800 (PST) Received: from mail-lb0-x233.google.com (mail-lb0-x233.google.com. [2a00:1450:4010:c04::233]) by mx.google.com with ESMTPS id xa7si7271924lbb.32.2015.01.17.21.10.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 17 Jan 2015 21:10:56 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::233 as permitted sender) client-ip=2a00:1450:4010:c04::233; Received: by mail-lb0-f179.google.com with SMTP id z11so23728664lbi.10 for ; Sat, 17 Jan 2015 21:10:56 -0800 (PST) X-Received: by 10.152.182.235 with SMTP id eh11mr5698244lac.9.1421557856048; Sat, 17 Jan 2015 21:10:56 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp740418lbb; Sat, 17 Jan 2015 21:10:55 -0800 (PST) X-Received: by 10.68.191.101 with SMTP id gx5mr35115809pbc.108.1421557854324; Sat, 17 Jan 2015 21:10:54 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ir10si11160981pbc.62.2015.01.17.21.10.53; Sat, 17 Jan 2015 21:10:54 -0800 (PST) Received-SPF: none (google.com: linux-wireless-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751486AbbARFKv (ORCPT + 1 other); Sun, 18 Jan 2015 00:10:51 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:50117 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751197AbbARFKt (ORCPT ); Sun, 18 Jan 2015 00:10:49 -0500 Received: by mail-pa0-f46.google.com with SMTP id lf10so32078231pab.5; Sat, 17 Jan 2015 21:10:49 -0800 (PST) X-Received: by 10.70.33.177 with SMTP id s17mr34988431pdi.9.1421557849280; Sat, 17 Jan 2015 21:10:49 -0800 (PST) Received: from warmcat.com (114-36-241-182.dynamic.hinet.net. [114.36.241.182]) by mx.google.com with ESMTPSA id gi6sm8017246pbd.93.2015.01.17.21.10.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Jan 2015 21:10:48 -0800 (PST) Subject: [PATCH 1/7] net: wireless: wcn36xx: add wcn3620 chip type definition From: Andy Green To: Kalle Valo , Eugene Krasnikov Cc: wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Date: Sun, 18 Jan 2015 13:10:43 +0800 Message-ID: <20150118051043.31866.53087.stgit@114-36-241-182.dynamic.hinet.net> In-Reply-To: <20150118050741.31866.36490.stgit@114-36-241-182.dynamic.hinet.net> References: <20150118050741.31866.36490.stgit@114-36-241-182.dynamic.hinet.net> User-Agent: StGit/0.17-dirty MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Original-Sender: andy.green@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::233 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@ Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Convert the list of chip types to an enum, add the default UNKNOWN type and a type for WCN3620 chip Signed-off-by: Andy Green --- drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h index f0fb81d..a5366b6 100644 --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h @@ -93,6 +93,13 @@ struct nv_data { u8 table; }; +enum wcn36xx_chip_type { + WCN36XX_CHIP_UNKNOWN, + WCN36XX_CHIP_3660, + WCN36XX_CHIP_3680, + WCN36XX_CHIP_3620, +}; + /* Interface for platform control path * * @open: hook must be called when wcn36xx wants to open control channel. @@ -179,7 +186,7 @@ struct wcn36xx { u8 fw_minor; u8 fw_major; u32 fw_feat_caps[WCN36XX_HAL_CAPS_SIZE]; - u32 chip_version; + enum wcn36xx_chip_type chip_version; /* extra byte for the NULL termination */ u8 crm_version[WCN36XX_HAL_VERSION_LENGTH + 1]; @@ -227,9 +234,6 @@ struct wcn36xx { }; -#define WCN36XX_CHIP_3660 0 -#define WCN36XX_CHIP_3680 1 - static inline bool wcn36xx_is_fw_version(struct wcn36xx *wcn, u8 major, u8 minor,