aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/patches/0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.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/0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.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/0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.patch')
-rw-r--r--target/linux/ipq806x/patches/0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/target/linux/ipq806x/patches/0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.patch b/target/linux/ipq806x/patches/0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.patch
deleted file mode 100644
index f0bd614cfd..0000000000
--- a/target/linux/ipq806x/patches/0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c73a138dd24049d06fe7b22518655ed9e7413cd2 Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Fri, 14 Mar 2014 07:54:20 +0100
-Subject: [PATCH 035/182] pinctrl: msm: fix up out-of-order merge conflict
-
-Commit 051a58b4622f0e1b732acb750097c64bc00ddb93
-"pinctrl: msm: Simplify msm_config_reg() and callers"
-removed the local "reg" variable in the msm_config_reg()
-function, but the earlier
-commit ed118a5fd951bd2def8249ee251842c4f81fe4bd
-"pinctrl-msm: Support output-{high,low} configuration"
-introduced a new switchclause using it.
-
-Fix this up by removing the offending register assignment.
-
-Reported-by: Kbuild test robot <fengguang.wu@intel.com>
-Cc: Stephen Boyd <sboyd@codeaurora.org>
-Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/pinctrl/pinctrl-msm.c | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/pinctrl/pinctrl-msm.c
-+++ b/drivers/pinctrl/pinctrl-msm.c
-@@ -215,7 +215,6 @@ static int msm_config_reg(struct msm_pin
- *mask = 7;
- break;
- case PIN_CONFIG_OUTPUT:
-- *reg = g->ctl_reg;
- *bit = g->oe_bit;
- *mask = 1;
- break;