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/0032-pinctrl-msm-Simplify-msm_config_reg-and-callers.patch | |
parent | 048910c4e07b6fae28513ce1dea62fe3b6bb03de (diff) | |
download | master-187ad058-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.gz master-187ad058-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.bz2 master-187ad058-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/0032-pinctrl-msm-Simplify-msm_config_reg-and-callers.patch')
-rw-r--r-- | target/linux/ipq806x/patches/0032-pinctrl-msm-Simplify-msm_config_reg-and-callers.patch | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/target/linux/ipq806x/patches/0032-pinctrl-msm-Simplify-msm_config_reg-and-callers.patch b/target/linux/ipq806x/patches/0032-pinctrl-msm-Simplify-msm_config_reg-and-callers.patch index d656978236..f7798ae42e 100644 --- a/target/linux/ipq806x/patches/0032-pinctrl-msm-Simplify-msm_config_reg-and-callers.patch +++ b/target/linux/ipq806x/patches/0032-pinctrl-msm-Simplify-msm_config_reg-and-callers.patch @@ -14,11 +14,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/pinctrl-msm.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) -diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c -index ab46e3a..91de8bc 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c -@@ -200,28 +200,17 @@ static const struct pinmux_ops msm_pinmux_ops = { +@@ -200,28 +200,17 @@ static const struct pinmux_ops msm_pinmu static int msm_config_reg(struct msm_pinctrl *pctrl, const struct msm_pingroup *g, unsigned param, @@ -47,7 +45,7 @@ index ab46e3a..91de8bc 100644 *bit = g->drv_bit; *mask = 7; break; -@@ -230,12 +219,6 @@ static int msm_config_reg(struct msm_pinctrl *pctrl, +@@ -230,12 +219,6 @@ static int msm_config_reg(struct msm_pin return -ENOTSUPP; } @@ -60,7 +58,7 @@ index ab46e3a..91de8bc 100644 return 0; } -@@ -273,17 +256,16 @@ static int msm_config_group_get(struct pinctrl_dev *pctldev, +@@ -273,17 +256,16 @@ static int msm_config_group_get(struct p unsigned mask; unsigned arg; unsigned bit; @@ -80,7 +78,7 @@ index ab46e3a..91de8bc 100644 arg = (val >> bit) & mask; /* Convert register value to pinconf value */ -@@ -323,7 +305,6 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev, +@@ -323,7 +305,6 @@ static int msm_config_group_set(struct p unsigned mask; unsigned arg; unsigned bit; @@ -88,7 +86,7 @@ index ab46e3a..91de8bc 100644 int ret; u32 val; int i; -@@ -334,7 +315,7 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev, +@@ -334,7 +315,7 @@ static int msm_config_group_set(struct p param = pinconf_to_config_param(configs[i]); arg = pinconf_to_config_argument(configs[i]); @@ -97,7 +95,7 @@ index ab46e3a..91de8bc 100644 if (ret < 0) return ret; -@@ -369,10 +350,10 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev, +@@ -369,10 +350,10 @@ static int msm_config_group_set(struct p } spin_lock_irqsave(&pctrl->lock, flags); @@ -110,6 +108,3 @@ index ab46e3a..91de8bc 100644 spin_unlock_irqrestore(&pctrl->lock, flags); } --- -1.7.10.4 - |