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/0149-pinctrl-qcom-Add-BUS_HOLD-Keeper-bias.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/0149-pinctrl-qcom-Add-BUS_HOLD-Keeper-bias.patch')
| -rw-r--r-- | target/linux/ipq806x/patches/0149-pinctrl-qcom-Add-BUS_HOLD-Keeper-bias.patch | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/target/linux/ipq806x/patches/0149-pinctrl-qcom-Add-BUS_HOLD-Keeper-bias.patch b/target/linux/ipq806x/patches/0149-pinctrl-qcom-Add-BUS_HOLD-Keeper-bias.patch index 8e21ee8a97..8b2e18ab84 100644 --- a/target/linux/ipq806x/patches/0149-pinctrl-qcom-Add-BUS_HOLD-Keeper-bias.patch +++ b/target/linux/ipq806x/patches/0149-pinctrl-qcom-Add-BUS_HOLD-Keeper-bias.patch @@ -10,11 +10,9 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> drivers/pinctrl/pinctrl-msm.c | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c -index 7d67d34..f054b25 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c -@@ -207,6 +207,7 @@ static int msm_config_reg(struct msm_pinctrl *pctrl, +@@ -207,6 +207,7 @@ static int msm_config_reg(struct msm_pin case PIN_CONFIG_BIAS_DISABLE: case PIN_CONFIG_BIAS_PULL_DOWN: case PIN_CONFIG_BIAS_PULL_UP: @@ -22,7 +20,7 @@ index 7d67d34..f054b25 100644 *bit = g->pull_bit; *mask = 3; break; -@@ -243,6 +244,7 @@ static int msm_config_set(struct pinctrl_dev *pctldev, unsigned int pin, +@@ -243,6 +244,7 @@ static int msm_config_set(struct pinctrl #define MSM_NO_PULL 0 #define MSM_PULL_DOWN 1 @@ -30,7 +28,7 @@ index 7d67d34..f054b25 100644 #define MSM_PULL_UP 3 static unsigned msm_regval_to_drive(u32 val) -@@ -280,6 +282,9 @@ static int msm_config_group_get(struct pinctrl_dev *pctldev, +@@ -280,6 +282,9 @@ static int msm_config_group_get(struct p case PIN_CONFIG_BIAS_PULL_DOWN: arg = arg == MSM_PULL_DOWN; break; @@ -40,7 +38,7 @@ index 7d67d34..f054b25 100644 case PIN_CONFIG_BIAS_PULL_UP: arg = arg == MSM_PULL_UP; break; -@@ -339,6 +344,9 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev, +@@ -339,6 +344,9 @@ static int msm_config_group_set(struct p case PIN_CONFIG_BIAS_PULL_DOWN: arg = MSM_PULL_DOWN; break; @@ -50,6 +48,3 @@ index 7d67d34..f054b25 100644 case PIN_CONFIG_BIAS_PULL_UP: arg = MSM_PULL_UP; break; --- -1.7.10.4 - |