Commit 84c3b631 authored by Sanjeev Premi's avatar Sanjeev Premi Committed by Albert ARIBAUD
Browse files

omap: gpio: Adapt board files to use generic API



This patch contains updates the sources in the board files
to use the generic API.
Signed-off-by: default avatarSanjeev Premi <premi@ti.com>
parent 3b690ebb
...@@ -20,26 +20,26 @@ ...@@ -20,26 +20,26 @@
*/ */
#include <common.h> #include <common.h>
#include <status_led.h> #include <status_led.h>
#include <asm/arch/gpio.h> #include <asm/gpio.h>
static unsigned int leds[] = { GREEN_LED_GPIO }; static unsigned int leds[] = { GREEN_LED_GPIO };
void __led_init(led_id_t mask, int state) void __led_init(led_id_t mask, int state)
{ {
if (omap_request_gpio(leds[mask]) != 0) { if (gpio_request(leds[mask], "") != 0) {
printf("%s: failed requesting GPIO%u\n", __func__, leds[mask]); printf("%s: failed requesting GPIO%u\n", __func__, leds[mask]);
return; return;
} }
omap_set_gpio_direction(leds[mask], 0); gpio_direction_output(leds[mask], 0);
} }
void __led_set(led_id_t mask, int state) void __led_set(led_id_t mask, int state)
{ {
omap_set_gpio_dataout(leds[mask], state == STATUS_LED_ON); gpio_set_value(leds[mask], state == STATUS_LED_ON);
} }
void __led_toggle(led_id_t mask) void __led_toggle(led_id_t mask)
{ {
omap_set_gpio_dataout(leds[mask], !omap_get_gpio_datain(leds[mask])); gpio_set_value(leds[mask], !gpio_get_value(leds[mask]));
} }
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include <asm/arch/mux.h> #include <asm/arch/mux.h>
#include <asm/arch/mem.h> #include <asm/arch/mem.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/gpio.h> #include <asm/gpio.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include "dig297.h" #include "dig297.h"
...@@ -177,13 +177,13 @@ static void setup_net_chip(void) ...@@ -177,13 +177,13 @@ static void setup_net_chip(void)
&ctrl_base->gpmc_nadv_ale); &ctrl_base->gpmc_nadv_ale);
/* Make GPIO 12 as output pin and send a magic pulse through it */ /* Make GPIO 12 as output pin and send a magic pulse through it */
if (!omap_request_gpio(NET_LAN9221_RESET_GPIO)) { if (!gpio_request(NET_LAN9221_RESET_GPIO, "")) {
omap_set_gpio_direction(NET_LAN9221_RESET_GPIO, 0); gpio_direction_output(NET_LAN9221_RESET_GPIO, 0);
omap_set_gpio_dataout(NET_LAN9221_RESET_GPIO, 1); gpio_set_value(NET_LAN9221_RESET_GPIO, 1);
udelay(1); udelay(1);
omap_set_gpio_dataout(NET_LAN9221_RESET_GPIO, 0); gpio_set_value(NET_LAN9221_RESET_GPIO, 0);
udelay(31000); /* Should be >= 30ms according to datasheet */ udelay(31000); /* Should be >= 30ms according to datasheet */
omap_set_gpio_dataout(NET_LAN9221_RESET_GPIO, 1); gpio_set_value(NET_LAN9221_RESET_GPIO, 1);
} }
} }
#endif /* CONFIG_CMD_NET */ #endif /* CONFIG_CMD_NET */
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <netdev.h> #include <netdev.h>
#include <twl4030.h> #include <twl4030.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/gpio.h> #include <asm/gpio.h>
#include <asm/arch/mem.h> #include <asm/arch/mem.h>
#include <asm/arch/mmc_host_def.h> #include <asm/arch/mmc_host_def.h>
#include <asm/arch/mux.h> #include <asm/arch/mux.h>
...@@ -81,13 +81,13 @@ static void setup_net_chip(void) ...@@ -81,13 +81,13 @@ static void setup_net_chip(void)
&ctrl_base->gpmc_nadv_ale); &ctrl_base->gpmc_nadv_ale);
/* Make GPIO 64 as output pin and send a magic pulse through it */ /* Make GPIO 64 as output pin and send a magic pulse through it */
if (!omap_request_gpio(64)) { if (!gpio_request(64, "")) {
omap_set_gpio_direction(64, 0); gpio_direction_output(64, 0);
omap_set_gpio_dataout(64, 1); gpio_set_value(64, 1);
udelay(1); udelay(1);
omap_set_gpio_dataout(64, 0); gpio_set_value(64, 0);
udelay(1); udelay(1);
omap_set_gpio_dataout(64, 1); gpio_set_value(64, 1);
} }
} }
#endif #endif
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <asm/arch/cpu.h> #include <asm/arch/cpu.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/mux.h> #include <asm/arch/mux.h>
#include <asm/arch/gpio.h> #include <asm/gpio.h>
#define DEBUG_BOARD_CONNECTED 1 #define DEBUG_BOARD_CONNECTED 1
#define DEBUG_BOARD_NOT_CONNECTED 0 #define DEBUG_BOARD_NOT_CONNECTED 0
...@@ -33,14 +33,14 @@ static void zoom2_debug_board_detect (void) ...@@ -33,14 +33,14 @@ static void zoom2_debug_board_detect (void)
{ {
int val = 0; int val = 0;
if (!omap_request_gpio(158)) { if (!gpio_request(158, "")) {
/* /*
* GPIO to query for debug board * GPIO to query for debug board
* 158 db board query * 158 db board query
*/ */
omap_set_gpio_direction(158, 1); gpio_direction_input(158);
val = omap_get_gpio_datain(158); val = gpio_get_value(158);
omap_free_gpio(158); gpio_free(158);
} }
if (!val) if (!val)
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <asm/arch/cpu.h> #include <asm/arch/cpu.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/gpio.h> #include <asm/gpio.h>
static unsigned int saved_state[2] = {STATUS_LED_OFF, STATUS_LED_OFF}; static unsigned int saved_state[2] = {STATUS_LED_OFF, STATUS_LED_OFF};
...@@ -39,9 +39,9 @@ static unsigned int saved_state[2] = {STATUS_LED_OFF, STATUS_LED_OFF}; ...@@ -39,9 +39,9 @@ static unsigned int saved_state[2] = {STATUS_LED_OFF, STATUS_LED_OFF};
void red_LED_off (void) void red_LED_off (void)
{ {
/* red */ /* red */
if (!omap_request_gpio(ZOOM2_LED_RED)) { if (!gpio_request(ZOOM2_LED_RED, "")) {
omap_set_gpio_direction(ZOOM2_LED_RED, 0); gpio_direction_output(ZOOM2_LED_RED, 0);
omap_set_gpio_dataout(ZOOM2_LED_RED, 0); gpio_set_value(ZOOM2_LED_RED, 0);
} }
saved_state[STATUS_LED_RED] = STATUS_LED_OFF; saved_state[STATUS_LED_RED] = STATUS_LED_OFF;
} }
...@@ -49,15 +49,15 @@ void red_LED_off (void) ...@@ -49,15 +49,15 @@ void red_LED_off (void)
void blue_LED_off (void) void blue_LED_off (void)
{ {
/* blue */ /* blue */
if (!omap_request_gpio(ZOOM2_LED_BLUE)) { if (!gpio_request(ZOOM2_LED_BLUE, "")) {
omap_set_gpio_direction(ZOOM2_LED_BLUE, 0); gpio_direction_output(ZOOM2_LED_BLUE, 0);
omap_set_gpio_dataout(ZOOM2_LED_BLUE, 0); gpio_set_value(ZOOM2_LED_BLUE, 0);
} }
/* blue 2 */ /* blue 2 */
if (!omap_request_gpio(ZOOM2_LED_BLUE2)) { if (!gpio_request(ZOOM2_LED_BLUE2, "")) {
omap_set_gpio_direction(ZOOM2_LED_BLUE2, 0); gpio_direction_output(ZOOM2_LED_BLUE2, 0);
omap_set_gpio_dataout(ZOOM2_LED_BLUE2, 0); gpio_set_value(ZOOM2_LED_BLUE2, 0);
} }
saved_state[STATUS_LED_BLUE] = STATUS_LED_OFF; saved_state[STATUS_LED_BLUE] = STATUS_LED_OFF;
} }
...@@ -67,9 +67,9 @@ void red_LED_on (void) ...@@ -67,9 +67,9 @@ void red_LED_on (void)
blue_LED_off (); blue_LED_off ();
/* red */ /* red */
if (!omap_request_gpio(ZOOM2_LED_RED)) { if (!gpio_request(ZOOM2_LED_RED, "")) {
omap_set_gpio_direction(ZOOM2_LED_RED, 0); gpio_direction_output(ZOOM2_LED_RED, 0);
omap_set_gpio_dataout(ZOOM2_LED_RED, 1); gpio_set_value(ZOOM2_LED_RED, 1);
} }
saved_state[STATUS_LED_RED] = STATUS_LED_ON; saved_state[STATUS_LED_RED] = STATUS_LED_ON;
} }
...@@ -79,15 +79,15 @@ void blue_LED_on (void) ...@@ -79,15 +79,15 @@ void blue_LED_on (void)
red_LED_off (); red_LED_off ();
/* blue */ /* blue */
if (!omap_request_gpio(ZOOM2_LED_BLUE)) { if (!gpio_request(ZOOM2_LED_BLUE, "")) {
omap_set_gpio_direction(ZOOM2_LED_BLUE, 0); gpio_direction_output(ZOOM2_LED_BLUE, 0);
omap_set_gpio_dataout(ZOOM2_LED_BLUE, 1); gpio_set_value(ZOOM2_LED_BLUE, 1);
} }
/* blue 2 */ /* blue 2 */
if (!omap_request_gpio(ZOOM2_LED_BLUE2)) { if (!gpio_request(ZOOM2_LED_BLUE2, "")) {
omap_set_gpio_direction(ZOOM2_LED_BLUE2, 0); gpio_direction_output(ZOOM2_LED_BLUE2, 0);
omap_set_gpio_dataout(ZOOM2_LED_BLUE2, 1); gpio_set_value(ZOOM2_LED_BLUE2, 1);
} }
saved_state[STATUS_LED_BLUE] = STATUS_LED_ON; saved_state[STATUS_LED_BLUE] = STATUS_LED_ON;
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <twl4030.h> #include <twl4030.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/mmc_host_def.h> #include <asm/arch/mmc_host_def.h>
#include <asm/arch/gpio.h> #include <asm/gpio.h>
#include <asm/arch/mem.h> #include <asm/arch/mem.h>
#include <asm/arch/mux.h> #include <asm/arch/mux.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
...@@ -90,12 +90,12 @@ void zoom2_identify(void) ...@@ -90,12 +90,12 @@ void zoom2_identify(void)
* and they are not commonly used. They are mentioned here * and they are not commonly used. They are mentioned here
* only for completeness. * only for completeness.
*/ */
if (!omap_request_gpio(94)) { if (!gpio_request(94, "")) {
unsigned int val; unsigned int val;
omap_set_gpio_direction(94, 1); gpio_direction_input(94);
val = omap_get_gpio_datain(94); val = gpio_get_value(94);
omap_free_gpio(94); gpio_free(94);
if (val) if (val)
revision = ZOOM2_REVISION_BETA; revision = ZOOM2_REVISION_BETA;
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <asm/arch/mux.h> #include <asm/arch/mux.h>
#include <asm/arch/mem.h> #include <asm/arch/mem.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/gpio.h> #include <asm/gpio.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include "overo.h" #include "overo.h"
...@@ -106,21 +106,21 @@ int get_board_revision(void) ...@@ -106,21 +106,21 @@ int get_board_revision(void)
{ {
int revision; int revision;
if (!omap_request_gpio(112) && if (!gpio_request(112, "") &&
!omap_request_gpio(113) && !gpio_request(113, "") &&
!omap_request_gpio(115)) { !gpio_request(115, "")) {
omap_set_gpio_direction(112, 1); gpio_direction_input(112);
omap_set_gpio_direction(113, 1); gpio_direction_input(113);
omap_set_gpio_direction(115, 1); gpio_direction_input(115);
revision = omap_get_gpio_datain(115) << 2 | revision = gpio_get_value(115) << 2 |
omap_get_gpio_datain(113) << 1 | gpio_get_value(113) << 1 |
omap_get_gpio_datain(112); gpio_get_value(112);
omap_free_gpio(112); gpio_free(112);
omap_free_gpio(113); gpio_free(113);
omap_free_gpio(115); gpio_free(115);
} else { } else {
printf("Error: unable to acquire board revision GPIOs\n"); printf("Error: unable to acquire board revision GPIOs\n");
revision = -1; revision = -1;
...@@ -139,21 +139,21 @@ int get_sdio2_config(void) ...@@ -139,21 +139,21 @@ int get_sdio2_config(void)
{ {
int sdio_direct; int sdio_direct;
if (!omap_request_gpio(130) && !omap_request_gpio(139)) { if (!gpio_request(130, "") && !gpio_request(139, "")) {
omap_set_gpio_direction(130, 0); gpio_direction_output(130, 0);
omap_set_gpio_direction(139, 1); gpio_direction_input(139);
sdio_direct = 1; sdio_direct = 1;
omap_set_gpio_dataout(130, 0); gpio_set_value(130, 0);
if (omap_get_gpio_datain(139) == 0) { if (gpio_get_value(139) == 0) {
omap_set_gpio_dataout(130, 1); gpio_set_value(130, 1);
if (omap_get_gpio_datain(139) == 1) if (gpio_get_value(139) == 1)
sdio_direct = 0; sdio_direct = 0;
} }
omap_free_gpio(130); gpio_free(130);
omap_free_gpio(139); gpio_free(139);
} else { } else {
printf("Error: unable to acquire sdio2 clk GPIOs\n"); printf("Error: unable to acquire sdio2 clk GPIOs\n");
sdio_direct = -1; sdio_direct = -1;
...@@ -322,13 +322,13 @@ static void setup_net_chip(void) ...@@ -322,13 +322,13 @@ static void setup_net_chip(void)
&ctrl_base->gpmc_nadv_ale); &ctrl_base->gpmc_nadv_ale);
/* Make GPIO 64 as output pin and send a magic pulse through it */ /* Make GPIO 64 as output pin and send a magic pulse through it */
if (!omap_request_gpio(64)) { if (!gpio_request(64, "")) {
omap_set_gpio_direction(64, 0); gpio_direction_output(64, 0);
omap_set_gpio_dataout(64, 1); gpio_set_value(64, 1);
udelay(1); udelay(1);
omap_set_gpio_dataout(64, 0); gpio_set_value(64, 0);
udelay(1); udelay(1);
omap_set_gpio_dataout(64, 1); gpio_set_value(64, 1);
} }
} }
#endif #endif
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <asm/arch/mmc_host_def.h> #include <asm/arch/mmc_host_def.h>
#include <asm/arch/mux.h> #include <asm/arch/mux.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/gpio.h> #include <asm/gpio.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#ifdef CONFIG_USB_EHCI #ifdef CONFIG_USB_EHCI
#include <usb.h> #include <usb.h>
...@@ -116,21 +116,21 @@ int get_board_revision(void) ...@@ -116,21 +116,21 @@ int get_board_revision(void)
{ {
int revision; int revision;
if (!omap_request_gpio(171) && if (!gpio_request(171, "") &&
!omap_request_gpio(172) && !gpio_request(172, "") &&
!omap_request_gpio(173)) { !gpio_request(173, "")) {
omap_set_gpio_direction(171, 1); gpio_direction_input(171);
omap_set_gpio_direction(172, 1); gpio_direction_input(172);
omap_set_gpio_direction(173, 1); gpio_direction_input(173);
revision = omap_get_gpio_datain(173) << 2 | revision = gpio_get_value(173) << 2 |
omap_get_gpio_datain(172) << 1 | gpio_get_value(172) << 1 |
omap_get_gpio_datain(171); gpio_get_value(171);
omap_free_gpio(171); gpio_free(171);
omap_free_gpio(172); gpio_free(172);
omap_free_gpio(173); gpio_free(173);
} else { } else {
printf("Error: unable to acquire board revision GPIOs\n"); printf("Error: unable to acquire board revision GPIOs\n");
revision = -1; revision = -1;
...@@ -387,7 +387,7 @@ int board_mmc_init(bd_t *bis) ...@@ -387,7 +387,7 @@ int board_mmc_init(bd_t *bis)
int ehci_hcd_stop(void) int ehci_hcd_stop(void)
{ {
pr_debug("Resetting OMAP3 EHCI\n"); pr_debug("Resetting OMAP3 EHCI\n");
omap_set_gpio_dataout(GPIO_PHY_RESET, 0); gpio_set_value(GPIO_PHY_RESET, 0);
writel(OMAP_UHH_SYSCONFIG_SOFTRESET, OMAP3_UHH_BASE + OMAP_UHH_SYSCONFIG); writel(OMAP_UHH_SYSCONFIG_SOFTRESET, OMAP3_UHH_BASE + OMAP_UHH_SYSCONFIG);
/* disable USB clocks */ /* disable USB clocks */
struct prcm *prcm_base = (struct prcm *)PRCM_BASE; struct prcm *prcm_base = (struct prcm *)PRCM_BASE;
...@@ -415,9 +415,9 @@ int ehci_hcd_init(void) ...@@ -415,9 +415,9 @@ int ehci_hcd_init(void)
pr_debug("Initializing OMAP3 ECHI\n"); pr_debug("Initializing OMAP3 ECHI\n");
/* Put the PHY in RESET */ /* Put the PHY in RESET */
omap_request_gpio(GPIO_PHY_RESET); gpio_request(GPIO_PHY_RESET, "");
omap_set_gpio_direction(GPIO_PHY_RESET, 0); gpio_direction_output(GPIO_PHY_RESET, 0);
omap_set_gpio_dataout(GPIO_PHY_RESET, 0); gpio_set_value(GPIO_PHY_RESET, 0);
/* Hold the PHY in RESET for enough time till DIR is high */ /* Hold the PHY in RESET for enough time till DIR is high */
/* Refer: ISSUE1 */ /* Refer: ISSUE1 */
...@@ -469,7 +469,7 @@ int ehci_hcd_init(void) ...@@ -469,7 +469,7 @@ int ehci_hcd_init(void)
* PHY is settled and ready * PHY is settled and ready
*/ */
udelay(10); udelay(10);
omap_set_gpio_dataout(GPIO_PHY_RESET, 1); gpio_set_value(GPIO_PHY_RESET, 1);
hccr = (struct ehci_hccr *)(OMAP3_EHCI_BASE); hccr = (struct ehci_hccr *)(OMAP3_EHCI_BASE);
hcor = (struct ehci_hcor *)(OMAP3_EHCI_BASE + 0x10); hcor = (struct ehci_hcor *)(OMAP3_EHCI_BASE + 0x10);
...@@ -508,10 +508,10 @@ int do_userbutton (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) ...@@ -508,10 +508,10 @@ int do_userbutton (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
gpio = 4; gpio = 4;
break; break;
} }
omap_request_gpio(gpio); gpio_request(gpio, "");
omap_set_gpio_direction(gpio, 1); gpio_direction_input(gpio);
printf("The user button is currently "); printf("The user button is currently ");
if(omap_get_gpio_datain(gpio)) if (gpio_get_value(gpio))
{ {
button = 1; button = 1;
printf("PRESSED.\n"); printf("PRESSED.\n");
...@@ -522,7 +522,7 @@ int do_userbutton (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) ...@@ -522,7 +522,7 @@ int do_userbutton (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
printf("NOT pressed.\n"); printf("NOT pressed.\n");
} }
omap_free_gpio(gpio); gpio_free(gpio);
return !button; return !button;
} }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <asm/arch/cpu.h> #include <asm/arch/cpu.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/gpio.h> #include <asm/gpio.h>
/* GPIO pins for the LEDs */ /* GPIO pins for the LEDs */
#define BEAGLE_LED_USR0 150 #define BEAGLE_LED_USR0 150
...@@ -57,10 +57,10 @@ void __led_toggle (led_id_t mask) ...@@ -57,10 +57,10 @@ void __led_toggle (led_id_t mask)
toggle_gpio = BEAGLE_LED_USR1; toggle_gpio = BEAGLE_LED_USR1;
#endif #endif
if (toggle_gpio) { if (toggle_gpio) {
if (!omap_request_gpio(toggle_gpio)) { if (!gpio_request(toggle_gpio, "")) {
omap_set_gpio_direction(toggle_gpio, 0); gpio_direction_output(toggle_gpio, 0);
state = omap_get_gpio_dataout(toggle_gpio); state = gpio_get_value(toggle_gpio);
omap_set_gpio_dataout(toggle_gpio, !state); gpio_set_value(toggle_gpio, !state);
} }
} }
} }
...@@ -69,17 +69,17 @@ void __led_set (led_id_t mask, int state) ...@@ -69,17 +69,17 @@ void __led_set (led_id_t mask, int state)
{ {
#ifdef STATUS_LED_BIT #ifdef STATUS_LED_BIT
if (STATUS_LED_BIT & mask) { if (STATUS_LED_BIT & mask) {
if (!omap_request_gpio(BEAGLE_LED_USR0)) { if (!gpio_request(BEAGLE_LED_USR0, "")) {
omap_set_gpio_direction(BEAGLE_LED_USR0, 0); gpio_direction_output(BEAGLE_LED_USR0, 0);
omap_set_gpio_dataout(BEAGLE_LED_USR0, state); gpio_set_value(BEAGLE_LED_USR0, state);
} }
} }
#endif #endif
#ifdef STATUS_LED_BIT1 #ifdef STATUS_LED_BIT1
if (STATUS_LED_BIT1 & mask) { if (STATUS_LED_BIT1 & mask) {
if (!omap_request_gpio(BEAGLE_LED_USR1)) { if (!gpio_request(BEAGLE_LED_USR1, "")) {
omap_set_gpio_direction(BEAGLE_LED_USR1, 0); gpio_direction_output(BEAGLE_LED_USR1, 0);
omap_set_gpio_dataout(BEAGLE_LED_USR1, state); gpio_set_value(BEAGLE_LED_USR1, state);
} }
} }
#endif #endif
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <asm/arch/mux.h> #include <asm/arch/mux.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/mmc_host_def.h> #include <asm/arch/mmc_host_def.h>
#include <asm/arch/gpio.h> #include <asm/gpio.h>
#include <i2c.h>