aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/patches/0037-pinctrl-msm-Make-number-of-functions-variable.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-02-11 10:09:23 +0000
committerJohn Crispin <john@openwrt.org>2015-02-11 10:09:23 +0000
commit88ddb3746188037afd38d631f7a893587fa8bdf0 (patch)
treedf4684db63441435126c4b6ff1fda4ce615e1ff0 /target/linux/ipq806x/patches/0037-pinctrl-msm-Make-number-of-functions-variable.patch
parentddcbef5766fa18f52e7a7d1928b25edc63e73937 (diff)
downloadupstream-88ddb3746188037afd38d631f7a893587fa8bdf0.tar.gz
upstream-88ddb3746188037afd38d631f7a893587fa8bdf0.tar.bz2
upstream-88ddb3746188037afd38d631f7a893587fa8bdf0.zip
ipq806x: update target to v3.18
Patches in the ipq806x/patches folder were out of tree in v3.14. The newest patch at the time was from June, so we can safely assume that either the patches have been merged, or they have been rejected for a good reason. If patches are seen missing, we'll cherry-pick them on a per-needed basis. This new kernel have been tested on AP148, which seems to works fine. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 44386
Diffstat (limited to 'target/linux/ipq806x/patches/0037-pinctrl-msm-Make-number-of-functions-variable.patch')
-rw-r--r--target/linux/ipq806x/patches/0037-pinctrl-msm-Make-number-of-functions-variable.patch65
1 files changed, 0 insertions, 65 deletions
diff --git a/target/linux/ipq806x/patches/0037-pinctrl-msm-Make-number-of-functions-variable.patch b/target/linux/ipq806x/patches/0037-pinctrl-msm-Make-number-of-functions-variable.patch
deleted file mode 100644
index e36498b83d..0000000000
--- a/target/linux/ipq806x/patches/0037-pinctrl-msm-Make-number-of-functions-variable.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 1c11b14dd6d740e997919f0bf789bf921548dc0f Mon Sep 17 00:00:00 2001
-From: Bjorn Andersson <bjorn.andersson@sonymobile.com>
-Date: Mon, 31 Mar 2014 14:49:55 -0700
-Subject: [PATCH 037/182] pinctrl: msm: Make number of functions variable
-
-The various pins may have different number of functions defined, so make this
-number definable per pin instead of just increasing it to the largest one for
-all of the platforms.
-
-Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/pinctrl/pinctrl-msm.c | 4 ++--
- drivers/pinctrl/pinctrl-msm.h | 3 ++-
- drivers/pinctrl/pinctrl-msm8x74.c | 3 ++-
- 3 files changed, 6 insertions(+), 4 deletions(-)
-
---- a/drivers/pinctrl/pinctrl-msm.c
-+++ b/drivers/pinctrl/pinctrl-msm.c
-@@ -145,12 +145,12 @@ static int msm_pinmux_enable(struct pinc
- if (WARN_ON(g->mux_bit < 0))
- return -EINVAL;
-
-- for (i = 0; i < ARRAY_SIZE(g->funcs); i++) {
-+ for (i = 0; i < g->nfuncs; i++) {
- if (g->funcs[i] == function)
- break;
- }
-
-- if (WARN_ON(i == ARRAY_SIZE(g->funcs)))
-+ if (WARN_ON(i == g->nfuncs))
- return -EINVAL;
-
- spin_lock_irqsave(&pctrl->lock, flags);
---- a/drivers/pinctrl/pinctrl-msm.h
-+++ b/drivers/pinctrl/pinctrl-msm.h
-@@ -65,7 +65,8 @@ struct msm_pingroup {
- const unsigned *pins;
- unsigned npins;
-
-- unsigned funcs[8];
-+ unsigned *funcs;
-+ unsigned nfuncs;
-
- s16 ctl_reg;
- s16 io_reg;
---- a/drivers/pinctrl/pinctrl-msm8x74.c
-+++ b/drivers/pinctrl/pinctrl-msm8x74.c
-@@ -341,7 +341,7 @@ static const unsigned int sdc2_data_pins
- .name = "gpio" #id, \
- .pins = gpio##id##_pins, \
- .npins = ARRAY_SIZE(gpio##id##_pins), \
-- .funcs = { \
-+ .funcs = (int[]){ \
- MSM_MUX_NA, /* gpio mode */ \
- MSM_MUX_##f1, \
- MSM_MUX_##f2, \
-@@ -351,6 +351,7 @@ static const unsigned int sdc2_data_pins
- MSM_MUX_##f6, \
- MSM_MUX_##f7 \
- }, \
-+ .nfuncs = 8, \
- .ctl_reg = 0x1000 + 0x10 * id, \
- .io_reg = 0x1004 + 0x10 * id, \
- .intr_cfg_reg = 0x1008 + 0x10 * id, \