* [PATCH] powerpc/mpc85xx: Fix compiling error with DM_GPIO
@ 2020-04-29 5:33 Madalin Bucur
2020-06-08 7:53 ` Priyanka Jain
0 siblings, 1 reply; 2+ messages in thread
From: Madalin Bucur @ 2020-04-29 5:33 UTC (permalink / raw)
To: u-boot
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>
---
arch/powerpc/include/asm/mpc85xx_gpio.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/mpc85xx_gpio.h b/arch/powerpc/include/asm/mpc85xx_gpio.h
index 1b332f0..feebe15 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_ */
--
2.1.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] powerpc/mpc85xx: Fix compiling error with DM_GPIO
2020-04-29 5:33 [PATCH] powerpc/mpc85xx: Fix compiling error with DM_GPIO Madalin Bucur
@ 2020-06-08 7:53 ` Priyanka Jain
0 siblings, 0 replies; 2+ messages in thread
From: Priyanka Jain @ 2020-06-08 7:53 UTC (permalink / raw)
To: u-boot
>-----Original Message-----
>From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Madalin Bucur
>Sent: Wednesday, April 29, 2020 11:04 AM
>To: wd at denx.de; u-boot at lists.denx.de
>Cc: Madalin Bucur (OSS) <madalin.bucur@oss.nxp.com>
>Subject: [PATCH] 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>
>---
<snip>
Patch applied on mpc85xx. Awaiting upstream
Thanks
Priyanka
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-08 7:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-29 5:33 [PATCH] powerpc/mpc85xx: Fix compiling error with DM_GPIO Madalin Bucur
2020-06-08 7:53 ` Priyanka Jain
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.