From: Stephen Boyd <sboyd@codeaurora.org> To: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Josh Cartwright <joshc@codeaurora.org>, linux-input@vger.kernel.org Subject: [PATCH v4 1/9] Input: pmic8xxx-keypad - Fix build by removing gpio configuration Date: Thu, 27 Feb 2014 17:55:12 -0800 [thread overview] Message-ID: <1393552520-9068-2-git-send-email-sboyd@codeaurora.org> (raw) In-Reply-To: <1393552520-9068-1-git-send-email-sboyd@codeaurora.org> The gpio configuration in this driver doesn't work because the gpio.h include doesn't exist. Remove the configuration as it isn't strictly necessary, allowing us to actually compile this driver. If it's needed in the future, it should be done via a pinctrl driver. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- drivers/input/keyboard/pmic8xxx-keypad.c | 58 -------------------------------- 1 file changed, 58 deletions(-) diff --git a/drivers/input/keyboard/pmic8xxx-keypad.c b/drivers/input/keyboard/pmic8xxx-keypad.c index 2c9f19ac35ea..c4aa882c8fb9 100644 --- a/drivers/input/keyboard/pmic8xxx-keypad.c +++ b/drivers/input/keyboard/pmic8xxx-keypad.c @@ -21,7 +21,6 @@ #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 @@ -447,27 +446,6 @@ static int pmic8xxx_kpd_init(struct pmic8xxx_kp *kp) } -static int 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; @@ -527,27 +505,6 @@ static int 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 || @@ -653,20 +610,6 @@ static int 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) { @@ -703,7 +646,6 @@ err_pmic_reg_read: free_irq(kp->key_stuck_irq, kp); err_req_stuck_irq: free_irq(kp->key_sense_irq, kp); -err_gpio_config: err_get_irq: input_free_device(kp->input); err_alloc_device: -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
WARNING: multiple messages have this Message-ID (diff)
From: sboyd@codeaurora.org (Stephen Boyd) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 1/9] Input: pmic8xxx-keypad - Fix build by removing gpio configuration Date: Thu, 27 Feb 2014 17:55:12 -0800 [thread overview] Message-ID: <1393552520-9068-2-git-send-email-sboyd@codeaurora.org> (raw) In-Reply-To: <1393552520-9068-1-git-send-email-sboyd@codeaurora.org> The gpio configuration in this driver doesn't work because the gpio.h include doesn't exist. Remove the configuration as it isn't strictly necessary, allowing us to actually compile this driver. If it's needed in the future, it should be done via a pinctrl driver. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- drivers/input/keyboard/pmic8xxx-keypad.c | 58 -------------------------------- 1 file changed, 58 deletions(-) diff --git a/drivers/input/keyboard/pmic8xxx-keypad.c b/drivers/input/keyboard/pmic8xxx-keypad.c index 2c9f19ac35ea..c4aa882c8fb9 100644 --- a/drivers/input/keyboard/pmic8xxx-keypad.c +++ b/drivers/input/keyboard/pmic8xxx-keypad.c @@ -21,7 +21,6 @@ #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 @@ -447,27 +446,6 @@ static int pmic8xxx_kpd_init(struct pmic8xxx_kp *kp) } -static int 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; @@ -527,27 +505,6 @@ static int 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 || @@ -653,20 +610,6 @@ static int 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) { @@ -703,7 +646,6 @@ err_pmic_reg_read: free_irq(kp->key_stuck_irq, kp); err_req_stuck_irq: free_irq(kp->key_sense_irq, kp); -err_gpio_config: err_get_irq: input_free_device(kp->input); err_alloc_device: -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2014-02-28 1:55 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-02-28 1:55 [PATCH v4 0/9] Use regmap+devm+DT in pm8xxx input drivers Stephen Boyd 2014-02-28 1:55 ` Stephen Boyd 2014-02-28 1:55 ` Stephen Boyd 2014-02-28 1:55 ` Stephen Boyd [this message] 2014-02-28 1:55 ` [PATCH v4 1/9] Input: pmic8xxx-keypad - Fix build by removing gpio configuration Stephen Boyd 2014-02-28 1:55 ` [PATCH v4 2/9] Input: pmic8xxx-keypad - Migrate to devm_* APIs Stephen Boyd 2014-02-28 1:55 ` Stephen Boyd 2014-02-28 1:55 ` Stephen Boyd 2014-02-28 1:55 ` [PATCH v4 3/9] Input: pmic8xxx-keypad - Migrate to regmap APIs Stephen Boyd 2014-02-28 1:55 ` Stephen Boyd 2014-02-28 1:55 ` [PATCH v4 4/9] Input: pmic8xxx-keypad - Migrate to DT Stephen Boyd 2014-02-28 1:55 ` Stephen Boyd 2014-02-28 3:41 ` Josh Cartwright 2014-02-28 3:41 ` Josh Cartwright 2014-02-28 18:29 ` Stephen Boyd 2014-02-28 18:29 ` Stephen Boyd 2014-02-28 1:55 ` [PATCH v4 5/9] Input: pmic8xxx-pwrkey " Stephen Boyd 2014-02-28 1:55 ` Stephen Boyd 2014-02-28 3:45 ` Josh Cartwright 2014-02-28 3:45 ` Josh Cartwright 2014-02-28 18:32 ` Stephen Boyd 2014-02-28 18:32 ` Stephen Boyd 2014-02-28 1:55 ` [PATCH v4 6/9] Input: pm8xxx-vibrator - Add DT match table Stephen Boyd 2014-02-28 1:55 ` Stephen Boyd 2014-02-28 1:55 ` [PATCH v4 7/9] devicetree: bindings: Document PM8921/8058 keypads Stephen Boyd 2014-02-28 1:55 ` Stephen Boyd 2014-02-28 1:55 ` Stephen Boyd 2014-02-28 13:55 ` Josh Cartwright 2014-02-28 13:55 ` Josh Cartwright 2014-02-28 18:37 ` Stephen Boyd 2014-02-28 18:37 ` Stephen Boyd 2014-02-28 19:11 ` Josh Cartwright 2014-02-28 19:11 ` Josh Cartwright 2014-02-28 1:55 ` [PATCH v4 8/9] devicetree: bindings: Document PM8921/8058 power keys Stephen Boyd 2014-02-28 1:55 ` Stephen Boyd 2014-02-28 1:55 ` Stephen Boyd 2014-02-28 1:55 ` [PATCH v4 9/9] devicetree: bindings: Document PM8921/8058 vibrators Stephen Boyd 2014-02-28 1:55 ` Stephen Boyd 2014-02-28 1:55 ` Stephen Boyd
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1393552520-9068-2-git-send-email-sboyd@codeaurora.org \ --to=sboyd@codeaurora.org \ --cc=dmitry.torokhov@gmail.com \ --cc=joshc@codeaurora.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.