From patchwork Wed Mar 13 08:01:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 15326 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 015FD23E14 for ; Wed, 13 Mar 2013 08:02:42 +0000 (UTC) Received: from mail-vb0-f44.google.com (mail-vb0-f44.google.com [209.85.212.44]) by fiordland.canonical.com (Postfix) with ESMTP id A5F92A194B3 for ; Wed, 13 Mar 2013 08:02:41 +0000 (UTC) Received: by mail-vb0-f44.google.com with SMTP id fr13so340134vbb.3 for ; Wed, 13 Mar 2013 01:02:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=q2AIOlkGxoB8g+TSyVcv06vlmpc+9RMtQnsme8eXmK0=; b=CT8s+YVUkvSkR+3jPBAgwoRmuxJ09KNE8cpO7cEIpN3bl7YiZ3Z5bMmwka/z3cpKxJ af30OwgVByFcqdSOpceTir/sLK9+3nhPVYcww1VS3kmyZfpC6koEoLtG2hOIjFJxh1J8 nbopBnaw7lc02bp/WaAqVkCgCu8at4ypD9/ow7+Cq8Hidm8Pr00JoaXOuzMNXPzK8TTx MKvGibFc4bxeg3y90QW+vk7omi0o6eb6+CBfaCf63F+eunQfL141orKp1RKeiPlLKmBi kmtVX0doKxToAQEVXfv37s+SZyiGuz15QYeKUftN7x56m7BJ97kU0iVCoQ4FQvSTTlyx o72A== X-Received: by 10.221.11.135 with SMTP id pe7mr7540610vcb.41.1363161761173; Wed, 13 Mar 2013 01:02:41 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp6379veb; Wed, 13 Mar 2013 01:02:40 -0700 (PDT) X-Received: by 10.50.7.240 with SMTP id m16mr14974402iga.91.1363161760551; Wed, 13 Mar 2013 01:02:40 -0700 (PDT) Received: from mail-ia0-x232.google.com (mail-ia0-x232.google.com [2607:f8b0:4001:c02::232]) by mx.google.com with ESMTPS id ce6si37294938icc.33.2013.03.13.01.02.40 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 13 Mar 2013 01:02:40 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:4001:c02::232 is neither permitted nor denied by best guess record for domain of haojian.zhuang@linaro.org) client-ip=2607:f8b0:4001:c02::232; Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:4001:c02::232 is neither permitted nor denied by best guess record for domain of haojian.zhuang@linaro.org) smtp.mail=haojian.zhuang@linaro.org Received: by mail-ia0-f178.google.com with SMTP id u20so679021iag.9 for ; Wed, 13 Mar 2013 01:02:40 -0700 (PDT) X-Received: by 10.50.153.198 with SMTP id vi6mr15358930igb.112.1363161760162; Wed, 13 Mar 2013 01:02:40 -0700 (PDT) Received: from localhost.localdomain ([67.198.145.34]) by mx.google.com with ESMTPS id ua6sm1684088igb.0.2013.03.13.01.02.37 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 13 Mar 2013 01:02:39 -0700 (PDT) From: Haojian Zhuang To: tony@atomide.com, linus.walleij@linaro.org, linux-kernel@vger.kernel.org Cc: patches@linaro.org, Haojian Zhuang Subject: [PATCH] pinctrl: single: correct argument for pinconf Date: Wed, 13 Mar 2013 16:01:26 +0800 Message-Id: <1363161686-21616-1-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQk7ZAiPnE7S5VYyinmnSaJMlLRqFFeBj/wyguaoAWgE6CvUlr6kjGwsYGr8U/eMfpkjC/z5 pcs_pinconf_set() is always using "arg << shift" to configure two parameters case. But pcs_add_conf2() didn't remove shift for config argument. So correct it. Signed-off-by: Haojian Zhuang Acked-by: Tony Lindgren --- drivers/pinctrl/pinctrl-single.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index e35dabd..5f2d2bf 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -623,8 +623,8 @@ static int pcs_pinconf_set(struct pinctrl_dev *pctldev, { struct pcs_device *pcs = pinctrl_dev_get_drvdata(pctldev); struct pcs_function *func; - unsigned offset = 0, shift = 0, arg = 0, i, data, ret; - u16 argument; + unsigned offset = 0, shift = 0, i, data, ret; + u16 arg; ret = pcs_get_function(pctldev, pin, &func); if (ret) @@ -634,14 +634,13 @@ static int pcs_pinconf_set(struct pinctrl_dev *pctldev, if (pinconf_to_config_param(config) == func->conf[i].param) { offset = pin * (pcs->width / BITS_PER_BYTE); data = pcs->read(pcs->base + offset); - argument = pinconf_to_config_argument(config); + arg = pinconf_to_config_argument(config); switch (func->conf[i].param) { /* 2 parameters */ case PIN_CONFIG_INPUT_SCHMITT: case PIN_CONFIG_DRIVE_STRENGTH: case PIN_CONFIG_SLEW_RATE: shift = ffs(func->conf[i].mask) - 1; - arg = pinconf_to_config_argument(config); data &= ~func->conf[i].mask; data |= (arg << shift) & func->conf[i].mask; break; @@ -651,12 +650,12 @@ static int pcs_pinconf_set(struct pinctrl_dev *pctldev, break; case PIN_CONFIG_BIAS_PULL_DOWN: case PIN_CONFIG_BIAS_PULL_UP: - if (argument) + if (arg) pcs_pinconf_clear_bias(pctldev, pin); /* fall through */ case PIN_CONFIG_INPUT_SCHMITT_ENABLE: data &= ~func->conf[i].mask; - if (argument) + if (arg) data |= func->conf[i].enable; else data |= func->conf[i].disable; @@ -965,7 +964,7 @@ static void pcs_add_conf2(struct pcs_device *pcs, struct device_node *np, const char *name, enum pin_config_param param, struct pcs_conf_vals **conf, unsigned long **settings) { - unsigned value[2]; + unsigned value[2], shift; int ret; ret = of_property_read_u32_array(np, name, value, 2); @@ -973,9 +972,10 @@ static void pcs_add_conf2(struct pcs_device *pcs, struct device_node *np, return; /* set value & mask */ value[0] &= value[1]; + shift = ffs(value[1]) - 1; /* skip enable & disable */ add_config(conf, param, value[0], 0, 0, value[1]); - add_setting(settings, param, value[0]); + add_setting(settings, param, value[0] >> shift); } /* add pinconf setting with 4 parameters */