Parcourir la source

ralink: fix the gpio mode mapping

Signed-off-by: John Crispin <[email protected]>

SVN-Revision: 39609
John Crispin il y a 12 ans
Parent
commit
363512b8c6
1 fichiers modifiés avec 35 ajouts et 0 suppressions
  1. 35 0
      target/linux/ramips/patches-3.10/999-pinctrl_fixes.patch

+ 35 - 0
target/linux/ramips/patches-3.10/999-pinctrl_fixes.patch

@@ -0,0 +1,35 @@
+Index: linux-3.10.28/drivers/pinctrl/pinctrl-rt2880.c
+===================================================================
+--- linux-3.10.28.orig/drivers/pinctrl/pinctrl-rt2880.c	2014-02-14 10:46:06.216549358 +0000
++++ linux-3.10.28/drivers/pinctrl/pinctrl-rt2880.c	2014-02-14 14:58:18.580040433 +0000
+@@ -204,6 +204,7 @@
+ {
+ 	struct rt2880_priv *p = pinctrl_dev_get_drvdata(pctrldev);
+         u32 mode = 0;
++	int i;
+ 
+ 	/* dont allow double use */
+ 	if (p->groups[group].enabled) {
+@@ -217,16 +218,16 @@
+ 	mode = rt_sysc_r32(SYSC_REG_GPIO_MODE);
+ 	mode &= ~(p->groups[group].mask << p->groups[group].shift);
+ 
++	/* mark the pins as gpio */
++	for (i = 0; i < p->groups[group].func[0].pin_count; i++)
++		p->gpio[p->groups[group].func[0].pins[i]] = 1;
++
+ 	/* function 0 is gpio and needs special handling */
+ 	if (func == 0) {
+-		int i;
+-
+-
+ 		mode |= p->groups[group].gpio << p->groups[group].shift;
+-		/* mark the pins as gpio */
+-		for (i = 0; i < p->groups[group].func[0].pin_count; i++)
+-			p->gpio[p->groups[group].func[0].pins[i]] = 1;
+ 	} else {
++		for (i = 0; i < p->func[func]->pin_count; i++)
++			p->gpio[p->func[func]->pins[i]] = 0;
+ 		mode |= p->func[func]->value << p->groups[group].shift;
+ 	}
+ 	rt_sysc_w32(mode, SYSC_REG_GPIO_MODE);