From patchwork Thu Apr 9 15:18:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ivan T. Ivanov" X-Patchwork-Id: 6188611 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1FFE59F2EC for ; Thu, 9 Apr 2015 15:19:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 552462035C for ; Thu, 9 Apr 2015 15:19:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 704482037A for ; Thu, 9 Apr 2015 15:19:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755718AbbDIPSv (ORCPT ); Thu, 9 Apr 2015 11:18:51 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:33617 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755506AbbDIPSm (ORCPT ); Thu, 9 Apr 2015 11:18:42 -0400 Received: by wiax7 with SMTP id x7so57701081wia.0 for ; Thu, 09 Apr 2015 08:18:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=SFXxX5+TXR1R+o2+4y/vXUibMyPxtMylX7q0kAu5J7g=; b=LXoQUrhUsSqG1FsXcNgqjyUXB9N5kU6ORZP78BRuFNnm0GNryrzSmhUB0A/fMKZQbv Uzrsk1eujiv4SsqA3CGocl2hJ8IbgHmY46r7Xj45blWNJSSQbd0vOIrt2XQhETEJDZJ6 q5ztRYYLPBoVsqJhtpSgUvhU8cU3Willx/um8C52CECwJfOB8xBnmCZMAsWgxoN2nWLx QXbkrGu8OlPWLd3ODWBYc2cEniKw6QUN0qRM4z1cOOlRIloDkYlBJzhCZxGvuVCmxhdd myXccKR2/3BWTOOxBEDoIoZuWnzi0F6g5T9lz4IrCW7p+Wa8uvAXMWac9MT2D/PUnOLc 9bQw== X-Gm-Message-State: ALoCoQl9N6xa4ndsq8us0mNZiRdF+rCDZMnSbQI3ZPAOPzgYZHuXDAAtkyj8AkmmjNRmCwEHqT+9 X-Received: by 10.180.87.101 with SMTP id w5mr7107617wiz.18.1428592720605; Thu, 09 Apr 2015 08:18:40 -0700 (PDT) Received: from localhost.localdomain ([37.157.136.206]) by mx.google.com with ESMTPSA id ed14sm10383483wic.11.2015.04.09.08.18.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Apr 2015 08:18:39 -0700 (PDT) From: "Ivan T. Ivanov" To: Linus Walleij Cc: Bjorn Andersson , Arnd Bergmann , Soren Brinkmann , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 1/3] pinctrl: qcom-spmi-gpio: Fix output type configuration Date: Thu, 9 Apr 2015 18:18:35 +0300 Message-Id: <1428592717-21706-1-git-send-email-ivan.ivanov@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 GPIO output type configuration was incorrectly overwritten by strength value. Fix this. Signed-off-by: Ivan T. Ivanov Acked-by: Bjorn Andersson --- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" 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/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c index b2d2221..4b21aac 100644 --- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c @@ -417,7 +417,7 @@ static int pmic_gpio_config_set(struct pinctrl_dev *pctldev, unsigned int pin, return ret; val = pad->buffer_type << PMIC_GPIO_REG_OUT_TYPE_SHIFT; - val = pad->strength << PMIC_GPIO_REG_OUT_STRENGTH_SHIFT; + val |= pad->strength << PMIC_GPIO_REG_OUT_STRENGTH_SHIFT; ret = pmic_gpio_write(state, pad, PMIC_GPIO_REG_DIG_OUT_CTL, val); if (ret < 0)