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 remote-tracking branch 'u-boot-samsung/master'
[oweals/u-boot.git]
/
arch
/
powerpc
/
include
/
asm
/
mpc85xx_gpio.h
diff --git
a/arch/powerpc/include/asm/mpc85xx_gpio.h
b/arch/powerpc/include/asm/mpc85xx_gpio.h
index 3d1188467c209a9ce3c98a7405b374e52cfb48e5..87bb4a092b86cabd7e6f1550bc4401514dde29f8 100644
(file)
--- a/
arch/powerpc/include/asm/mpc85xx_gpio.h
+++ b/
arch/powerpc/include/asm/mpc85xx_gpio.h
@@
-20,7
+20,7
@@
static inline void mpc85xx_gpio_set(unsigned int mask,
unsigned int dir, unsigned int val)
{
static inline void mpc85xx_gpio_set(unsigned int mask,
unsigned int dir, unsigned int val)
{
- ccsr_gpio_t *gpio = (void *)(CONFIG_SYS_MPC85xx_GPIO_ADDR
+ 0xc00
);
+ ccsr_gpio_t *gpio = (void *)(CONFIG_SYS_MPC85xx_GPIO_ADDR);
/* First mask off the unwanted parts of "dir" and "val" */
dir &= mask;
/* First mask off the unwanted parts of "dir" and "val" */
dir &= mask;
@@
-56,7
+56,7
@@
static inline void mpc85xx_gpio_set_high(unsigned int gpios)
static inline unsigned int mpc85xx_gpio_get(unsigned int mask)
{
static inline unsigned int mpc85xx_gpio_get(unsigned int mask)
{
- ccsr_gpio_t *gpio = (void *)(CONFIG_SYS_MPC85xx_GPIO_ADDR
+ 0xc00
);
+ ccsr_gpio_t *gpio = (void *)(CONFIG_SYS_MPC85xx_GPIO_ADDR);
/* Read the requested values */
return in_be32(&gpio->gpdat) & mask;
/* Read the requested values */
return in_be32(&gpio->gpdat) & mask;