]> git.baikalelectronics.ru Git - uboot.git/commit
powerpc/mpc85xx: Fix compiling error with DM_GPIO
authorMadalin Bucur <madalin.bucur@oss.nxp.com>
Wed, 29 Apr 2020 05:33:33 +0000 (08:33 +0300)
committerPriyanka Jain <priyanka.jain@nxp.com>
Wed, 3 Jun 2020 06:44:27 +0000 (12:14 +0530)
commitf8f196ac120260c310861112dbec5e21a9837972
tree8cda77873d64d17cc160f6188ae67882f65ce226
parent4698a0bc82c456778717d3aeb954e899c0c759f1
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>
arch/powerpc/include/asm/mpc85xx_gpio.h