projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-usb
[oweals/u-boot.git]
/
arch
/
powerpc
/
include
/
asm
/
arch-mpc83xx
/
gpio.h
diff --git
a/arch/powerpc/include/asm/arch-mpc83xx/gpio.h
b/arch/powerpc/include/asm/arch-mpc83xx/gpio.h
index 40ef2151b8eb1ac0facbb22b35374c671937eb78..385d651d20075096e9d992e7791dbebf74d08b0b 100644
(file)
--- a/
arch/powerpc/include/asm/arch-mpc83xx/gpio.h
+++ b/
arch/powerpc/include/asm/arch-mpc83xx/gpio.h
@@
-1,6
+1,4
@@
-/*
- * SPDX-License-Identifier: GPL-2.0+
- */
+/* SPDX-License-Identifier: GPL-2.0+ */
#ifndef _MPC83XX_GPIO_H_
#define _MPC83XX_GPIO_H_
#ifndef _MPC83XX_GPIO_H_
#define _MPC83XX_GPIO_H_
@@
-8,10
+6,10
@@
/*
* The MCP83xx's 1-2 GPIO controllers each with 32 bits.
*/
/*
* The MCP83xx's 1-2 GPIO controllers each with 32 bits.
*/
-#if defined(CONFIG_
MPC8313) || defined(CONFIG
_MPC8308) || \
- defined(CONFIG_MPC8315)
+#if defined(CONFIG_
ARCH_MPC8313) || defined(CONFIG_ARCH
_MPC8308) || \
+ defined(CONFIG_
ARCH_
MPC8315)
#define MPC83XX_GPIO_CTRLRS 1
#define MPC83XX_GPIO_CTRLRS 1
-#elif defined(CONFIG_
MPC834x) || defined(CONFIG_MPC837x
)
+#elif defined(CONFIG_
ARCH_MPC834X) || defined(CONFIG_ARCH_MPC837X
)
#define MPC83XX_GPIO_CTRLRS 2
#else
#define MPC83XX_GPIO_CTRLRS 0
#define MPC83XX_GPIO_CTRLRS 2
#else
#define MPC83XX_GPIO_CTRLRS 0
@@
-19,7
+17,15
@@
#define MAX_NUM_GPIOS (32 * MPC83XX_GPIO_CTRLRS)
#define MAX_NUM_GPIOS (32 * MPC83XX_GPIO_CTRLRS)
+struct mpc8xxx_gpio_plat {
+ ulong addr;
+ unsigned long size;
+ uint ngpios;
+};
+
+#ifndef DM_GPIO
void mpc83xx_gpio_init_f(void);
void mpc83xx_gpio_init_r(void);
void mpc83xx_gpio_init_f(void);
void mpc83xx_gpio_init_r(void);
+#endif /* DM_GPIO */
#endif /* MPC83XX_GPIO_H_ */
#endif /* MPC83XX_GPIO_H_ */