summaryrefslogtreecommitdiff
path: root/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c
diff options
context:
space:
mode:
Diffstat (limited to 'cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c')
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c
index eb078856b6..0fa24e28d3 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-device-gpio.c
@@ -268,6 +268,7 @@ spc300_gpio_one_setup (int num)
chip->direction_input = NULL;
chip->direction_output = NULL;
+#ifdef CONFIG_CHIP_FEATURE_SPCPIO
if (num < MIN_INTERNAL_GPIOS)
gpio_config = spc300_gpio_cfg(spidcom_nvram.io.spcpio.gpio_0_7_cfg, num);
else
@@ -275,7 +276,9 @@ spc300_gpio_one_setup (int num)
/* Check if gpio_config is ARM gpios */
if (gpio_config == 0)
+#endif /* CONFIG_CHIP_FEATURE_SPCPIO */
{
+#if defined(CONFIG_CHIP_FEATURE_SPCPIO) || defined(CONFIG_CHIP_FEATURE_IOMUX)
/* check allowed direction */
switch (spc300_gpio_direction (spidcom_nvram.gpio_allow_dir, num))
{
@@ -295,6 +298,7 @@ spc300_gpio_one_setup (int num)
chip->direction_input = &spc300_gpio_direction_input;
break;
}
+#endif /* CONFIG_CHIP_FEATURE_SPCPIO || CONFIG_CHIP_FEATURE_IOMUX */
/* Setup GPIO number */
gpiochip_add(chip);
}