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: 459760 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AA1DA1401AD for ; Fri, 10 Apr 2015 01:19:26 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755521AbbDIPSv (ORCPT ); Thu, 9 Apr 2015 11:18:51 -0400 Received: from mail-wg0-f41.google.com ([74.125.82.41]:36021 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755448AbbDIPSl (ORCPT ); Thu, 9 Apr 2015 11:18:41 -0400 Received: by wgsk9 with SMTP id k9so101245098wgs.3 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=FXgx4Z9YosqfRDpM1PJV88dxeDKgBeWXJIz6Ui9Ro9tViUCC8o8ao52HcnnMQCWkI2 MsVb7mYXiCq9eHb3f5na26HnUiiEioF0bHvNqB5L11yYNVY4UJBkECPq5vHr8/Y9RIb7 KLKEqte2r8wNZL7QJkszHHbQOIuq+3d2+hy4nb9RGo/4x6RnoQWvQBeq+ZrrDaNJDDEi Ep5m6qUNNtCrHhiKB8iHomw77NCAaksqlEicQglMxF87JKuGYZN4yeHBgHE563b9MlxL hQQzYo+GlJ4DAKPiN/KxixY8XNGzUAD5qGg3BiKSvKDDUPoPuZm6BFdZKZNoIde4LfjF aFqg== X-Gm-Message-State: ALoCoQl2NSqCgTNsaCaVx8J/Mjf0FW3s5QF02wvi8AWQFTb9Vx/3+3CKQOA6kSBKc8dW7ib6ZUU8 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-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org 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-gpio" 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)