diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
| commit | e5441232a81d01e2ed46d88e340a30fd6b15b012 (patch) | |
| tree | e008cc6bd24a0e2c9b283d94a69f7a027bcfb856 /target/linux/ipq806x/patches/0037-pinctrl-msm-Make-number-of-functions-variable.patch | |
| parent | 048910c4e07b6fae28513ce1dea62fe3b6bb03de (diff) | |
| download | upstream-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.gz upstream-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.bz2 upstream-e5441232a81d01e2ed46d88e340a30fd6b15b012.zip | |
kernel: update 3.14 to 3.14.18
Targets were build tested and patches are refreshed.
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42463 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 15 |
1 files changed, 3 insertions, 12 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 index 346dcd0ac6..e36498b83d 100644 --- 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 @@ -15,11 +15,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/pinctrl-msm8x74.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) -diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c -index 706809e..7d67d34 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c -@@ -145,12 +145,12 @@ static int msm_pinmux_enable(struct pinctrl_dev *pctldev, +@@ -145,12 +145,12 @@ static int msm_pinmux_enable(struct pinc if (WARN_ON(g->mux_bit < 0)) return -EINVAL; @@ -34,8 +32,6 @@ index 706809e..7d67d34 100644 return -EINVAL; spin_lock_irqsave(&pctrl->lock, flags); -diff --git a/drivers/pinctrl/pinctrl-msm.h b/drivers/pinctrl/pinctrl-msm.h -index 6e26f1b..7b2a227 100644 --- a/drivers/pinctrl/pinctrl-msm.h +++ b/drivers/pinctrl/pinctrl-msm.h @@ -65,7 +65,8 @@ struct msm_pingroup { @@ -48,11 +44,9 @@ index 6e26f1b..7b2a227 100644 s16 ctl_reg; s16 io_reg; -diff --git a/drivers/pinctrl/pinctrl-msm8x74.c b/drivers/pinctrl/pinctrl-msm8x74.c -index dde5529..57766d5 100644 --- a/drivers/pinctrl/pinctrl-msm8x74.c +++ b/drivers/pinctrl/pinctrl-msm8x74.c -@@ -341,7 +341,7 @@ static const unsigned int sdc2_data_pins[] = { 151 }; +@@ -341,7 +341,7 @@ static const unsigned int sdc2_data_pins .name = "gpio" #id, \ .pins = gpio##id##_pins, \ .npins = ARRAY_SIZE(gpio##id##_pins), \ @@ -61,7 +55,7 @@ index dde5529..57766d5 100644 MSM_MUX_NA, /* gpio mode */ \ MSM_MUX_##f1, \ MSM_MUX_##f2, \ -@@ -351,6 +351,7 @@ static const unsigned int sdc2_data_pins[] = { 151 }; +@@ -351,6 +351,7 @@ static const unsigned int sdc2_data_pins MSM_MUX_##f6, \ MSM_MUX_##f7 \ }, \ @@ -69,6 +63,3 @@ index dde5529..57766d5 100644 .ctl_reg = 0x1000 + 0x10 * id, \ .io_reg = 0x1004 + 0x10 * id, \ .intr_cfg_reg = 0x1008 + 0x10 * id, \ --- -1.7.10.4 - |