From patchwork Thu Apr 17 08:35:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 4006471 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 577FB9F319 for ; Thu, 17 Apr 2014 08:42:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8A4792026C for ; Thu, 17 Apr 2014 08:42:56 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 551CF201DE for ; Thu, 17 Apr 2014 08:42:55 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id A0515265230; Thu, 17 Apr 2014 10:42:53 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 9446C265062; Thu, 17 Apr 2014 10:42:42 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 9F7A12650BC; Thu, 17 Apr 2014 10:42:41 +0200 (CEST) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by alsa0.perex.cz (Postfix) with ESMTP id 665D2265057 for ; Thu, 17 Apr 2014 10:42:33 +0200 (CEST) Received: by mail-vc0-f174.google.com with SMTP id ld13so153835vcb.33 for ; Thu, 17 Apr 2014 01:42:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:subject:from:to:cc:date:content-type :mime-version:content-transfer-encoding; bh=E01/HaiBdTcMSgHd6jy6YjI6aMD0JSp/cYpVrKTKAFM=; b=DGEMopKSKlHu3VfX+5zh9WFXV34o52wL7U39mS5tnT5GYalhT9mLysRBjynSOhmnif H/z1GBTtqEMk/mtqhbx+5vY8JIqFEsonQ6pcI5pnFPZV2jLQO1JJZ6n3XEht0iA9HqKj kDDVBVcifafT/62eTEZpdZZZ6VTQxtERIz+ClCpN/0gS9fQyt9EZ488+VXxLAyW1r1mw XzVkS4rryYuOYWN5A+PWXDOrGbs15C3wBg+GTJojLW5v210YfKj+svqyhjUAKYdOABSI seAjpQnMXuSncaxqXOhqAYf/mCFmnTH3C/syZdWTwRdhwSEKffbsfNtdZ0riWovUVN2J aIZA== X-Gm-Message-State: ALoCoQk6TtaufIoyPkD+o0tmFhzp1B4zHTpbsX/k/Shs9IeDnTu8h0VBKntkHwOXdn2xyqjj1qE1 X-Received: by 10.52.229.97 with SMTP id sp1mr5469074vdc.23.1397723749804; Thu, 17 Apr 2014 01:35:49 -0700 (PDT) Received: from [192.168.1.102] (111-240-59-19.dynamic.hinet.net. [111.240.59.19]) by mx.google.com with ESMTPSA id j2sm50414145vdc.9.2014.04.17.01.35.46 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 17 Apr 2014 01:35:48 -0700 (PDT) Message-ID: <1397723743.601.0.camel@phoenix> From: Axel Lin To: Mark Brown Date: Thu, 17 Apr 2014 16:35:43 +0800 X-Mailer: Evolution 3.8.4-0ubuntu1 Mime-Version: 1.0 Cc: Brian Austin , alsa-devel@alsa-project.org, Paul Handrigan , Arnaud Patard , Liam Girdwood Subject: [alsa-devel] [PATCH] ASoC: cs42l51: Fix mask for REVID X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The REVID mask was changed by commit a1253ef6d3fa "ASoC: cs42l51: split i2c from codec driver". Fix it. Signed-off-by: Axel Lin Acked-by: Brian Austin --- sound/soc/codecs/cs42l51.c | 3 ++- sound/soc/codecs/cs42l51.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index dadc20d..09488d9 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c @@ -548,7 +548,8 @@ int cs42l51_probe(struct device *dev, struct regmap *regmap) ret = -ENODEV; goto error; } - dev_info(dev, "Cirrus Logic CS42L51, Revision: %02X\n", val & 0xFF); + dev_info(dev, "Cirrus Logic CS42L51, Revision: %02X\n", + val & CS42L51_CHIP_REV_MASK); ret = snd_soc_register_codec(dev, &soc_codec_device_cs42l51, &cs42l51_dai, 1); diff --git a/sound/soc/codecs/cs42l51.h b/sound/soc/codecs/cs42l51.h index 641ef18..8c55bf3 100644 --- a/sound/soc/codecs/cs42l51.h +++ b/sound/soc/codecs/cs42l51.h @@ -26,6 +26,7 @@ int cs42l51_probe(struct device *dev, struct regmap *regmap); #define CS42L51_CHIP_ID 0x1B #define CS42L51_CHIP_REV_A 0x00 #define CS42L51_CHIP_REV_B 0x01 +#define CS42L51_CHIP_REV_MASK 0x07 #define CS42L51_CHIP_REV_ID 0x01 #define CS42L51_MK_CHIP_REV(a, b) ((a)<<3|(b))