From patchwork Tue Nov 16 19:39:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gardiner X-Patchwork-Id: 329111 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAGJm1uX000710 for ; Tue, 16 Nov 2010 19:48:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758049Ab0KPTqS (ORCPT ); Tue, 16 Nov 2010 14:46:18 -0500 Received: from na3sys009aog110.obsmtp.com ([74.125.149.203]:41884 "HELO na3sys009aog110.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1756766Ab0KPTqQ (ORCPT ); Tue, 16 Nov 2010 14:46:16 -0500 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 16 Nov 2010 19:48:01 +0000 (UTC) X-Greylist: delayed 394 seconds by postgrey-1.27 at vger.kernel.org; Tue, 16 Nov 2010 14:46:15 EST Received: from source ([209.85.212.46]) by na3sys009aob110.postini.com ([74.125.148.12]) with SMTP ID DSNKTOLfh1+LY9qZFqQZ2lMVKYNQelVxkUCM@postini.com; Tue, 16 Nov 2010 11:46:15 PST Received: by mail-vw0-f46.google.com with SMTP id 13so577710vws.5 for ; Tue, 16 Nov 2010 11:46:15 -0800 (PST) Received: by 10.220.182.196 with SMTP id cd4mr1758236vcb.223.1289936382665; Tue, 16 Nov 2010 11:39:42 -0800 (PST) Received: from localhost.localdomain ([206.191.47.130]) by mx.google.com with ESMTPS id j13sm457716vcr.41.2010.11.16.11.39.41 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 16 Nov 2010 11:39:42 -0800 (PST) From: Ben Gardiner To: Kevin Hilman , davinci-linux-open-source@linux.davincidsp.com, linux-input@vger.kernel.org, Dmitry Torokhov Cc: linux-kernel@vger.kernel.org, Chris Cordahi , Paul Mundt , Alexander Clouter Subject: [PATCH v2 3/4] da850-evm: extract defines for SEL{A, B, C} pins in UI expander Date: Tue, 16 Nov 2010 14:39:36 -0500 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index ff71ffd..dcf21e5 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -292,6 +292,9 @@ static const char const *ui_expander_names[] = { "pb7", "pb6", "pb5", "pb4", "pb3", "pb2", "pb1" }; +#define DA850_SEL_A_OFFSET 7 +#define DA850_SEL_B_OFFSET 6 +#define DA850_SEL_C_OFFSET 5 #define DA850_UI_PB8_OFFSET 8 #define DA850_N_UI_PB 8 @@ -336,23 +339,23 @@ static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio, { int sel_a, sel_b, sel_c, ret; - sel_a = gpio + 7; - sel_b = gpio + 6; - sel_c = gpio + 5; + sel_a = gpio + DA850_SEL_A_OFFSET; + sel_b = gpio + DA850_SEL_B_OFFSET; + sel_c = gpio + DA850_SEL_C_OFFSET; - ret = gpio_request(sel_a, "sel_a"); + ret = gpio_request(sel_a, ui_expander_names[DA850_SEL_A_OFFSET]); if (ret) { pr_warning("Cannot open UI expander pin %d\n", sel_a); goto exp_setup_sela_fail; } - ret = gpio_request(sel_b, "sel_b"); + ret = gpio_request(sel_b, ui_expander_names[DA850_SEL_B_OFFSET]); if (ret) { pr_warning("Cannot open UI expander pin %d\n", sel_b); goto exp_setup_selb_fail; } - ret = gpio_request(sel_c, "sel_c"); + ret = gpio_request(sel_c, ui_expander_names[DA850_SEL_C_OFFSET]); if (ret) { pr_warning("Cannot open UI expander pin %d\n", sel_c); goto exp_setup_selc_fail; @@ -396,13 +399,13 @@ static int da850_evm_ui_expander_teardown(struct i2c_client *client, platform_device_unregister(&user_ui_pb_gpio_key_device); /* deselect all functionalities */ - gpio_set_value(gpio + 5, 1); - gpio_set_value(gpio + 6, 1); - gpio_set_value(gpio + 7, 1); + gpio_set_value(gpio + DA850_SEL_C_OFFSET, 1); + gpio_set_value(gpio + DA850_SEL_B_OFFSET, 1); + gpio_set_value(gpio + DA850_SEL_A_OFFSET, 1); - gpio_free(gpio + 5); - gpio_free(gpio + 6); - gpio_free(gpio + 7); + gpio_free(gpio + DA850_SEL_C_OFFSET); + gpio_free(gpio + DA850_SEL_B_OFFSET); + gpio_free(gpio + DA850_SEL_A_OFFSET); return 0; }