From patchwork Tue Oct 2 08:13:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1536181 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id D2E1D3FCFC for ; Tue, 2 Oct 2012 08:16:12 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TIxcE-0004T5-MM; Tue, 02 Oct 2012 08:14:06 +0000 Received: from mail-wi0-f169.google.com ([209.85.212.169]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TIxbo-0004Pk-QM for linux-arm-kernel@lists.infradead.org; Tue, 02 Oct 2012 08:13:42 +0000 Received: by mail-wi0-f169.google.com with SMTP id hq4so474478wib.0 for ; Tue, 02 Oct 2012 01:13:39 -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=uPgba7W7vMTyGlzpgJEm3iiAj+8g4b2ZwxbyN9VhFSc=; b=LVD1KER7ZRfpha29MauH/RFY4WaIwRS58ySJI1yNa8gKpehJ0PYb1H3h0E9CsAnsSH DQcT4bcw3m0mh6Xccb6txEY03IBsJ60QnOYUFHXLpuTWObiTh+OldnRu+MoKERhTwfOo 1PQgs1qdeU+pucgcAHIcJEJcNsNfkZjNvv0Pc176WlilXUBX+BFbmK7/cjQhOnB3gjoe 4n4FKTEIirtKitJb86WX/+aTFSz1RchVRpWXKFOuD4HxJSebzR3UdvIaZnsTIKGzA0al 0Y2WkThKddzjLAdc98zmX3IhYquj9vRqSUKjMSuk2HWgFo8GJ6fR3n7MhNB/s0K5ESfa xhDg== Received: by 10.216.207.93 with SMTP id m71mr8452746weo.201.1349165619773; Tue, 02 Oct 2012 01:13:39 -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 p4sm1193936wix.0.2012.10.02.01.13.38 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Oct 2012 01:13:39 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/10] Input: bu21013_ts - Add support for Device Tree booting Date: Tue, 2 Oct 2012 09:13:18 +0100 Message-Id: <1349165603-24401-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349165603-24401-1-git-send-email-lee.jones@linaro.org> References: <1349165603-24401-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmKZCI8E4eaWVa1tMEC9aFjjoLssYYwSWkSChEq4AlONHJVNwxjAyg1RJLiooLEhD7JgDl4 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.169 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Dmitry Torokhov , Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de, linux-input@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Now we can register the BU21013_ts touch screen when booting with Device Tree enabled. Here we parse all the necessary components previously expected to be passed from platform data. Cc: Dmitry Torokhov Cc: linux-input@vger.kernel.org Signed-off-by: Lee Jones Acked-by: Linus Walleij --- drivers/input/touchscreen/bu21013_ts.c | 39 ++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c index 5d8fc75..3d1bff2 100644 --- a/drivers/input/touchscreen/bu21013_ts.c +++ b/drivers/input/touchscreen/bu21013_ts.c @@ -15,6 +15,8 @@ #include #include #include +#include +#include /* Reference tracking for multiple displays. */ static int bu21013_devices = 0; @@ -487,13 +489,33 @@ static void bu21013_free_irq(struct bu21013_ts_data *bu21013_data) * This function used to initializes the i2c-client touchscreen * driver and returns integer. */ +static void __devinit bu21013_of_probe(struct device_node *np, + struct bu21013_platform_device *pdata) +{ + pdata->y_flip = pdata->x_flip = false; + + if (of_get_property(np, "stricsson,flip-x", NULL)) + pdata->x_flip = true; + + if (of_get_property(np, "stricsson,flip-y", NULL)) + pdata->y_flip = true; + + of_property_read_u32(np, "stericsson,touch-max-x", &pdata->touch_x_max); + of_property_read_u32(np, "stericsson,touch-max-y", &pdata->touch_y_max); + + pdata->touch_pin = of_get_named_gpio(np, "touch-gpio", 0); + pdata->cs_pin = of_get_named_gpio(np, "reset-gpio", 0); + + pdata->ext_clk = false; +} + static int __devinit bu21013_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct bu21013_ts_data *bu21013_data; struct input_dev *in_dev; - const struct bu21013_platform_device *pdata = - client->dev.platform_data; + struct device_node *np = client->dev.of_node; + struct bu21013_platform_device *pdata = client->dev.platform_data; int error; if (!i2c_check_functionality(client->adapter, @@ -503,8 +525,17 @@ static int __devinit bu21013_probe(struct i2c_client *client, } if (!pdata) { - dev_err(&client->dev, "platform data not defined\n"); - return -EINVAL; + if (np) { + pdata = devm_kzalloc(&client->dev, sizeof(*pdata), + GFP_KERNEL); + if (!pdata) + return -ENOMEM; + + bu21013_of_probe(np, pdata); + } else { + dev_err(&client->dev, "no device tree or platform data\n"); + return -EINVAL; + } } pdata->irq = gpio_to_irq(pdata->touch_pin);