summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Perez de Heredia <pedro.perez@digi.com>2012-02-10 14:11:30 +0100
committerPedro Perez de Heredia <pedro.perez@digi.com>2012-02-10 14:13:21 +0100
commitd1115587d7a251d0c191e01e1f47bf5650257fab (patch)
tree688997118fb6dffdafe04f961dd10890b34c19d7
parent287e13f76c0af7090f09d14681fbea3cb12ec2b8 (diff)
da9052_gpio: fix compilation warning
Signed-off-by: Pedro Perez de Heredia <pedro.perez@digi.com>
-rw-r--r--drivers/gpio/da9052-gpio.c2
-rw-r--r--include/linux/mfd/da9052/gpio.h18
2 files changed, 20 insertions, 0 deletions
diff --git a/drivers/gpio/da9052-gpio.c b/drivers/gpio/da9052-gpio.c
index c5ffcea0651f..548c9890e974 100644
--- a/drivers/gpio/da9052-gpio.c
+++ b/drivers/gpio/da9052-gpio.c
@@ -49,6 +49,7 @@ static u8 create_gpio_config_value(u8 gpio_function, u8 gpio_type, u8 gpio_mode)
static s32 write_default_gpio_values(struct da9052 *da9052)
{
+#ifdef DA9052_GPIO_INIT_DEFAULTS
struct da9052_ssc_msg msg;
u8 created_val = 0;
@@ -402,6 +403,7 @@ static s32 write_default_gpio_values(struct da9052 *da9052)
}
da9052_unlock(da9052);
#endif
+#endif /* DA9052_GPIO_INIT_DEFAULTS */
return 0;
}
diff --git a/include/linux/mfd/da9052/gpio.h b/include/linux/mfd/da9052/gpio.h
index 8a7c8eb20c19..0784da07657e 100644
--- a/include/linux/mfd/da9052/gpio.h
+++ b/include/linux/mfd/da9052/gpio.h
@@ -59,6 +59,24 @@
#define DA9052_GPIO_PIN_14 0
#define DA9052_GPIO_PIN_15 0
+#if (DA9052_GPIO_PIN_0 == DA9052_GPIO_CONFIG) || \
+ (DA9052_GPIO_PIN_1 == DA9052_GPIO_CONFIG) || \
+ (DA9052_GPIO_PIN_2 == DA9052_GPIO_CONFIG) || \
+ (DA9052_GPIO_PIN_3 == DA9052_GPIO_CONFIG) || \
+ (DA9052_GPIO_PIN_4 == DA9052_GPIO_CONFIG) || \
+ (DA9052_GPIO_PIN_5 == DA9052_GPIO_CONFIG) || \
+ (DA9052_GPIO_PIN_6 == DA9052_GPIO_CONFIG) || \
+ (DA9052_GPIO_PIN_7 == DA9052_GPIO_CONFIG) || \
+ (DA9052_GPIO_PIN_8 == DA9052_GPIO_CONFIG) || \
+ (DA9052_GPIO_PIN_9 == DA9052_GPIO_CONFIG) || \
+ (DA9052_GPIO_PIN_10 == DA9052_GPIO_CONFIG) || \
+ (DA9052_GPIO_PIN_11 == DA9052_GPIO_CONFIG) || \
+ (DA9052_GPIO_PIN_12 == DA9052_GPIO_CONFIG) || \
+ (DA9052_GPIO_PIN_13 == DA9052_GPIO_CONFIG) || \
+ (DA9052_GPIO_PIN_14 == DA9052_GPIO_CONFIG) || \
+ (DA9052_GPIO_PIN_15 == DA9052_GPIO_CONFIG)
+#define DA9052_GPIO_INIT_DEFAULTS
+#endif
enum ip_op_type {
ALTERNATE_FUNCTIONALITY = 0,