From patchwork Wed Aug 13 10:42:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Keepax X-Patchwork-Id: 35343 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f72.google.com (mail-qg0-f72.google.com [209.85.192.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6F53C20DCC for ; Wed, 13 Aug 2014 10:51:29 +0000 (UTC) Received: by mail-qg0-f72.google.com with SMTP id q107sf31733470qgd.11 for ; Wed, 13 Aug 2014 03:51:29 -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:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=1fMImQfDaCv2pCEsg1nJTDi7fQjm5t33heTMOzRTLxM=; b=ZTr4ng3bzy9Tqsc/cDQvv5KsGEjRRWQgUYjZYBeG5H+pETBhQv60Eua+7F4aOfsfFw WdP9gUcICX8iDpncCNWaD+lI2JyYkcertaHA9sVIb5GTr6N9RFsu19m/mcRYGFAYsV8v 0nmWp2xfMJJUIe/pNoJKEd0puAveTfzzAEkSwQ7FDD0l9k9vT0CeWMMeqpWYC/7dM8Fa tchrHl1qAa2qbKJxNmYe2n8G457iACzKVvxRjmUg0Hnwr528Kb5KJs9mRtDd4LjzGXs/ WMvpHKW2flULPHfcTdxiHpRL/V93cNcjDYSez9ZwpbH6sw5tsY2P8InpcvOuVas0U8Ma qV0g== X-Gm-Message-State: ALoCoQnlEo+TI8Amd8JdebSbVzOVLc/Gk0uYse+J90BPl2mrNAHFVOnVl9lK5CI0KU6GQ1GEvyui X-Received: by 10.236.7.14 with SMTP id 14mr1315582yho.34.1407927089265; Wed, 13 Aug 2014 03:51:29 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.87.214 with SMTP id r80ls530264qgd.44.gmail; Wed, 13 Aug 2014 03:51:29 -0700 (PDT) X-Received: by 10.220.174.137 with SMTP id t9mr2944093vcz.12.1407927089129; Wed, 13 Aug 2014 03:51:29 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id bk6si848745vcb.55.2014.08.13.03.51.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 13 Aug 2014 03:51:29 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id lf12so14923570vcb.1 for ; Wed, 13 Aug 2014 03:51:29 -0700 (PDT) X-Received: by 10.221.5.137 with SMTP id og9mr2921307vcb.18.1407927089031; Wed, 13 Aug 2014 03:51:29 -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.221.37.5 with SMTP id tc5csp320406vcb; Wed, 13 Aug 2014 03:51:28 -0700 (PDT) X-Received: by 10.70.96.165 with SMTP id dt5mr3332639pdb.71.1407927088097; Wed, 13 Aug 2014 03:51:28 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id km10si1223429pbd.132.2014.08.13.03.51.27 for ; Wed, 13 Aug 2014 03:51:28 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S1751438AbaHMKv0 (ORCPT + 23 others); Wed, 13 Aug 2014 06:51:26 -0400 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:54288 "EHLO opensource.wolfsonmicro.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750751AbaHMKvZ (ORCPT ); Wed, 13 Aug 2014 06:51:25 -0400 Received: from localhost.localdomain (unknown [87.246.78.26]) by opensource.wolfsonmicro.com (Postfix) with ESMTPSA id 925DC110083; Wed, 13 Aug 2014 11:51:23 +0100 (BST) From: Charles Keepax To: lee.jones@linaro.org Cc: sameo@linux.intel.com, broonie@kernel.org, patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org Subject: [PATCH 1/2 v2] mfd: wm5102: Mark register write sequencer control 3 readable Date: Wed, 13 Aug 2014 11:42:46 +0100 Message-Id: <1407926567-10047-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.2.5 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: ckeepax@opensource.wolfsonmicro.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) 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 Signed-off-by: Charles Keepax --- Just added the sign-off I forgot on the last version. Thanks, Charles 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 deletions(-) diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 10a0cb9..7eabc36 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -784,7 +784,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 fb4d4bb..c18d527 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 dbd23c3..68913ec 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