From patchwork Mon Mar 10 17:42:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 25991 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 06C7E2054B for ; Mon, 10 Mar 2014 17:42:37 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id n16sf29751046oag.5 for ; Mon, 10 Mar 2014 10:42:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:date :message-id:subject:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=/zgNChQr+k3oRoTEJ6OcflvR+HQGUMRgSICv0UfPYjA=; b=b1sKcBE6IKTeF8gl+hKkvvhPpxVx+PVqk4it3XB198XqsrGU5QFd+/6N0JmEMcWlkO Q2Ue3R1vDhimm6X9F5Z3mDIZJ6+4d/P58Z1oLL0JTcS4amG48j0XIrrdtT+HD9a2+QgW tntvkiC3bYDIeQXs5Mb/+2Shd8JDBe1vSua9xDiPnUgWebjJ4f3kOoaH/UbAIBO+K1FT fIHuP8OQH4Q3naXagsN1XQ0hw1SGIAjVTgj/kMwP/EJIbfvHcVZzckETVywAJ+O82XkH dCV2qpxA/u9VX9vl8qXoJvlpwrDqcd7WfcDbCib/FV2745ts4MjOKeENFks2P5iF83VA KqYQ== X-Gm-Message-State: ALoCoQnti5u4SlQ+bRO3YInc3+dPw3rMZGNFLytcRjRuZvuzPOGecCSZJ4OqzH0Tj5cbBsPrIhbY X-Received: by 10.43.14.137 with SMTP id pq9mr12945808icb.12.1394473357586; Mon, 10 Mar 2014 10:42:37 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.95.230 with SMTP id i93ls2238450qge.28.gmail; Mon, 10 Mar 2014 10:42:37 -0700 (PDT) X-Received: by 10.52.34.4 with SMTP id v4mr952424vdi.42.1394473357396; Mon, 10 Mar 2014 10:42:37 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id xn5si5628557vdc.81.2014.03.10.10.42.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Mar 2014 10:42:37 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id lg15so977776vcb.16 for ; Mon, 10 Mar 2014 10:42:37 -0700 (PDT) X-Received: by 10.58.90.99 with SMTP id bv3mr1256108veb.34.1394473357311; Mon, 10 Mar 2014 10:42:37 -0700 (PDT) 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.220.78.9 with SMTP id i9csp135885vck; Mon, 10 Mar 2014 10:42:36 -0700 (PDT) X-Received: by 10.66.158.132 with SMTP id wu4mr42038164pab.66.1394473356205; Mon, 10 Mar 2014 10:42:36 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bq3si7768735pbd.266.2014.03.10.10.42.35; Mon, 10 Mar 2014 10:42:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754436AbaCJRm0 (ORCPT + 26 others); Mon, 10 Mar 2014 13:42:26 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:51542 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754357AbaCJRmY (ORCPT ); Mon, 10 Mar 2014 13:42:24 -0400 Received: from cpc11-sgyl31-2-0-cust672.sgyl.cable.virginm.net ([94.175.94.161] helo=debutante.sirena.org.uk) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1WN4DT-0004TU-DJ; Mon, 10 Mar 2014 17:42:22 +0000 Received: from broonie by debutante.sirena.org.uk with local (Exim 4.82) (envelope-from ) id 1WN4DP-0005nd-DT; Mon, 10 Mar 2014 17:42:15 +0000 From: Mark Brown To: Lee Jones , Samuel Ortiz Cc: linux-kernel@vger.kernel.org, patches@opensource.wolfsonmicro.com, linaro-kernel@lists.linaro.org, Mark Brown Date: Mon, 10 Mar 2014 17:42:14 +0000 Message-Id: <1394473334-22049-1-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 1.9.0 X-SA-Exim-Connect-IP: 94.175.94.161 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mezzanine.sirena.org.uk X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.2 Subject: [PATCH] mfd: wm5102: Mark register write sequencer control 3 readable X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: broonie@kernel.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org 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: , From: Mark Brown During init the core checks if the wm5102 has finished starting by reading register 0x19 and looking at the value. This read always fails since this is not a readable register, mark it as being one. While we're at it provide a constant for the register name (as supplied by Charles Keepax). Signed-off-by: Mark Brown --- drivers/mfd/arizona-core.c | 3 ++- drivers/mfd/wm5102-tables.c | 1 + include/linux/mfd/arizona/registers.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 1c3ae57082ed..d4919fa2797a 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -745,7 +745,8 @@ int arizona_dev_init(struct arizona *arizona) /* Ensure device startup is complete */ switch (arizona->type) { case WM5102: - ret = regmap_read(arizona->regmap, 0x19, &val); + ret = regmap_read(arizona->regmap, + ARIZONA_WRITE_SEQUENCER_CTRL_3, &val); if (ret != 0) dev_err(dev, "Failed to check write sequencer state: %d\n", diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c index f4668d39e542..e32736c3ab57 100644 --- a/drivers/mfd/wm5102-tables.c +++ b/drivers/mfd/wm5102-tables.c @@ -1016,6 +1016,7 @@ static bool wm5102_readable_register(struct device *dev, unsigned int reg) case ARIZONA_WRITE_SEQUENCER_CTRL_0: case ARIZONA_WRITE_SEQUENCER_CTRL_1: case ARIZONA_WRITE_SEQUENCER_CTRL_2: + case ARIZONA_WRITE_SEQUENCER_CTRL_3: case ARIZONA_WRITE_SEQUENCER_PROM: case ARIZONA_TONE_GENERATOR_1: case ARIZONA_TONE_GENERATOR_2: diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h index 90d57aec34e7..f6ad81e923ac 100644 --- a/include/linux/mfd/arizona/registers.h +++ b/include/linux/mfd/arizona/registers.h @@ -27,6 +27,7 @@ #define ARIZONA_WRITE_SEQUENCER_CTRL_0 0x16 #define ARIZONA_WRITE_SEQUENCER_CTRL_1 0x17 #define ARIZONA_WRITE_SEQUENCER_CTRL_2 0x18 +#define ARIZONA_WRITE_SEQUENCER_CTRL_3 0x19 #define ARIZONA_WRITE_SEQUENCER_PROM 0x1A #define ARIZONA_TONE_GENERATOR_1 0x20 #define ARIZONA_TONE_GENERATOR_2 0x21