[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20200619090608.94948-4-drew@beagleboard.org>
Date: Fri, 19 Jun 2020 11:06:08 +0200
From: Drew Fustini <drew@...gleboard.org>
To: Tony Lindgren <tony@...mide.com>, Rob Herring <robh+dt@...nel.org>,
linux-omap@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-gpio@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
Linus Walleij <linus.walleij@...aro.org>,
Haojian Zhuang <haojian.zhuang@...aro.org>,
devicetree@...r.kernel.org,
BenoƮt Cousson <bcousson@...libre.com>,
Jason Kridner <jkridner@...gleboard.org>,
Robert Nelson <robertcnelson@...il.com>
Cc: Drew Fustini <drew@...gleboard.org>
Subject: [PATCH v2 3/3] pinctrl: single: parse #pinctrl-cells = 2
If "pinctrl-single,pins" has 3 arguments (offset, conf, mux) then
pcs_parse_one_pinctrl_entry() does an OR operation on to get the
value to store in the register.
Signed-off-by: Drew Fustini <drew@...gleboard.org>
---
drivers/pinctrl/pinctrl-single.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 02f677eb1d53..e6d1cf25782c 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -1017,10 +1017,17 @@ static int pcs_parse_one_pinctrl_entry(struct pcs_device *pcs,
break;
}
- /* Index plus one value cell */
offset = pinctrl_spec.args[0];
vals[found].reg = pcs->base + offset;
- vals[found].val = pinctrl_spec.args[1];
+
+ switch (pinctrl_spec.args_count) {
+ case 2:
+ vals[found].val = pinctrl_spec.args[1];
+ break;
+ case 3:
+ vals[found].val = (pinctrl_spec.args[1] | pinctrl_spec.args[2]);
+ break;
+ }
dev_dbg(pcs->dev, "%pOFn index: 0x%x value: 0x%x\n",
pinctrl_spec.np, offset, pinctrl_spec.args[1]);
--
2.25.1
Powered by blists - more mailing lists