diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-06 08:49:58 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-06 08:49:58 +0100 |
| commit | a891601ce51edbafa1a2750c96a618e4fcbca1c2 (patch) | |
| tree | 9a5d44eb1fcca45dfd30557318f786b66392a8f3 /drivers/gpio/mxs_gpio.c | |
| parent | 2931fa4db349c97f882ffda42e901208654b5ca9 (diff) | |
| parent | 4611d5bab26f93471b84f6f33967cef69b3f723a (diff) | |
| download | olio-uboot-2014.01-a891601ce51edbafa1a2750c96a618e4fcbca1c2.tar.xz olio-uboot-2014.01-a891601ce51edbafa1a2750c96a618e4fcbca1c2.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
include/micrel.h
The conflict above was trivial, caused by four lines being
added in both branches with different whitepace.
Diffstat (limited to 'drivers/gpio/mxs_gpio.c')
| -rw-r--r-- | drivers/gpio/mxs_gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c index d9a7a3aaf..da0199b16 100644 --- a/drivers/gpio/mxs_gpio.c +++ b/drivers/gpio/mxs_gpio.c @@ -95,10 +95,10 @@ int gpio_direction_output(unsigned gpio, int value) struct mxs_register_32 *reg = (struct mxs_register_32 *)(MXS_PINCTRL_BASE + offset); - writel(1 << PAD_PIN(gpio), ®->reg_set); - gpio_set_value(gpio, value); + writel(1 << PAD_PIN(gpio), ®->reg_set); + return 0; } |