aboutsummaryrefslogtreecommitdiff
path: root/src/soc/rockchip
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/rockchip')
-rw-r--r--src/soc/rockchip/rk3288/gpio.c6
-rw-r--r--src/soc/rockchip/rk3288/include/soc/gpio.h8
-rw-r--r--src/soc/rockchip/rk3288/soc.c2
3 files changed, 5 insertions, 11 deletions
diff --git a/src/soc/rockchip/rk3288/gpio.c b/src/soc/rockchip/rk3288/gpio.c
index c3784ec4a8..b84d6a0821 100644
--- a/src/soc/rockchip/rk3288/gpio.c
+++ b/src/soc/rockchip/rk3288/gpio.c
@@ -19,10 +19,10 @@
#include <arch/io.h>
#include <console/console.h>
-#include <soc/soc.h>
-#include <soc/gpio.h>
+#include <gpio.h>
#include <soc/grf.h>
#include <soc/pmu.h>
+#include <soc/soc.h>
#include <stdlib.h>
struct rk3288_gpio_regs *gpio_port[] = {
@@ -72,7 +72,7 @@ void gpio_input_pullup(gpio_t gpio)
__gpio_input(gpio, PULLUP);
}
-int gpio_get_in_value(gpio_t gpio)
+int gpio_get(gpio_t gpio)
{
return (readl(&gpio_port[gpio.port]->ext_porta) >> gpio.num) & 0x1;
}
diff --git a/src/soc/rockchip/rk3288/include/soc/gpio.h b/src/soc/rockchip/rk3288/include/soc/gpio.h
index c459de9321..6a0055ecb6 100644
--- a/src/soc/rockchip/rk3288/include/soc/gpio.h
+++ b/src/soc/rockchip/rk3288/include/soc/gpio.h
@@ -67,10 +67,4 @@ enum {
GPIO_D,
};
-void gpio_input(gpio_t gpio);
-void gpio_input_pulldown(gpio_t gpio);
-void gpio_input_pullup(gpio_t gpio);
-void gpio_output(gpio_t gpio, int value);
-int gpio_get_in_value(gpio_t gpio);
-
-#endif /* _ASM_ROCKCHIP_GPIO_H_ */
+#endif /* __SOC_ROCKCHIP_RK3288_GPIO_H__ */
diff --git a/src/soc/rockchip/rk3288/soc.c b/src/soc/rockchip/rk3288/soc.c
index e379644680..3048547ff9 100644
--- a/src/soc/rockchip/rk3288/soc.c
+++ b/src/soc/rockchip/rk3288/soc.c
@@ -22,7 +22,7 @@
#include <console/console.h>
#include <delay.h>
#include <device/device.h>
-#include <soc/gpio.h>
+#include <gpio.h>
#include <soc/soc.h>
#include <stddef.h>
#include <stdlib.h>