diff mbox

pinctrl: qcom: Add BUS_HOLD pin bias

Message ID 1403066951-31266-1-git-send-email-agross@codeaurora.org (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Andy Gross June 18, 2014, 4:49 a.m. UTC 
This patch adds the BUS_HOLD (Keeper) bias option for pins.

Signed-off-by: Andy Gross <agross@codeaurora.org>
---
 drivers/pinctrl/pinctrl-msm.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Bjorn Andersson June 18, 2014, 5:22 a.m. UTC | #1 
On Tue, Jun 17, 2014 at 9:49 PM, Andy Gross <agross@codeaurora.org> wrote:
> This patch adds the BUS_HOLD (Keeper) bias option for pins.
>
> Signed-off-by: Andy Gross <agross@codeaurora.org>

Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Linus Walleij July 7, 2014, 2:21 p.m. UTC | #2 
On Wed, Jun 18, 2014 at 6:49 AM, Andy Gross <agross@codeaurora.org> wrote:

> This patch adds the BUS_HOLD (Keeper) bias option for pins.
>
> Signed-off-by: Andy Gross <agross@codeaurora.org>

Patch applied with Björn's ACK, thanks Andy.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c
index e43fbce..9aa2839 100644
--- a/drivers/pinctrl/pinctrl-msm.c
+++ b/drivers/pinctrl/pinctrl-msm.c
@@ -206,6 +206,7 @@  static int msm_config_reg(struct msm_pinctrl *pctrl,
 	switch (param) {
 	case PIN_CONFIG_BIAS_DISABLE:
 	case PIN_CONFIG_BIAS_PULL_DOWN:
+	case PIN_CONFIG_BIAS_BUS_HOLD:
 	case PIN_CONFIG_BIAS_PULL_UP:
 		*bit = g->pull_bit;
 		*mask = 3;
@@ -243,6 +244,7 @@  static int msm_config_set(struct pinctrl_dev *pctldev, unsigned int pin,
 
 #define MSM_NO_PULL	0
 #define MSM_PULL_DOWN	1
+#define MSM_KEEPER	2
 #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,
 	case PIN_CONFIG_BIAS_PULL_DOWN:
 		arg = arg == MSM_PULL_DOWN;
 		break;
+	case PIN_CONFIG_BIAS_BUS_HOLD:
+		arg = arg == MSM_KEEPER;
+		break;
 	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,
 		case PIN_CONFIG_BIAS_PULL_DOWN:
 			arg = MSM_PULL_DOWN;
 			break;
+		case PIN_CONFIG_BIAS_BUS_HOLD:
+			arg = MSM_KEEPER;
+			break;
 		case PIN_CONFIG_BIAS_PULL_UP:
 			arg = MSM_PULL_UP;
 			break;