projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mtd: nand: Sync with Linux v4.6
[oweals/u-boot.git]
/
drivers
/
gpio
/
mvgpio.h
diff --git
a/drivers/gpio/mvgpio.h
b/drivers/gpio/mvgpio.h
index a3f17a0c311fff547b418ee9f84e929258a33ef2..1de739568ab896f547aa912d83b4c4f0ddfad387 100644
(file)
--- a/
drivers/gpio/mvgpio.h
+++ b/
drivers/gpio/mvgpio.h
@@
-14,9
+14,8
@@
#include <common.h>
#include <common.h>
-#ifdef CONFIG_SHEEVA_88SV331xV5
/*
/*
- * GPIO Register map for
SHEEVA 88SV331xV5
+ * GPIO Register map for
Marvell SOCs
*/
struct gpio_reg {
u32 gplr; /* Pin Level Register - 0x0000 */
*/
struct gpio_reg {
u32 gplr; /* Pin Level Register - 0x0000 */
@@
-51,8
+50,5
@@
struct gpio_reg {
u32 pad12[2];
u32 apmask; /* Bitwise Mask of Edge Detect Register - 0x009C */
};
u32 pad12[2];
u32 apmask; /* Bitwise Mask of Edge Detect Register - 0x009C */
};
-#else
-#error "CPU core subversion not defined"
-#endif
#endif /* __MVGPIO_H__ */
#endif /* __MVGPIO_H__ */