summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanjeev Premi <premi@ti.com>2011-09-08 10:48:39 -0400
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-09-13 08:25:15 +0200
commit3b690ebbbf21303a3bac1f62d967c36cd8655ce0 (patch)
tree838e69822e7349ed723c168b0f1e7a328e08ac75
parent81bdc155c72ef9e093b388b90c58d8134d870976 (diff)
downloadu-boot-imx-3b690ebbbf21303a3bac1f62d967c36cd8655ce0.zip
u-boot-imx-3b690ebbbf21303a3bac1f62d967c36cd8655ce0.tar.gz
u-boot-imx-3b690ebbbf21303a3bac1f62d967c36cd8655ce0.tar.bz2
omap: gpio: generic changes after changing API
This patch contains the generic changes required after change to generic API in the previous patch. Signed-off-by: Sanjeev Premi <premi@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
-rw-r--r--arch/arm/cpu/armv7/omap4/clocks.c5
-rw-r--r--doc/README.omap320
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 <common.h>
#include <asm/omap_common.h>
+#include <asm/gpio.h>
#include <asm/arch/clocks.h>
#include <asm/arch/sys_proto.h>
#include <asm/utils.h>
@@ -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");