Merge branch 'ib-pinctrl-genprops' into devel

2017-01-26 15:27:54 +01:00
parent af81ba3cfd 2956b5d94a
commit 27a2873617
47 changed files with 403 additions and 268 deletions
--- a/drivers/pinctrl/sirf/pinctrl-atlas7.c
+++ b/drivers/pinctrl/sirf/pinctrl-atlas7.c
@@ -5322,7 +5322,8 @@ static int atlas7_pin_config_set(struct pinctrl_dev *pctldev,
 				unsigned pin, unsigned long *configs,
 				unsigned num_configs)
 {
-	u16 param, arg;
+	u16 param;
+	u32 arg;
 	int idx, err;

 	for (idx = 0; idx < num_configs; idx++) {