TononixOS/ubports_kernel_google_msm
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

input: pmic8xxx-keypad: Upstream leftovers

Browse Source 
Last few bits of this driver that aren't upstream.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
Stephen Boyd
2013-01-11 17:41:58 -08:00
parent 16431b32d5
commit 644a9fb5e5
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/input/keyboard/pmic8xxx-keypad.c
View File

@@ -116,6 +116,9 @@ static int pmic8xxx_kp_write_u8(struct pmic8xxx_kp *kp,
int rc;
rc = pm8xxx_writeb(kp->dev->parent, reg, data);
if (rc < 0)
dev_warn(kp->dev, "Error writing pmic8xxx: %X - ret %X\n",
reg, rc);
return rc;
}
@@ -125,6 +128,10 @@ static int pmic8xxx_kp_read(struct pmic8xxx_kp *kp,
int rc;
rc = pm8xxx_read_buf(kp->dev->parent, reg, data, num_bytes);
if (rc < 0)
dev_warn(kp->dev, "Error reading pmic8xxx: %X - ret %X\n",
reg, rc);
return rc;
}
@@ -134,6 +141,9 @@ static int pmic8xxx_kp_read_u8(struct pmic8xxx_kp *kp,
int rc;
rc = pmic8xxx_kp_read(kp, data, reg, 1);
if (rc < 0)
dev_warn(kp->dev, "Error reading pmic8xxx: %X - ret %X\n",
reg, rc);
return rc;
}
@@ -463,7 +473,7 @@ static int __devinit pmic8xxx_kp_config_gpio(int gpio_start, int num_gpios,
__func__, gpio_start + i, rc);
return rc;
}
}
}
return 0;
}
@@ -532,7 +542,7 @@ static int __devinit pmic8xxx_kp_probe(struct platform_device *pdev)
.output_buffer = PM_GPIO_OUT_BUF_OPEN_DRAIN,
.output_value = 0,
.pull = PM_GPIO_PULL_NO,
.vin_sel = PM_GPIO_VIN_S3,
.vin_sel = PM_GPIO_VIN_S4,
.out_strength = PM_GPIO_STRENGTH_LOW,
.function = PM_GPIO_FUNC_1,
.inv_int_pol = 1,
@@ -541,7 +551,7 @@ static int __devinit pmic8xxx_kp_probe(struct platform_device *pdev)
struct pm_gpio kypd_sns = {
.direction = PM_GPIO_DIR_IN,
.pull = PM_GPIO_PULL_UP_31P5,
.vin_sel = PM_GPIO_VIN_S3,
.vin_sel = PM_GPIO_VIN_S4,
.out_strength = PM_GPIO_STRENGTH_NO,
.function = PM_GPIO_FUNC_NORMAL,
.inv_int_pol = 1,