kernel: update 3.14 to 3.14.18

[openwrt/staging/yousong.git] / target / linux / ipq806x / patches / 0149-pinctrl-qcom-Add-BUS_HOLD-Keeper-bias.patch

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 8e21ee8a97dce4778e6f4962e657600262208f36..8b2e18ab847b75d583a423e89ea6cf9a66243360 100644 (file)
--- 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
-