evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "pinctrl: qcom: spmi-gpio: Fix the GPIO strength mapping"

Browse source
This commit is contained in:
Linux Build Service Account 2018-12-10 16:45:51 -08:00 • committed by Gerrit - the friendly Code Review server
commit 57746efb25
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012-2014, 2016 The Linux Foundation. All rights reserved. * Copyright (c) 2012-2014, 2016, 2018 The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -538,7 +538,7 @@ static int pmic_gpio_config_set(struct pinctrl_dev *pctldev, unsigned int pin,
pad->pullup = arg; pad->pullup = arg;
break; break;
case PMIC_GPIO_CONF_STRENGTH: case PMIC_GPIO_CONF_STRENGTH:
if (arg > PMIC_GPIO_STRENGTH_LOW) if (arg > PMIC_GPIO_STRENGTH_HIGH)
return -EINVAL; return -EINVAL;
pad->strength = arg; pad->strength = arg;
break; break;

4
drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (c) 2015, Sony Mobile Communications AB. * Copyright (c) 2015, Sony Mobile Communications AB.
* Copyright (c) 2013, The Linux Foundation. All rights reserved. * Copyright (c) 2013, 2018 The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -379,7 +379,7 @@ static int pm8xxx_pin_config_set(struct pinctrl_dev *pctldev,
banks |= BIT(0); banks |= BIT(0);
break; break;
case PM8XXX_QCOM_DRIVE_STRENGH: case PM8XXX_QCOM_DRIVE_STRENGH:
if (arg > PMIC_GPIO_STRENGTH_LOW) { if (arg > PM8921_GPIO_STRENGTH_LOW) {
dev_err(pctrl->dev, "invalid drive strength\n"); dev_err(pctrl->dev, "invalid drive strength\n");
return -EINVAL; return -EINVAL;
} }

9
include/dt-bindings/pinctrl/qcom,pmic-gpio.h
View file

@ -11,9 +11,14 @@
#define PMIC_GPIO_PULL_UP_1P5_30 3 #define PMIC_GPIO_PULL_UP_1P5_30 3
#define PMIC_GPIO_STRENGTH_NO 0 #define PMIC_GPIO_STRENGTH_NO 0
#define PMIC_GPIO_STRENGTH_HIGH 1 #define PMIC_GPIO_STRENGTH_LOW 1
#define PMIC_GPIO_STRENGTH_MED 2 #define PMIC_GPIO_STRENGTH_MED 2
#define PMIC_GPIO_STRENGTH_LOW 3 #define PMIC_GPIO_STRENGTH_HIGH 3
#define PM8921_GPIO_STRENGTH_NO 0
#define PM8921_GPIO_STRENGTH_HIGH 1
#define PM8921_GPIO_STRENGTH_MED 2
#define PM8921_GPIO_STRENGTH_LOW 3
/* /*
* Note: PM8018 GPIO3 and GPIO4 are supporting * Note: PM8018 GPIO3 and GPIO4 are supporting