summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadalin Bucur <madalin.bucur@oss.nxp.com>2020-04-29 08:33:33 +0300
committerPriyanka Jain <priyanka.jain@nxp.com>2020-06-03 12:14:27 +0530
commit9e998d5dc18ed75175cf72b5eeaaf432ae0da0a4 (patch)
tree8cda77873d64d17cc160f6188ae67882f65ce226
parent94472223c69f1d5dacff7ddeace67c05c62146e1 (diff)
powerpc/mpc85xx: Fix compiling error with DM_GPIO
P4080DS compilation fails with DM_GPIO enabled: drivers/gpio/gpio-uclass.c:355:5: error: redefinition of 'gpio_request' int gpio_request(unsigned gpio, const char *label) ^~~~~~~~~~~~ In file included from ./arch/powerpc/include/asm/arch/gpio.h:17:0, from ./arch/powerpc/include/asm/gpio.h:1, from drivers/gpio/gpio-uclass.c:16: ./arch/powerpc/include/asm/mpc85xx_gpio.h:68:19: note: previous definition of 'gpio_request' was here static inline int gpio_request(unsigned gpio, const char *label) ^~~~~~~~~~~~ Signed-off-by: Madalin Bucur <madalin.bucur@oss.nxp.com> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
-rw-r--r--arch/powerpc/include/asm/mpc85xx_gpio.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/mpc85xx_gpio.h b/arch/powerpc/include/asm/mpc85xx_gpio.h
index 1b332f0b19..feebe15cac 100644
--- a/arch/powerpc/include/asm/mpc85xx_gpio.h
+++ b/arch/powerpc/include/asm/mpc85xx_gpio.h
@@ -6,6 +6,7 @@
#ifndef POWERPC_ASM_MPC85XX_GPIO_H_
#define POWERPC_ASM_MPC85XX_GPIO_H_
+#ifndef CONFIG_DM_GPIO
# include <asm/immap_85xx.h>
/*
@@ -110,5 +111,5 @@ static inline int gpio_is_valid(int gpio)
{
return (gpio >= 0) && (gpio < 32);
}
-
+#endif /* not CONFIG_DM_GPIO */
#endif /* not POWERPC_ASM_MPC85XX_GPIO_H_ */