X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fgpio%2Faxp_gpio.c;h=bd2ac892d088d8fde21edf4cf2805cdf7eafe2c3;hb=d375ebbcb655ce8f9012cf93db347d3ced66eaac;hp=55f20a34b64c74bf2814b1fc153a610f7b2497eb;hpb=f9b7a04bc8aae9b1ffe35c8cc90e1a59f618a9ab;p=u-boot

diff --git a/drivers/gpio/axp_gpio.c b/drivers/gpio/axp_gpio.c
index 55f20a34b6..bd2ac892d0 100644
--- a/drivers/gpio/axp_gpio.c
+++ b/drivers/gpio/axp_gpio.c
@@ -10,21 +10,14 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/pmic_bus.h>
 #include <asm/gpio.h>
+#include <axp_pmic.h>
 #include <dm.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <errno.h>
 
-#ifdef CONFIG_AXP152_POWER
-#include <axp152.h>
-#elif defined CONFIG_AXP209_POWER
-#include <axp209.h>
-#elif defined CONFIG_AXP221_POWER
-#include <axp221.h>
-#else
-#error Unknown AXP model
-#endif
+static int axp_gpio_set_value(struct udevice *dev, unsigned pin, int val);
 
 static u8 axp_get_gpio_ctrl_reg(unsigned pin)
 {
@@ -41,7 +34,7 @@ static u8 axp_get_gpio_ctrl_reg(unsigned pin)
 	return 0;
 }
 
-int axp_gpio_direction_input(struct udevice *dev, unsigned pin)
+static int axp_gpio_direction_input(struct udevice *dev, unsigned pin)
 {
 	u8 reg;
 
@@ -59,7 +52,8 @@ int axp_gpio_direction_input(struct udevice *dev, unsigned pin)
 	}
 }
 
-int axp_gpio_direction_output(struct udevice *dev, unsigned pin, int val)
+static int axp_gpio_direction_output(struct udevice *dev, unsigned pin,
+				     int val)
 {
 	__maybe_unused int ret;
 	u8 reg;
@@ -84,7 +78,7 @@ int axp_gpio_direction_output(struct udevice *dev, unsigned pin, int val)
 	}
 }
 
-int axp_gpio_get_value(struct udevice *dev, unsigned pin)
+static int axp_gpio_get_value(struct udevice *dev, unsigned pin)
 {
 	u8 reg, val, mask;
 	int ret;
@@ -116,7 +110,7 @@ int axp_gpio_get_value(struct udevice *dev, unsigned pin)
 	return (val & mask) ? 1 : 0;
 }
 
-int axp_gpio_set_value(struct udevice *dev, unsigned pin, int val)
+static int axp_gpio_set_value(struct udevice *dev, unsigned pin, int val)
 {
 	u8 reg;
 
@@ -140,7 +134,6 @@ int axp_gpio_set_value(struct udevice *dev, unsigned pin, int val)
 	}
 }
 
-#ifdef CONFIG_DM_GPIO
 static const struct dm_gpio_ops gpio_axp_ops = {
 	.direction_input	= axp_gpio_direction_input,
 	.direction_output	= axp_gpio_direction_output,
@@ -165,23 +158,20 @@ U_BOOT_DRIVER(gpio_axp) = {
 	.ops	= &gpio_axp_ops,
 	.probe	= gpio_axp_probe,
 };
-#endif
 
 int axp_gpio_init(void)
 {
-	__maybe_unused struct udevice *dev;
+	struct udevice *dev;
 	int ret;
 
 	ret = pmic_bus_init();
 	if (ret)
 		return ret;
 
-#ifdef CONFIG_DM_GPIO
 	/* There is no devicetree support for the axp yet, so bind directly */
 	ret = device_bind_driver(dm_root(), "gpio_axp", "AXP-gpio", &dev);
 	if (ret)
 		return ret;
-#endif
 
 	return 0;
 }