From patchwork Mon Nov 15 14:42:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gardiner X-Patchwork-Id: 325252 Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAFEiWVV007265 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 15 Nov 2010 14:44:54 GMT Received: from dlep35.itg.ti.com ([157.170.170.118]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id oAFEh1m8003382 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 15 Nov 2010 08:43:01 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id oAFEh1Dc010911; Mon, 15 Nov 2010 08:43:01 -0600 (CST) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id C9C9E80627; Mon, 15 Nov 2010 08:43:00 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id 6FE9880626 for ; Mon, 15 Nov 2010 08:42:59 -0600 (CST) Received: from white.ext.ti.com (localhost [127.0.0.1]) by dflp52.itg.ti.com (8.13.7/8.13.7) with ESMTP id oAFEgxNI025269 for ; Mon, 15 Nov 2010 08:42:59 -0600 (CST) Received: from psmtp.com (na3sys009amx237.postini.com [74.125.149.121]) by white.ext.ti.com (8.13.7/8.13.7) with SMTP id oAFEgw0M024624 for ; Mon, 15 Nov 2010 08:42:58 -0600 Received: from source ([74.125.149.71]) by na3sys009amx237.postini.com ([74.125.148.10]) with SMTP; Mon, 15 Nov 2010 09:42:58 EST Received: from source ([209.85.161.180]) by na3sys009aob103.postini.com ([74.125.148.12]) with SMTP ID DSNKTOFG8CEAHvOFgShoYaIBhLRpWJzQoDd2@postini.com; Mon, 15 Nov 2010 06:42:58 PST Received: by gxk8 with SMTP id 8so2920333gxk.39 for ; Mon, 15 Nov 2010 06:42:54 -0800 (PST) Received: by 10.100.134.8 with SMTP id h8mr4339615and.63.1289832174347; Mon, 15 Nov 2010 06:42:54 -0800 (PST) Received: from localhost.localdomain ([206.191.47.130]) by mx.google.com with ESMTPS id g6sm3853440anh.11.2010.11.15.06.42.53 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 15 Nov 2010 06:42:53 -0800 (PST) From: Ben Gardiner To: Kevin Hillman , davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH v2] da850-evm: UI expander gpio_set_value can sleep, use _cansleep Date: Mon, 15 Nov 2010 09:42:52 -0500 Message-Id: <1289832172-21947-1-git-send-email-bengardiner@nanometrics.ca> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <87k4kip7i2.fsf@deeprootsystems.com> X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:78.74926/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-settings: 2 (0.5000:0.0750) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [db-null] X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 15 Nov 2010 14:44:54 +0000 (UTC) diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index c6e11c6..f89b0b7 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -266,7 +266,7 @@ static inline void da850_evm_setup_emac_rmii(int rmii_sel) struct davinci_soc_info *soc_info = &davinci_soc_info; soc_info->emac_pdata->rmii_en = 1; - gpio_set_value(rmii_sel, 0); + gpio_set_value_cansleep(rmii_sel, 0); } #else static inline void da850_evm_setup_emac_rmii(int rmii_sel) { } @@ -325,9 +325,9 @@ static int da850_evm_ui_expander_teardown(struct i2c_client *client, unsigned gpio, unsigned ngpio, void *c) { /* deselect all functionalities */ - gpio_set_value(gpio + 5, 1); - gpio_set_value(gpio + 6, 1); - gpio_set_value(gpio + 7, 1); + gpio_set_value_cansleep(gpio + 5, 1); + gpio_set_value_cansleep(gpio + 6, 1); + gpio_set_value_cansleep(gpio + 7, 1); gpio_free(gpio + 5); gpio_free(gpio + 6);