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: 1536091 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 4DDEA3FE1C for ; Tue, 2 Oct 2012 08:14:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754177Ab2JBIN7 (ORCPT ); Tue, 2 Oct 2012 04:13:59 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:39817 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754183Ab2JBINl (ORCPT ); Tue, 2 Oct 2012 04:13:41 -0400 Received: by mail-wi0-f172.google.com with SMTP id hq12so550762wib.1 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=Nsmuh0Zmb2rm6VZvIMKHrjaELS3y5mUbft+Hs0kojnDNnV8tNiCYBFqmyKAtxWu+LJ 8TpvkeDT3XKwU6GL++HeXWYoVBig8HUHtR00nc1kNM9/tSoKLLHHclFBaUvFg1vgLrlT wKfVL50HuafCf5JOmmCeeyW5kt2qH9gkoZrikvH/1XpCCLC7guzSoFi288P2n4TSXwho HqCzHTRGTht2y+dIQ6UE4AyPEkXgv3nT4/dWSjNRT3JM13q5whV08Gbxu4rG07iZdGDs yF/0LxCLr4fWu5Yd7bd6gbsPZiE6E62vG3ed5Iyn9gzdyscZ+C/deU/benVKsz/TfxV+ DzUw== 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 Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones , Dmitry Torokhov , linux-input@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: ALoCoQnTcH4X18CMucH49FG9lC8q8bx6KYxrg3fvSfLUNE0b7jGntKmvz9OF/PdwHwe9SoH156Gv Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.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);