| Message ID | 1305280071-1652-1-git-send-email-aghayal@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, May 13, 2011 at 03:17:50PM +0530, Anirudh Ghayal wrote: > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org> Acked-by: Dmitry Torokhov <dtor@mail.ru> > --- > drivers/input/keyboard/pmic8xxx-keypad.c | 58 ++++++++++++++++++++++++++++++ > include/linux/input/pmic8xxx-keypad.h | 2 + > 2 files changed, 60 insertions(+), 0 deletions(-) > > diff --git a/drivers/input/keyboard/pmic8xxx-keypad.c b/drivers/input/keyboard/pmic8xxx-keypad.c > index 0229325..40b02ae 100644 > --- a/drivers/input/keyboard/pmic8xxx-keypad.c > +++ b/drivers/input/keyboard/pmic8xxx-keypad.c > @@ -21,6 +21,7 @@ > #include <linux/mutex.h> > > #include <linux/mfd/pm8xxx/core.h> > +#include <linux/mfd/pm8xxx/gpio.h> > #include <linux/input/pmic8xxx-keypad.h> > > #define PM8XXX_MAX_ROWS 18 > @@ -446,6 +447,27 @@ static int __devinit pmic8xxx_kpd_init(struct pmic8xxx_kp *kp) > > } > > +static int __devinit pmic8xxx_kp_config_gpio(int gpio_start, int num_gpios, > + struct pmic8xxx_kp *kp, struct pm_gpio *gpio_config) > +{ > + int rc, i; > + > + if (gpio_start < 0 || num_gpios < 0) > + return -EINVAL; > + > + for (i = 0; i < num_gpios; i++) { > + rc = pm8xxx_gpio_config(gpio_start + i, gpio_config); > + if (rc) { > + dev_err(kp->dev, "%s: FAIL pm8xxx_gpio_config():" > + "for PM GPIO [%d] rc=%d.\n", > + __func__, gpio_start + i, rc); > + return rc; > + } > + } > + > + return 0; > +} > + > static int pmic8xxx_kp_enable(struct pmic8xxx_kp *kp) > { > int rc; > @@ -504,6 +526,27 @@ static int __devinit pmic8xxx_kp_probe(struct platform_device *pdev) > int rc; > u8 ctrl_val; > > + struct pm_gpio kypd_drv = { > + .direction = PM_GPIO_DIR_OUT, > + .output_buffer = PM_GPIO_OUT_BUF_OPEN_DRAIN, > + .output_value = 0, > + .pull = PM_GPIO_PULL_NO, > + .vin_sel = PM_GPIO_VIN_S3, > + .out_strength = PM_GPIO_STRENGTH_LOW, > + .function = PM_GPIO_FUNC_1, > + .inv_int_pol = 1, > + }; > + > + struct pm_gpio kypd_sns = { > + .direction = PM_GPIO_DIR_IN, > + .pull = PM_GPIO_PULL_UP_31P5, > + .vin_sel = PM_GPIO_VIN_S3, > + .out_strength = PM_GPIO_STRENGTH_NO, > + .function = PM_GPIO_FUNC_NORMAL, > + .inv_int_pol = 1, > + }; > + > + > if (!pdata || !pdata->num_cols || !pdata->num_rows || > pdata->num_cols > PM8XXX_MAX_COLS || > pdata->num_rows > PM8XXX_MAX_ROWS || > @@ -609,6 +652,20 @@ static int __devinit pmic8xxx_kp_probe(struct platform_device *pdev) > goto err_get_irq; > } > > + rc = pmic8xxx_kp_config_gpio(pdata->cols_gpio_start, > + pdata->num_cols, kp, &kypd_sns); > + if (rc < 0) { > + dev_err(&pdev->dev, "unable to configure keypad sense lines\n"); > + goto err_gpio_config; > + } > + > + rc = pmic8xxx_kp_config_gpio(pdata->rows_gpio_start, > + pdata->num_rows, kp, &kypd_drv); > + if (rc < 0) { > + dev_err(&pdev->dev, "unable to configure keypad drive lines\n"); > + goto err_gpio_config; > + } > + > rc = request_any_context_irq(kp->key_sense_irq, pmic8xxx_kp_irq, > IRQF_TRIGGER_RISING, "pmic-keypad", kp); > if (rc < 0) { > @@ -645,6 +702,7 @@ err_pmic_reg_read: > free_irq(kp->key_stuck_irq, NULL); > err_req_stuck_irq: > free_irq(kp->key_sense_irq, NULL); > +err_gpio_config: > err_get_irq: > input_free_device(kp->input); > err_alloc_device: > diff --git a/include/linux/input/pmic8xxx-keypad.h b/include/linux/input/pmic8xxx-keypad.h > index fc2ac4c..5f1e2f9 100644 > --- a/include/linux/input/pmic8xxx-keypad.h > +++ b/include/linux/input/pmic8xxx-keypad.h > @@ -38,6 +38,8 @@ struct pm8xxx_keypad_platform_data { > > unsigned int num_cols; > unsigned int num_rows; > + unsigned int rows_gpio_start; > + unsigned int cols_gpio_start; > > unsigned int debounce_ms; > unsigned int scan_delay_ms; > -- > Sent by a consultant of the Qualcomm Innovation Center, Inc.\nThe Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. >
Hi Dmitry, Thank you for reviewing this. I was planning to fold this patch into the pm8xxx-keypad driver and then send it across to the MFD tree with your Ack. Does this sound ok? Thank you, ~Anirudh On 5/17/2011 12:07 PM, Dmitry Torokhov wrote: > On Fri, May 13, 2011 at 03:17:50PM +0530, Anirudh Ghayal wrote: >> Cc: Dmitry Torokhov<dmitry.torokhov@gmail.com> >> Signed-off-by: Anirudh Ghayal<aghayal@codeaurora.org> > > Acked-by: Dmitry Torokhov<dtor@mail.ru> > >> --- >> drivers/input/keyboard/pmic8xxx-keypad.c | 58 ++++++++++++++++++++++++++++++ >> include/linux/input/pmic8xxx-keypad.h | 2 + >> 2 files changed, 60 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/input/keyboard/pmic8xxx-keypad.c b/drivers/input/keyboard/pmic8xxx-keypad.c >> index 0229325..40b02ae 100644 >> --- a/drivers/input/keyboard/pmic8xxx-keypad.c >> +++ b/drivers/input/keyboard/pmic8xxx-keypad.c >> @@ -21,6 +21,7 @@ >> #include<linux/mutex.h> >> >> #include<linux/mfd/pm8xxx/core.h> >> +#include<linux/mfd/pm8xxx/gpio.h> >> #include<linux/input/pmic8xxx-keypad.h> >> >> #define PM8XXX_MAX_ROWS 18 >> @@ -446,6 +447,27 @@ static int __devinit pmic8xxx_kpd_init(struct pmic8xxx_kp *kp) >> >> } >> >> +static int __devinit pmic8xxx_kp_config_gpio(int gpio_start, int num_gpios, >> + struct pmic8xxx_kp *kp, struct pm_gpio *gpio_config) >> +{ >> + int rc, i; >> + >> + if (gpio_start< 0 || num_gpios< 0) >> + return -EINVAL; >> + >> + for (i = 0; i< num_gpios; i++) { >> + rc = pm8xxx_gpio_config(gpio_start + i, gpio_config); >> + if (rc) { >> + dev_err(kp->dev, "%s: FAIL pm8xxx_gpio_config():" >> + "for PM GPIO [%d] rc=%d.\n", >> + __func__, gpio_start + i, rc); >> + return rc; >> + } >> + } >> + >> + return 0; >> +} >> + >> static int pmic8xxx_kp_enable(struct pmic8xxx_kp *kp) >> { >> int rc; >> @@ -504,6 +526,27 @@ static int __devinit pmic8xxx_kp_probe(struct platform_device *pdev) >> int rc; >> u8 ctrl_val; >> >> + struct pm_gpio kypd_drv = { >> + .direction = PM_GPIO_DIR_OUT, >> + .output_buffer = PM_GPIO_OUT_BUF_OPEN_DRAIN, >> + .output_value = 0, >> + .pull = PM_GPIO_PULL_NO, >> + .vin_sel = PM_GPIO_VIN_S3, >> + .out_strength = PM_GPIO_STRENGTH_LOW, >> + .function = PM_GPIO_FUNC_1, >> + .inv_int_pol = 1, >> + }; >> + >> + struct pm_gpio kypd_sns = { >> + .direction = PM_GPIO_DIR_IN, >> + .pull = PM_GPIO_PULL_UP_31P5, >> + .vin_sel = PM_GPIO_VIN_S3, >> + .out_strength = PM_GPIO_STRENGTH_NO, >> + .function = PM_GPIO_FUNC_NORMAL, >> + .inv_int_pol = 1, >> + }; >> + >> + >> if (!pdata || !pdata->num_cols || !pdata->num_rows || >> pdata->num_cols> PM8XXX_MAX_COLS || >> pdata->num_rows> PM8XXX_MAX_ROWS || >> @@ -609,6 +652,20 @@ static int __devinit pmic8xxx_kp_probe(struct platform_device *pdev) >> goto err_get_irq; >> } >> >> + rc = pmic8xxx_kp_config_gpio(pdata->cols_gpio_start, >> + pdata->num_cols, kp,&kypd_sns); >> + if (rc< 0) { >> + dev_err(&pdev->dev, "unable to configure keypad sense lines\n"); >> + goto err_gpio_config; >> + } >> + >> + rc = pmic8xxx_kp_config_gpio(pdata->rows_gpio_start, >> + pdata->num_rows, kp,&kypd_drv); >> + if (rc< 0) { >> + dev_err(&pdev->dev, "unable to configure keypad drive lines\n"); >> + goto err_gpio_config; >> + } >> + >> rc = request_any_context_irq(kp->key_sense_irq, pmic8xxx_kp_irq, >> IRQF_TRIGGER_RISING, "pmic-keypad", kp); >> if (rc< 0) { >> @@ -645,6 +702,7 @@ err_pmic_reg_read: >> free_irq(kp->key_stuck_irq, NULL); >> err_req_stuck_irq: >> free_irq(kp->key_sense_irq, NULL); >> +err_gpio_config: >> err_get_irq: >> input_free_device(kp->input); >> err_alloc_device: >> diff --git a/include/linux/input/pmic8xxx-keypad.h b/include/linux/input/pmic8xxx-keypad.h >> index fc2ac4c..5f1e2f9 100644 >> --- a/include/linux/input/pmic8xxx-keypad.h >> +++ b/include/linux/input/pmic8xxx-keypad.h >> @@ -38,6 +38,8 @@ struct pm8xxx_keypad_platform_data { >> >> unsigned int num_cols; >> unsigned int num_rows; >> + unsigned int rows_gpio_start; >> + unsigned int cols_gpio_start; >> >> unsigned int debounce_ms; >> unsigned int scan_delay_ms; >> -- >> Sent by a consultant of the Qualcomm Innovation Center, Inc.\nThe Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. >> > -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/keyboard/pmic8xxx-keypad.c b/drivers/input/keyboard/pmic8xxx-keypad.c index 0229325..40b02ae 100644 --- a/drivers/input/keyboard/pmic8xxx-keypad.c +++ b/drivers/input/keyboard/pmic8xxx-keypad.c @@ -21,6 +21,7 @@ #include <linux/mutex.h> #include <linux/mfd/pm8xxx/core.h> +#include <linux/mfd/pm8xxx/gpio.h> #include <linux/input/pmic8xxx-keypad.h> #define PM8XXX_MAX_ROWS 18 @@ -446,6 +447,27 @@ static int __devinit pmic8xxx_kpd_init(struct pmic8xxx_kp *kp) } +static int __devinit pmic8xxx_kp_config_gpio(int gpio_start, int num_gpios, + struct pmic8xxx_kp *kp, struct pm_gpio *gpio_config) +{ + int rc, i; + + if (gpio_start < 0 || num_gpios < 0) + return -EINVAL; + + for (i = 0; i < num_gpios; i++) { + rc = pm8xxx_gpio_config(gpio_start + i, gpio_config); + if (rc) { + dev_err(kp->dev, "%s: FAIL pm8xxx_gpio_config():" + "for PM GPIO [%d] rc=%d.\n", + __func__, gpio_start + i, rc); + return rc; + } + } + + return 0; +} + static int pmic8xxx_kp_enable(struct pmic8xxx_kp *kp) { int rc; @@ -504,6 +526,27 @@ static int __devinit pmic8xxx_kp_probe(struct platform_device *pdev) int rc; u8 ctrl_val; + struct pm_gpio kypd_drv = { + .direction = PM_GPIO_DIR_OUT, + .output_buffer = PM_GPIO_OUT_BUF_OPEN_DRAIN, + .output_value = 0, + .pull = PM_GPIO_PULL_NO, + .vin_sel = PM_GPIO_VIN_S3, + .out_strength = PM_GPIO_STRENGTH_LOW, + .function = PM_GPIO_FUNC_1, + .inv_int_pol = 1, + }; + + struct pm_gpio kypd_sns = { + .direction = PM_GPIO_DIR_IN, + .pull = PM_GPIO_PULL_UP_31P5, + .vin_sel = PM_GPIO_VIN_S3, + .out_strength = PM_GPIO_STRENGTH_NO, + .function = PM_GPIO_FUNC_NORMAL, + .inv_int_pol = 1, + }; + + if (!pdata || !pdata->num_cols || !pdata->num_rows || pdata->num_cols > PM8XXX_MAX_COLS || pdata->num_rows > PM8XXX_MAX_ROWS || @@ -609,6 +652,20 @@ static int __devinit pmic8xxx_kp_probe(struct platform_device *pdev) goto err_get_irq; } + rc = pmic8xxx_kp_config_gpio(pdata->cols_gpio_start, + pdata->num_cols, kp, &kypd_sns); + if (rc < 0) { + dev_err(&pdev->dev, "unable to configure keypad sense lines\n"); + goto err_gpio_config; + } + + rc = pmic8xxx_kp_config_gpio(pdata->rows_gpio_start, + pdata->num_rows, kp, &kypd_drv); + if (rc < 0) { + dev_err(&pdev->dev, "unable to configure keypad drive lines\n"); + goto err_gpio_config; + } + rc = request_any_context_irq(kp->key_sense_irq, pmic8xxx_kp_irq, IRQF_TRIGGER_RISING, "pmic-keypad", kp); if (rc < 0) { @@ -645,6 +702,7 @@ err_pmic_reg_read: free_irq(kp->key_stuck_irq, NULL); err_req_stuck_irq: free_irq(kp->key_sense_irq, NULL); +err_gpio_config: err_get_irq: input_free_device(kp->input); err_alloc_device: diff --git a/include/linux/input/pmic8xxx-keypad.h b/include/linux/input/pmic8xxx-keypad.h index fc2ac4c..5f1e2f9 100644 --- a/include/linux/input/pmic8xxx-keypad.h +++ b/include/linux/input/pmic8xxx-keypad.h @@ -38,6 +38,8 @@ struct pm8xxx_keypad_platform_data { unsigned int num_cols; unsigned int num_rows; + unsigned int rows_gpio_start; + unsigned int cols_gpio_start; unsigned int debounce_ms; unsigned int scan_delay_ms;
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org> --- drivers/input/keyboard/pmic8xxx-keypad.c | 58 ++++++++++++++++++++++++++++++ include/linux/input/pmic8xxx-keypad.h | 2 + 2 files changed, 60 insertions(+), 0 deletions(-)