From patchwork Fri Oct 5 15:31:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1553951 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 20F97DF24C for ; Fri, 5 Oct 2012 15:32:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756250Ab2JEPcO (ORCPT ); Fri, 5 Oct 2012 11:32:14 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:44255 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756145Ab2JEPcL (ORCPT ); Fri, 5 Oct 2012 11:32:11 -0400 Received: by mail-wg0-f44.google.com with SMTP id dr13so1607863wgb.1 for ; Fri, 05 Oct 2012 08:32:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=5+dvO5+TE8MuABIQDylUSjNOeWBBr4RtCM3l3OBVwbs=; b=lXP1893L4pSUwYhbPkdtAwIdXWAAke9Wa4YNGHwXKf496C3F4xgvBusV1/4KL4UgG7 jJA8MFrS80utrGnRCGeA18YGZoBlxcusN198jh7ICy2QvU1b5sZUT46YpYJezfuc2UkH y8ry6we0nIWUefoQGHewyWs1lFmWX2tIaX8aFU/+zN5uaxTyFakodJa3pP1/dKwI0vKV AzAIiOI9HU4pfxQrjKqHUp86pQ1iADPiPCGelBksegJ4X+lI1Xa4+e/UVRDTSQEi0M0B VXDLYx4EuZfUdLjYIEAgCNdqlSfQypNlI8dd9LZTNQ2ThUT4O9seHrkNC72xdvcEJLMq INgA== Received: by 10.180.94.226 with SMTP id df2mr4111988wib.11.1349451129628; Fri, 05 Oct 2012 08:32:09 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id w8sm2906148wif.4.2012.10.05.08.32.08 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 08:32:09 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones , Dmitry Torokhov , linux-input@vger.kernel.org Subject: [PATCH 07/10] input: Enable STMPE keypad driver for Device Tree Date: Fri, 5 Oct 2012 16:31:43 +0100 Message-Id: <1349451107-8009-8-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349451107-8009-1-git-send-email-lee.jones@linaro.org> References: <1349451107-8009-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkK7cAWvdXNKbs4TEXEkTREx2IqMQrwc8X8+2ik2LPMw8UzjJyPV4KdAxeSsFW2CpZHINWZ Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org This patch allows the STMPE driver to be successfully probed and initialised when Device Tree support is enabled. Besides the usual platform data changes, we also separate the process of filling in the 'in use' pin bitmap, as we have to extract the information from Device Tree in the DT boot case. Cc: Dmitry Torokhov Cc: linux-input@vger.kernel.org Acked-by: Linus Walleij Signed-off-by: Lee Jones --- drivers/input/keyboard/stmpe-keypad.c | 67 ++++++++++++++++++++++++++++----- drivers/mfd/stmpe.c | 1 + 2 files changed, 59 insertions(+), 9 deletions(-) diff --git a/drivers/input/keyboard/stmpe-keypad.c b/drivers/input/keyboard/stmpe-keypad.c index 470a877..c722d23 100644 --- a/drivers/input/keyboard/stmpe-keypad.c +++ b/drivers/input/keyboard/stmpe-keypad.c @@ -257,19 +257,73 @@ static int __devinit stmpe_keypad_chip_init(struct stmpe_keypad *keypad) (plat->debounce_ms << 1)); } +static int stmpe_keypad_fill_used_pins(struct platform_device *pdev, + struct stmpe_keypad *keypad, + struct stmpe_keypad_platform_data *plat) +{ + struct device_node *np = pdev->dev.of_node; + unsigned int proplen; + const __be32 *prop; + int i; + + if (np) { + prop = of_get_property(np, "linux,keymap", &proplen); + if (!prop) { + dev_err(&pdev->dev, + "linux,keymap property not defined\n"); + return -EINVAL; + } + + for (i = 0; i < proplen / sizeof(u32); i++) { + unsigned int key = be32_to_cpup(prop + i); + + keypad->cols |= 1 << KEY_COL(key); + keypad->rows |= 1 << KEY_ROW(key); + } + } else { + for (i = 0; i < plat->keymap_data->keymap_size; i++) { + unsigned int key = plat->keymap_data->keymap[i]; + + keypad->cols |= 1 << KEY_COL(key); + keypad->rows |= 1 << KEY_ROW(key); + } + } + + return 0; +} + +static void __devinit stmpe_keypad_of_probe(struct device_node *np, + struct stmpe_keypad_platform_data *plat) +{ + of_property_read_u32(np, "debounce-interval", &plat->debounce_ms); + of_property_read_u32(np, "stericsson,scan-count", &plat->scan_count); + + if (of_get_property(np, "stericsson,no-autorepeat", NULL)) + plat->no_autorepeat = true; +} + static int __devinit stmpe_keypad_probe(struct platform_device *pdev) { struct stmpe *stmpe = dev_get_drvdata(pdev->dev.parent); struct stmpe_keypad_platform_data *plat; + struct device_node *np = pdev->dev.of_node; struct stmpe_keypad *keypad; struct input_dev *input; int ret; int irq; - int i; plat = stmpe->pdata->keypad; - if (!plat) - return -ENODEV; + if (!plat) { + if (np) { + plat = devm_kzalloc(&pdev->dev, + sizeof(*plat), GFP_KERNEL); + if (!plat) + return -ENOMEM; + + stmpe_keypad_of_probe(np, plat); + } else + return -ENODEV; + } irq = platform_get_irq(pdev, 0); if (irq < 0) @@ -300,12 +354,7 @@ static int __devinit stmpe_keypad_probe(struct platform_device *pdev) if (!plat->no_autorepeat) __set_bit(EV_REP, input->evbit); - for (i = 0; i < plat->keymap_data->keymap_size; i++) { - unsigned int key = plat->keymap_data->keymap[i]; - - keypad->cols |= 1 << KEY_COL(key); - keypad->rows |= 1 << KEY_ROW(key); - } + stmpe_keypad_fill_used_pins(pdev, keypad, plat); keypad->stmpe = stmpe; keypad->plat = plat; diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c index ba157d4..b03cc64 100644 --- a/drivers/mfd/stmpe.c +++ b/drivers/mfd/stmpe.c @@ -321,6 +321,7 @@ static struct resource stmpe_keypad_resources[] = { static struct mfd_cell stmpe_keypad_cell = { .name = "stmpe-keypad", + .of_compatible = "st,stmpe-keypad", .resources = stmpe_keypad_resources, .num_resources = ARRAY_SIZE(stmpe_keypad_resources), };