From: Sanjeev Premi Date: Thu, 8 Sep 2011 14:48:39 +0000 (-0400) Subject: omap: gpio: generic changes after changing API X-Git-Tag: v2011.09-rc2~17 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3b690ebbbf21303a3bac1f62d967c36cd8655ce0;p=oweals%2Fu-boot.git 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 Signed-off-by: Sandeep Paulraj --- diff --git a/arch/arm/cpu/armv7/omap4/clocks.c b/arch/arm/cpu/armv7/omap4/clocks.c index eda960ca76..4f0e0cd881 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 460950dfd0..1768cdd359 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");