summaryrefslogtreecommitdiff
path: root/src/soc/qualcomm
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/qualcomm')
-rw-r--r--src/soc/qualcomm/ipq806x/gpio.c6
-rw-r--r--src/soc/qualcomm/ipq806x/include/soc/gpio.h4
-rw-r--r--src/soc/qualcomm/ipq806x/spi.c2
-rw-r--r--src/soc/qualcomm/ipq806x/uart.c2
4 files changed, 8 insertions, 6 deletions
diff --git a/src/soc/qualcomm/ipq806x/gpio.c b/src/soc/qualcomm/ipq806x/gpio.c
index 46dca4e3c3..a0a3df9495 100644
--- a/src/soc/qualcomm/ipq806x/gpio.c
+++ b/src/soc/qualcomm/ipq806x/gpio.c
@@ -29,7 +29,7 @@
*/
#include <arch/io.h>
-#include <soc/gpio.h>
+#include <gpio.h>
#include <soc/iomap.h>
/*******************************************************
@@ -116,7 +116,7 @@ unsigned *out - Value of GPIO output
Return : None
*******************************************************/
-int gpio_get_in_value(gpio_t gpio)
+int gpio_get(gpio_t gpio)
{
if (gpio_not_valid(gpio))
return -1;
@@ -126,7 +126,7 @@ int gpio_get_in_value(gpio_t gpio)
GPIO_IO_IN_MASK;
}
-void gpio_set_out_value(gpio_t gpio, int value)
+void gpio_set(gpio_t gpio, int value)
{
if (gpio_not_valid(gpio))
return;
diff --git a/src/soc/qualcomm/ipq806x/include/soc/gpio.h b/src/soc/qualcomm/ipq806x/include/soc/gpio.h
index 276022c0af..35429917ed 100644
--- a/src/soc/qualcomm/ipq806x/include/soc/gpio.h
+++ b/src/soc/qualcomm/ipq806x/include/soc/gpio.h
@@ -33,7 +33,7 @@
#ifndef __SOC_QUALCOMM_IPQ806X_GPIO_H_
#define __SOC_QUALCOMM_IPQ806X_GPIO_H_
-#include <gpiolib.h>
+#include <types.h>
#define GPIO_FUNC_ENABLE 1
#define GPIO_FUNC_DISABLE 0
@@ -90,6 +90,8 @@
#define GPIO_IO_IN_SHIFT 0
#define GPIO_IO_OUT_SHIFT 1
+typedef u32 gpio_t;
+
void gpio_tlmm_config_set(gpio_t gpio, unsigned int func,
unsigned int pull, unsigned int drvstr,
unsigned int enable);
diff --git a/src/soc/qualcomm/ipq806x/spi.c b/src/soc/qualcomm/ipq806x/spi.c
index 4cf64ebadc..0f72cac6be 100644
--- a/src/soc/qualcomm/ipq806x/spi.c
+++ b/src/soc/qualcomm/ipq806x/spi.c
@@ -4,7 +4,7 @@
#include <arch/io.h>
#include <delay.h>
-#include <soc/gpio.h>
+#include <gpio.h>
#include <soc/iomap.h>
#include <soc/spi.h>
#include <stdlib.h>
diff --git a/src/soc/qualcomm/ipq806x/uart.c b/src/soc/qualcomm/ipq806x/uart.c
index 3e8e187fde..0a19e9a4f2 100644
--- a/src/soc/qualcomm/ipq806x/uart.c
+++ b/src/soc/qualcomm/ipq806x/uart.c
@@ -36,8 +36,8 @@
#include <console/console.h>
#include <console/uart.h>
#include <delay.h>
+#include <gpio.h>
#include <soc/clock.h>
-#include <soc/gpio.h>
#include <soc/gsbi.h>
#include <soc/ipq_uart.h>
#include <stdint.h>