Skip to contentSkip to conversation

pinctrl-single: fix parsing of `pinctrl-single, bits` property

PATCH Applied Peter Mamonov 2 participants 2 messages Mar 12, 2020 – Mar 16, 2020

Subsystems (2)
Pin control Pin controller - single
lore
Share & tools
lore

Peter Mamonov

author
#0 lore raw

PATCH 1/1 pinctrl-single: fix parsing of `pinctrl-single, bits` property

According to dts/Bindings/pinctrl/pinctrl-single.txt:113 the correct order of parameters is <offset, value, mask>.

Fixes f7e0cae43 ('pinctrl-single: Handle "pinctrl-single,function-mask" dt property')
Signed-off-by Peter Mamonov <[email protected]>
---
 drivers/pinctrl/pinctrl-single.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/pinctrl-single.c +1 -1
index d4f411b4a..2cd58df93 100644
@@ -87,8 +87,8 @@ static int pcs_set_state(struct pinctrl_device *pdev, struct device_node *np)
 
 		for (i = 0; i < rows; i++) {
 			offset = be32_to_cpup(mux + index++);
-			mask = be32_to_cpup(mux + index++);
 			val = be32_to_cpup(mux + index++);
+			mask = be32_to_cpup(mux + index++);
 			reg = pcs->read(pcs->base + offset);
 			reg &= ~mask;
 			reg |= val;
Signature · 7 lines
2.20.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Applied
#1 lore raw

Re: [PATCH] pinctrl-single: fix parsing of `pinctrl-single,bits` property

Quoted 8 lines · Peter Mamonov

According to dts/Bindings/pinctrl/pinctrl-single.txt:113 the correct order of parameters is <offset, value, mask>.

Fixes f7e0cae43 ('pinctrl-single: Handle "pinctrl-single,function-mask" dt property')
Signed-off-by Peter Mamonov <[email protected]>
---
 drivers/pinctrl/pinctrl-single.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

Quoted 19 lines
drivers/pinctrl/pinctrl-single.c +1 -1
index d4f411b4a..2cd58df93 100644
@@ -87,8 +87,8 @@ static int pcs_set_state(struct pinctrl_device *pdev, struct device_node *np)
 
 		for (i = 0; i < rows; i++) {
 			offset = be32_to_cpup(mux + index++);
-			mask = be32_to_cpup(mux + index++);
 			val = be32_to_cpup(mux + index++);
+			mask = be32_to_cpup(mux + index++);
 			reg = pcs->read(pcs->base + offset);
 			reg &= ~mask;
 			reg |= val;
Signature · 1 line
2.20.1
Signature · 9 lines
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox