X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=target%2Flinux%2Flantiq%2Fpatches-3.10%2F0026-pinctrl-lantiq-fix-up-pinmux.patch;h=fa4eee10b9fedf82cba6f3c2a36ee54b47d57684;hb=01f2e3a83adda726b8622c52a42a5b67c2b1619f;hp=e68dc7eb1f579dd1987cb6248ebb4e1664288b57;hpb=ab98727d68aca01b27a6d9ef8fecb140867df6e2;p=openwrt.git diff --git a/target/linux/lantiq/patches-3.10/0026-pinctrl-lantiq-fix-up-pinmux.patch b/target/linux/lantiq/patches-3.10/0026-pinctrl-lantiq-fix-up-pinmux.patch index e68dc7eb1f..fa4eee10b9 100644 --- a/target/linux/lantiq/patches-3.10/0026-pinctrl-lantiq-fix-up-pinmux.patch +++ b/target/linux/lantiq/patches-3.10/0026-pinctrl-lantiq-fix-up-pinmux.patch @@ -10,11 +10,9 @@ Signed-off-by: John Crispin drivers/pinctrl/pinctrl-xway.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) -diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c -index e92132c..e40b2e6 100644 --- a/drivers/pinctrl/pinctrl-xway.c +++ b/drivers/pinctrl/pinctrl-xway.c -@@ -564,10 +564,9 @@ static struct pinctrl_desc xway_pctrl_desc = { +@@ -564,10 +564,9 @@ static struct pinctrl_desc xway_pctrl_de .confops = &xway_pinconf_ops, }; @@ -26,7 +24,7 @@ index e92132c..e40b2e6 100644 int port = PORT(pin); u32 alt1_reg = GPIO_ALT1(pin); -@@ -587,6 +586,14 @@ static inline int xway_mux_apply(struct pinctrl_dev *pctrldev, +@@ -587,6 +586,14 @@ static inline int xway_mux_apply(struct return 0; } @@ -41,7 +39,7 @@ index e92132c..e40b2e6 100644 static const struct ltq_cfg_param xway_cfg_params[] = { {"lantiq,pull", LTQ_PINCONF_PARAM_PULL}, {"lantiq,open-drain", LTQ_PINCONF_PARAM_OPEN_DRAIN}, -@@ -631,6 +638,10 @@ static int xway_gpio_dir_out(struct gpio_chip *chip, unsigned int pin, int val) +@@ -631,6 +638,10 @@ static int xway_gpio_dir_out(struct gpio { struct ltq_pinmux_info *info = dev_get_drvdata(chip->dev); @@ -52,7 +50,7 @@ index e92132c..e40b2e6 100644 gpio_setbit(info->membase[0], GPIO_DIR(pin), PORT_PIN(pin)); xway_gpio_set(chip, pin, val); -@@ -651,6 +662,18 @@ static void xway_gpio_free(struct gpio_chip *chip, unsigned offset) +@@ -651,6 +662,18 @@ static void xway_gpio_free(struct gpio_c pinctrl_free_gpio(gpio); } @@ -79,6 +77,3 @@ index e92132c..e40b2e6 100644 .base = -1, }; --- -1.7.10.4 -