From patchwork Mon Sep 5 20:28:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sanjeev Premi X-Patchwork-Id: 113439 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id DF1BAB6F76 for ; Tue, 6 Sep 2011 06:29:39 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AED5F28080; Mon, 5 Sep 2011 22:29:29 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VYnbiLAoeJYa; Mon, 5 Sep 2011 22:29:29 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CD367280A2; Mon, 5 Sep 2011 22:29:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B312528089 for ; Mon, 5 Sep 2011 22:29:15 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3w568UsCRa8e for ; Mon, 5 Sep 2011 22:29:14 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by theia.denx.de (Postfix) with ESMTPS id 215582807D for ; Mon, 5 Sep 2011 22:29:10 +0200 (CEST) Received: from dbdp20.itg.ti.com ([172.24.170.38]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id p85KT52T005127 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 5 Sep 2011 15:29:07 -0500 Received: from dbde71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id p85KT5Mb009906 for ; Tue, 6 Sep 2011 01:59:05 +0530 (IST) Received: from dbdp31.itg.ti.com (172.24.170.98) by DBDE71.ent.ti.com (172.24.170.149) with Microsoft SMTP Server id 8.3.106.1; Tue, 6 Sep 2011 01:59:05 +0530 Received: from localhost.localdomain (dbdp20.itg.ti.com [172.24.170.38]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id p85KSvd8018686; Tue, 6 Sep 2011 01:59:04 +0530 (IST) From: Sanjeev Premi To: Date: Tue, 6 Sep 2011 01:58:47 +0530 Message-ID: <1315254528-8644-3-git-send-email-premi@ti.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1315254528-8644-1-git-send-email-premi@ti.com> References: <1315254528-8644-1-git-send-email-premi@ti.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 2/3] omap: gpio: generic changes after changing API X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This patch contains the generic changes required after change to generic API in the previous patch. Signed-off-by: Sanjeev Premi --- This patch could have been merged with previous one, but has been kept separate to illustrate (and review) the changes to generic code. arch/arm/cpu/armv7/omap4/clocks.c | 5 +++-- doc/README.omap3 | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/arch/arm/cpu/armv7/omap4/clocks.c b/arch/arm/cpu/armv7/omap4/clocks.c index eda960c..4f0e0cd 100644 --- a/arch/arm/cpu/armv7/omap4/clocks.c +++ b/arch/arm/cpu/armv7/omap4/clocks.c @@ -31,6 +31,7 @@ */ #include #include +#include #include #include #include @@ -481,8 +482,8 @@ static void do_scale_tps62361(u32 reg, u32 volt_mv) * VSEL1 is grounded on board. So the following selects * VSEL1 = 0 and VSEL0 = 1 */ - omap_set_gpio_direction(TPS62361_VSEL0_GPIO, 0); - omap_set_gpio_dataout(TPS62361_VSEL0_GPIO, 1); + gpio_direction_output(TPS62361_VSEL0_GPIO, 0); + gpio_set_value(TPS62361_VSEL0_GPIO, 1); temp = TPS62361_I2C_SLAVE_ADDR | (reg << PRM_VC_VAL_BYPASS_REGADDR_SHIFT) | diff --git a/doc/README.omap3 b/doc/README.omap3 index 460950d..1768cdd 100644 --- a/doc/README.omap3 +++ b/doc/README.omap3 @@ -98,24 +98,24 @@ gpio To set a bit : - if (!omap_request_gpio(N)) { - omap_set_gpio_direction(N, 0); - omap_set_gpio_dataout(N, 1); + if (!gpio_request(N, "")) { + gpio_direction_output(N, 0); + gpio_set_value(N, 1); } To clear a bit : - if (!omap_request_gpio(N)) { - omap_set_gpio_direction(N, 0); - omap_set_gpio_dataout(N, 0); + if (!gpio_request(N, "")) { + gpio_direction_output(N, 0); + gpio_set_value(N, 0); } To read a bit : - if (!omap_request_gpio(N)) { - omap_set_gpio_direction(N, 1); - val = omap_get_gpio_datain(N); - omap_free_gpio(N); + if (!gpio_request(N, "")) { + gpio_direction_input(N); + val = gpio_get_value(N); + gpio_free(N); } if (val) printf("GPIO N is set\n");