rockchip: Move pull-up/down enum into a common file

At present this enum is only available to rk3288. Move it so that other
rockchip SoCs can access it. It is needed for the SPL GPIO driver for
rk3999 in a later patch.

Also adjust the enum name to lower case.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

diff --git a/arch/arm/include/asm/arch-rockchip/gpio.h b/arch/arm/include/asm/arch-rockchip/gpio.h
index e204dcfd1dd9a567c1cef53903a24469bed7fd6b..0e3b57d0ef1936f0d29e7dd1c7c92f846e9a87fa 100644 (file)
--- a/arch/arm/include/asm/arch-rockchip/gpio.h
+++ b/arch/arm/include/asm/arch-rockchip/gpio.h
@@ -24,4 +24,11 @@ struct rockchip_gpio_regs {
 };
 check_member(rockchip_gpio_regs, ls_sync, 0x60);
 
+enum gpio_pu_pd {
+       GPIO_PULL_NORMAL = 0,
+       GPIO_PULL_UP,
+       GPIO_PULL_DOWN,
+       GPIO_PULL_REPEAT,
+};
+
 #endif

diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3288.h b/arch/arm/include/asm/arch-rockchip/grf_rk3288.h
index 77295446c636cf006b827c2218e676ebaec1827f..894d3a40b091ec0628d1370ba94d913ee4213e88 100644 (file)
--- a/arch/arm/include/asm/arch-rockchip/grf_rk3288.h
+++ b/arch/arm/include/asm/arch-rockchip/grf_rk3288.h
@@ -1149,13 +1149,6 @@ enum GPIO_BIAS {
 #define GPIO_BIAS_MASK 0x3
 #define GPIO_BIAS_SHIFT(x)  ((x) * 2)
 
-enum GPIO_PU_PD {
-       GPIO_PULL_NORMAL = 0,
-       GPIO_PULL_UP,
-       GPIO_PULL_DOWN,
-       GPIO_PULL_REPEAT,
-};
-
 #define GPIO_PULL_MASK 0x3
 #define GPIO_PULL_SHIFT(x)  ((x) * 2)