From patchwork Thu May 5 05:29:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: y@vger.kernel.org X-Patchwork-Id: 755872 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p455To0w021326 for ; Thu, 5 May 2011 05:29:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751240Ab1EEF3u (ORCPT ); Thu, 5 May 2011 01:29:50 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:56659 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751232Ab1EEF3t (ORCPT ); Thu, 5 May 2011 01:29:49 -0400 X-IronPort-AV: E=McAfee;i="5400,1158,6336"; a="89613573" Received: from pdmz-ns-mip.qualcomm.com (HELO mostmsg01.qualcomm.com) ([199.106.114.10]) by wolverine01.qualcomm.com with ESMTP/TLS/ADH-AES256-SHA; 04 May 2011 22:29:48 -0700 Received: from codeaurora.org (pdmz-snip-v218.qualcomm.com [192.168.218.1]) by mostmsg01.qualcomm.com (Postfix) with ESMTPA id 1C76310004A2; Wed, 4 May 2011 22:29:28 -0700 (PDT) From: y@vger.kernel.org To: linux-input@vger.kernel.org, Dmitry Torokhov Cc: linux-arm-msm@vger.kernel.org, Samuel Ortiz , Anirudh Ghayal Subject: [PATCH V2 2/3] input: pmic8xxx-keypad: Add row and column gpio configuration Date: Thu, 5 May 2011 10:59:24 +0530 Message-Id: <1304573365-21427-2-git-send-email-y> X-Mailer: git-send-email 1.7.3.5 In-Reply-To: <1304573365-21427-1-git-send-email-y> References: <1304573365-21427-1-git-send-email-y> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 05 May 2011 05:29:50 +0000 (UTC) From: Anirudh Ghayal Cc: Dmitry Torokhov Signed-off-by: Anirudh Ghayal --- drivers/input/keyboard/pmic8xxx-keypad.c | 74 ++++++++++++++++++++++++++++++ include/linux/input/pmic8xxx-keypad.h | 2 + 2 files changed, 76 insertions(+), 0 deletions(-) diff --git a/drivers/input/keyboard/pmic8xxx-keypad.c b/drivers/input/keyboard/pmic8xxx-keypad.c index 0229325..cad09d7 100644 --- a/drivers/input/keyboard/pmic8xxx-keypad.c +++ b/drivers/input/keyboard/pmic8xxx-keypad.c @@ -21,6 +21,7 @@ #include #include +#include #include #define PM8XXX_MAX_ROWS 18 @@ -446,6 +447,64 @@ static int __devinit pmic8xxx_kpd_init(struct pmic8xxx_kp *kp) } +static int __devinit pmic8xxx_kp_config_drv(int gpio_start, int num_gpios) +{ + int rc; + 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, + }; + + if (gpio_start < 0 || num_gpios < 0 || + num_gpios > (PM8XXX_MAX_ROWS + gpio_start)) + return -EINVAL; + + while (num_gpios--) { + rc = pm8xxx_gpio_config(gpio_start++, &kypd_drv); + if (rc) { + pr_err("%s: FAIL pm8xxx_gpio_config(): rc=%d.\n", + __func__, rc); + return rc; + } + } + + return 0; +} + +static int __devinit pmic8xxx_kp_config_sns(int gpio_start, int num_gpios) +{ + int rc; + 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 (gpio_start < 0 || num_gpios < 0 || + num_gpios > (PM8XXX_MAX_COLS + gpio_start)) + return -EINVAL; + + while (num_gpios--) { + rc = pm8xxx_gpio_config(gpio_start++, &kypd_sns); + if (rc) { + pr_err("%s: FAIL pm8xxx_gpio_config(): rc=%d.\n", + __func__, rc); + return rc; + } + } + + return 0; +} + static int pmic8xxx_kp_enable(struct pmic8xxx_kp *kp) { int rc; @@ -609,6 +668,20 @@ static int __devinit pmic8xxx_kp_probe(struct platform_device *pdev) goto err_get_irq; } + rc = pmic8xxx_kp_config_sns(pdata->cols_gpio_start, + pdata->num_cols); + if (rc < 0) { + dev_err(&pdev->dev, "unable to configure keypad sense lines\n"); + goto err_gpio_config; + } + + rc = pmic8xxx_kp_config_drv(pdata->rows_gpio_start, + pdata->num_rows); + 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 +718,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;