From patchwork Wed Jun 12 13:55:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 2710351 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 242BEC1459 for ; Wed, 12 Jun 2013 13:56:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7DB342024C for ; Wed, 12 Jun 2013 13:55:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4099D201CF for ; Wed, 12 Jun 2013 13:55:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754516Ab3FLNzz (ORCPT ); Wed, 12 Jun 2013 09:55:55 -0400 Received: from fallback2.mail.ru ([94.100.176.87]:37435 "EHLO fallback2.mail.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753181Ab3FLNzy (ORCPT ); Wed, 12 Jun 2013 09:55:54 -0400 Received: from smtp19.mail.ru (smtp19.mail.ru [94.100.176.156]) by fallback2.mail.ru (mPOP.Fallback_MX) with ESMTP id 84DEEDD70039 for ; Wed, 12 Jun 2013 17:55:52 +0400 (MSK) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-Id:Date:Subject:Cc:To:From; bh=cyPAcegRp2W5oBElEuomIZZbktzmE5H+dAE+FicdIqg=; b=qMwCESBD7Z+jKoGQBxEDJObmMNxYFLRalfFujlAKl54/25b37RDLJDXgHz9+gl7i3jyOgkIcdVYqxIMYz+7anN/Fab9cZgGdILr7M6UovyfKBfAEzbDQvDqyIe9ocVSnmD1LEkMkOK+O00kktkdXBAco50K5NKNS9uEUkesQN/Q=; Received: from [188.134.40.128] (port=61174 helo=shc.zet) by smtp19.mail.ru with esmtpa (envelope-from ) id 1UmlWH-00080p-T3; Wed, 12 Jun 2013 17:55:26 +0400 From: Alexander Shiyan To: linux-input@vger.kernel.org Cc: Dmitry Torokhov , Bill Pemberton , Sascha Hauer , =?UTF-8?q?Philippe=20R=C3=A9tornaz?= , Alexander Shiyan Subject: [RFC] input: mc13783: Prepare driver to support MC13892 and OF Date: Wed, 12 Jun 2013 17:55:20 +0400 Message-Id: <1371045320-12269-1-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 1.8.1.5 MIME-Version: 1.0 X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Mras: Ok Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RDNS_NONE, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is a complete rewritten driver for handle buttons on mc13xxx PMICs and prepare to support probe via DT, so comments are welcome. Signed-off-by: Alexander Shiyan --- drivers/input/misc/mc13783-pwrbutton.c | 327 +++++++++++++-------------------- include/linux/mfd/mc13xxx.h | 29 +-- 2 files changed, 146 insertions(+), 210 deletions(-) diff --git a/drivers/input/misc/mc13783-pwrbutton.c b/drivers/input/misc/mc13783-pwrbutton.c index d0277a7..d23235f 100644 --- a/drivers/input/misc/mc13783-pwrbutton.c +++ b/drivers/input/misc/mc13783-pwrbutton.c @@ -1,4 +1,6 @@ -/** +/* + * Button driver for Freescale MC13783 + * * Copyright (C) 2011 Philippe Rétornaz * * Based on twl4030-pwrbutton driver by: @@ -13,10 +15,6 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ #include @@ -24,248 +22,183 @@ #include #include #include -#include #include #include -#include -#include - -struct mc13783_pwrb { - struct input_dev *pwr; - struct mc13xxx *mc13783; -#define MC13783_PWRB_B1_POL_INVERT (1 << 0) -#define MC13783_PWRB_B2_POL_INVERT (1 << 1) -#define MC13783_PWRB_B3_POL_INVERT (1 << 2) - int flags; - unsigned short keymap[3]; + +struct mc13xxx_button_def { + int irq; + int sense_bit; }; -#define MC13783_REG_INTERRUPT_SENSE_1 5 -#define MC13783_IRQSENSE1_ONOFD1S (1 << 3) -#define MC13783_IRQSENSE1_ONOFD2S (1 << 4) -#define MC13783_IRQSENSE1_ONOFD3S (1 << 5) +struct mc13xxx_pwrb_devtype { + struct mc13xxx_button_def btn_def[MAX13XXX_NUM_BUTTONS]; +}; + +struct mc13xxx_pwrb { + struct mc13xxx_pwrb_devtype *devtype; + u32 irq_enabled; + u32 btn_inverted; + u16 btn_code[MAX13XXX_NUM_BUTTONS]; + struct input_dev *input; + struct mc13xxx *mc13xxx; +}; -#define MC13783_REG_POWER_CONTROL_2 15 -#define MC13783_POWER_CONTROL_2_ON1BDBNC 4 -#define MC13783_POWER_CONTROL_2_ON2BDBNC 6 -#define MC13783_POWER_CONTROL_2_ON3BDBNC 8 -#define MC13783_POWER_CONTROL_2_ON1BRSTEN (1 << 1) -#define MC13783_POWER_CONTROL_2_ON2BRSTEN (1 << 2) -#define MC13783_POWER_CONTROL_2_ON3BRSTEN (1 << 3) +#define MC13XXX_REG_INTERRUPT_SENSE_1 5 +#define MC13XXX_REG_POWER_CONTROL_2 15 -static irqreturn_t button_irq(int irq, void *_priv) +static irqreturn_t mc13xxx_pwrbutton_irq(int irq, void *data) { - struct mc13783_pwrb *priv = _priv; - int val; - - mc13xxx_irq_ack(priv->mc13783, irq); - mc13xxx_reg_read(priv->mc13783, MC13783_REG_INTERRUPT_SENSE_1, &val); - - switch (irq) { - case MC13783_IRQ_ONOFD1: - val = val & MC13783_IRQSENSE1_ONOFD1S ? 1 : 0; - if (priv->flags & MC13783_PWRB_B1_POL_INVERT) - val ^= 1; - input_report_key(priv->pwr, priv->keymap[0], val); - break; - - case MC13783_IRQ_ONOFD2: - val = val & MC13783_IRQSENSE1_ONOFD2S ? 1 : 0; - if (priv->flags & MC13783_PWRB_B2_POL_INVERT) - val ^= 1; - input_report_key(priv->pwr, priv->keymap[1], val); - break; - - case MC13783_IRQ_ONOFD3: - val = val & MC13783_IRQSENSE1_ONOFD3S ? 1 : 0; - if (priv->flags & MC13783_PWRB_B3_POL_INVERT) - val ^= 1; - input_report_key(priv->pwr, priv->keymap[2], val); - break; - } + struct mc13xxx_pwrb *priv = data; + int i, val; + + mc13xxx_irq_ack(priv->mc13xxx, irq); + + mc13xxx_reg_read(priv->mc13xxx, MC13XXX_REG_INTERRUPT_SENSE_1, &val); - input_sync(priv->pwr); + for (i = 0; i < MAX13XXX_NUM_BUTTONS; i++) + if (irq == priv->devtype->btn_def[i].irq) { + val = !!(val & priv->devtype->btn_def[i].sense_bit); + if (priv->btn_inverted & (1 << i)) + val ^= 1; + input_report_key(priv->input, priv->btn_code[i], val); + break; + } + + input_sync(priv->input); return IRQ_HANDLED; } -static int mc13783_pwrbutton_probe(struct platform_device *pdev) +static int __init mc13xxx_pwrbutton_probe(struct platform_device *pdev) { - const struct mc13xxx_buttons_platform_data *pdata; - struct mc13xxx *mc13783 = dev_get_drvdata(pdev->dev.parent); - struct input_dev *pwr; - struct mc13783_pwrb *priv; - int err = 0; - int reg = 0; - - pdata = dev_get_platdata(&pdev->dev); + struct mc13xxx_buttons_platform_data *pdata = + dev_get_platdata(&pdev->dev); + struct mc13xxx *mc13xxx = dev_get_drvdata(pdev->dev.parent); + struct mc13xxx_pwrb_devtype *devtype = + (struct mc13xxx_pwrb_devtype *)pdev->id_entry->driver_data; + struct mc13xxx_pwrb *priv; + int i, ret = 0, reg = 0; + if (!pdata) { - dev_err(&pdev->dev, "missing platform data\n"); + dev_err(&pdev->dev, "Missing platform data\n"); return -ENODEV; } - pwr = input_allocate_device(); - if (!pwr) { - dev_dbg(&pdev->dev, "Can't allocate power button\n"); + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) return -ENOMEM; - } - priv = kzalloc(sizeof(*priv), GFP_KERNEL); - if (!priv) { - err = -ENOMEM; + priv->input = devm_input_allocate_device(&pdev->dev); + if (!priv->input) { dev_dbg(&pdev->dev, "Can't allocate power button\n"); - goto free_input_dev; - } - - reg |= (pdata->b1on_flags & 0x3) << MC13783_POWER_CONTROL_2_ON1BDBNC; - reg |= (pdata->b2on_flags & 0x3) << MC13783_POWER_CONTROL_2_ON2BDBNC; - reg |= (pdata->b3on_flags & 0x3) << MC13783_POWER_CONTROL_2_ON3BDBNC; - - priv->pwr = pwr; - priv->mc13783 = mc13783; - - mc13xxx_lock(mc13783); - - if (pdata->b1on_flags & MC13783_BUTTON_ENABLE) { - priv->keymap[0] = pdata->b1on_key; - if (pdata->b1on_key != KEY_RESERVED) - __set_bit(pdata->b1on_key, pwr->keybit); - - if (pdata->b1on_flags & MC13783_BUTTON_POL_INVERT) - priv->flags |= MC13783_PWRB_B1_POL_INVERT; - - if (pdata->b1on_flags & MC13783_BUTTON_RESET_EN) - reg |= MC13783_POWER_CONTROL_2_ON1BRSTEN; - - err = mc13xxx_irq_request(mc13783, MC13783_IRQ_ONOFD1, - button_irq, "b1on", priv); - if (err) { - dev_dbg(&pdev->dev, "Can't request irq\n"); - goto free_priv; - } + return -ENOMEM; } - if (pdata->b2on_flags & MC13783_BUTTON_ENABLE) { - priv->keymap[1] = pdata->b2on_key; - if (pdata->b2on_key != KEY_RESERVED) - __set_bit(pdata->b2on_key, pwr->keybit); - - if (pdata->b2on_flags & MC13783_BUTTON_POL_INVERT) - priv->flags |= MC13783_PWRB_B2_POL_INVERT; - - if (pdata->b2on_flags & MC13783_BUTTON_RESET_EN) - reg |= MC13783_POWER_CONTROL_2_ON2BRSTEN; - - err = mc13xxx_irq_request(mc13783, MC13783_IRQ_ONOFD2, - button_irq, "b2on", priv); - if (err) { - dev_dbg(&pdev->dev, "Can't request irq\n"); - goto free_irq_b1; - } - } + priv->mc13xxx = mc13xxx; + priv->devtype = devtype; + platform_set_drvdata(pdev, priv); - if (pdata->b3on_flags & MC13783_BUTTON_ENABLE) { - priv->keymap[2] = pdata->b3on_key; - if (pdata->b3on_key != KEY_RESERVED) - __set_bit(pdata->b3on_key, pwr->keybit); + mc13xxx_lock(mc13xxx); + for (i = 0; i < MAX13XXX_NUM_BUTTONS; i++) { + u16 keycode = pdata->buttons[i].keycode; + int reset = pdata->buttons[i].reset; + int debounce = pdata->buttons[i].debounce; - if (pdata->b3on_flags & MC13783_BUTTON_POL_INVERT) - priv->flags |= MC13783_PWRB_B3_POL_INVERT; + if (!pdata->buttons[i].enabled) + continue; - if (pdata->b3on_flags & MC13783_BUTTON_RESET_EN) - reg |= MC13783_POWER_CONTROL_2_ON3BRSTEN; + priv->btn_code[i] = keycode; + if (priv->btn_code[i] != KEY_RESERVED) + __set_bit(priv->btn_code[i], priv->input->keybit); - err = mc13xxx_irq_request(mc13783, MC13783_IRQ_ONOFD3, - button_irq, "b3on", priv); - if (err) { - dev_dbg(&pdev->dev, "Can't request irq: %d\n", err); - goto free_irq_b2; + ret = mc13xxx_irq_request(mc13xxx, devtype->btn_def[i].irq, + mc13xxx_pwrbutton_irq, NULL, priv); + if (ret) { + dev_dbg(&pdev->dev, "Can't request IRQ: %i\n", ret); + break; } - } - - mc13xxx_reg_rmw(mc13783, MC13783_REG_POWER_CONTROL_2, 0x3FE, reg); - - mc13xxx_unlock(mc13783); - - pwr->name = "mc13783_pwrbutton"; - pwr->phys = "mc13783_pwrbutton/input0"; - pwr->dev.parent = &pdev->dev; - pwr->keycode = priv->keymap; - pwr->keycodemax = ARRAY_SIZE(priv->keymap); - pwr->keycodesize = sizeof(priv->keymap[0]); - __set_bit(EV_KEY, pwr->evbit); - - err = input_register_device(pwr); - if (err) { - dev_dbg(&pdev->dev, "Can't register power button: %d\n", err); - goto free_irq; + priv->irq_enabled |= 1 << i; + reg |= reset ? (1 < (i + 1)) : 0; + reg |= debounce << (4 + i * 2); } - platform_set_drvdata(pdev, priv); + if (ret) + goto err_irq; - return 0; + mc13xxx_reg_rmw(mc13xxx, MC13XXX_REG_POWER_CONTROL_2, 0x3fe, reg); -free_irq: - mc13xxx_lock(mc13783); + mc13xxx_unlock(mc13xxx); - if (pdata->b3on_flags & MC13783_BUTTON_ENABLE) - mc13xxx_irq_free(mc13783, MC13783_IRQ_ONOFD3, priv); + priv->input->name = "mc13xxx_pwrbutton"; + priv->input->phys = "mc13xxx_pwrbutton/input0"; + priv->input->dev.parent = &pdev->dev; + priv->input->id.bustype = BUS_HOST; + priv->input->id.vendor = 0x0001; + priv->input->id.product = 0x0001; + priv->input->id.version = 0x0100; + priv->input->keycode = priv->btn_code; + priv->input->keycodemax = ARRAY_SIZE(priv->btn_code); + priv->input->keycodesize = sizeof(priv->btn_code[0]); + __set_bit(EV_KEY, priv->input->evbit); -free_irq_b2: - if (pdata->b2on_flags & MC13783_BUTTON_ENABLE) - mc13xxx_irq_free(mc13783, MC13783_IRQ_ONOFD2, priv); + ret = input_register_device(priv->input); + if (!ret) + return 0; -free_irq_b1: - if (pdata->b1on_flags & MC13783_BUTTON_ENABLE) - mc13xxx_irq_free(mc13783, MC13783_IRQ_ONOFD1, priv); + dev_dbg(&pdev->dev, "Can't register power button: %i\n", ret); -free_priv: - mc13xxx_unlock(mc13783); - kfree(priv); + mc13xxx_lock(mc13xxx); -free_input_dev: - input_free_device(pwr); +err_irq: + for (i = 0; i < MAX13XXX_NUM_BUTTONS; i++) + if (priv->irq_enabled & (1 << i)) + mc13xxx_irq_free(priv->mc13xxx, + devtype->btn_def[i].irq, priv); + mc13xxx_unlock(mc13xxx); - return err; + return ret; } -static int mc13783_pwrbutton_remove(struct platform_device *pdev) +static int mc13xxx_pwrbutton_remove(struct platform_device *pdev) { - struct mc13783_pwrb *priv = platform_get_drvdata(pdev); - const struct mc13xxx_buttons_platform_data *pdata; - - pdata = dev_get_platdata(&pdev->dev); - - mc13xxx_lock(priv->mc13783); - - if (pdata->b3on_flags & MC13783_BUTTON_ENABLE) - mc13xxx_irq_free(priv->mc13783, MC13783_IRQ_ONOFD3, priv); - if (pdata->b2on_flags & MC13783_BUTTON_ENABLE) - mc13xxx_irq_free(priv->mc13783, MC13783_IRQ_ONOFD2, priv); - if (pdata->b1on_flags & MC13783_BUTTON_ENABLE) - mc13xxx_irq_free(priv->mc13783, MC13783_IRQ_ONOFD1, priv); + struct mc13xxx_pwrb *priv = platform_get_drvdata(pdev); + int i; - mc13xxx_unlock(priv->mc13783); + mc13xxx_lock(priv->mc13xxx); + for (i = 0; i < MAX13XXX_NUM_BUTTONS; i++) + if (priv->irq_enabled & (1 << i)) + mc13xxx_irq_free(priv->mc13xxx, + priv->devtype->btn_def[i].irq, priv); + mc13xxx_unlock(priv->mc13xxx); - input_unregister_device(priv->pwr); - kfree(priv); + input_unregister_device(priv->input); return 0; } -static struct platform_driver mc13783_pwrbutton_driver = { - .probe = mc13783_pwrbutton_probe, - .remove = mc13783_pwrbutton_remove, - .driver = { - .name = "mc13783-pwrbutton", +static const struct mc13xxx_pwrb_devtype mc13783_pwrb_devtype = { + .btn_def[0] = { MC13783_IRQ_ONOFD1, (1 << 3) }, + .btn_def[1] = { MC13783_IRQ_ONOFD2, (1 << 4) }, + .btn_def[2] = { MC13783_IRQ_ONOFD3, (1 << 5) } +}; + +static const struct platform_device_id mc13xxx_pwrbutton_id_table[] = { + { "mc13783-pwrbutton", (kernel_ulong_t)&mc13783_pwrb_devtype }, + { } +}; +MODULE_DEVICE_TABLE(platform, mc13xxx_pwrbutton_id_table); + +static struct platform_driver mc13xxx_pwrbutton_driver = { + .driver = { + .name = "mc13xxx-pwrbutton", .owner = THIS_MODULE, }, + .remove = mc13xxx_pwrbutton_remove, + .id_table = mc13xxx_pwrbutton_id_table, }; +module_platform_driver_probe(mc13xxx_pwrbutton_driver, mc13xxx_pwrbutton_probe); -module_platform_driver(mc13783_pwrbutton_driver); - -MODULE_ALIAS("platform:mc13783-pwrbutton"); -MODULE_DESCRIPTION("MC13783 Power Button"); +MODULE_DESCRIPTION("Button driver for Freescale MC13XXX PMIC"); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Philippe Retornaz"); diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h index 41ed592..f737240 100644 --- a/include/linux/mfd/mc13xxx.h +++ b/include/linux/mfd/mc13xxx.h @@ -142,20 +142,23 @@ struct mc13xxx_leds_platform_data { u32 led_control[MAX_LED_CONTROL_REGS]; }; +#define MAX13XXX_NUM_BUTTONS 3 + +struct mc13xxx_button { + int enabled:1; + int inverted:1; + int reset:1; + int debounce:2; + u16 keycode; +}; + +#define MC13XXX_BUTTON_DBNC_0MS 0 +#define MC13XXX_BUTTON_DBNC_30MS 1 +#define MC13XXX_BUTTON_DBNC_150MS 2 +#define MC13XXX_BUTTON_DBNC_750MS 3 + struct mc13xxx_buttons_platform_data { -#define MC13783_BUTTON_DBNC_0MS 0 -#define MC13783_BUTTON_DBNC_30MS 1 -#define MC13783_BUTTON_DBNC_150MS 2 -#define MC13783_BUTTON_DBNC_750MS 3 -#define MC13783_BUTTON_ENABLE (1 << 2) -#define MC13783_BUTTON_POL_INVERT (1 << 3) -#define MC13783_BUTTON_RESET_EN (1 << 4) - int b1on_flags; - unsigned short b1on_key; - int b2on_flags; - unsigned short b2on_key; - int b3on_flags; - unsigned short b3on_key; + struct mc13xxx_button buttons[MAX13XXX_NUM_BUTTONS]; }; struct mc13xxx_ts_platform_data {