diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-07-10 20:40:47 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-07-10 20:40:47 +0200 |
commit | 630aacb0859c6e26b2b0311d8e245da5e5b8ac67 (patch) | |
tree | e9f6f6c28ae4a655f4519ca0db7bc882f8ee9abc /drivers/gpio/s5p_gpio.c | |
parent | 87bd05d78f0f5765f3d3e1517c76794c82dab7cc (diff) | |
parent | 1ae76d438b602fe8be1f0ef8b8ce47c89d371047 (diff) | |
download | u-boot-imx-630aacb0859c6e26b2b0311d8e245da5e5b8ac67.zip u-boot-imx-630aacb0859c6e26b2b0311d8e245da5e5b8ac67.tar.gz u-boot-imx-630aacb0859c6e26b2b0311d8e245da5e5b8ac67.tar.bz2 |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/gpio/s5p_gpio.c')
-rw-r--r-- | drivers/gpio/s5p_gpio.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c index 656bf4a..4efb768 100644 --- a/drivers/gpio/s5p_gpio.c +++ b/drivers/gpio/s5p_gpio.c @@ -48,15 +48,8 @@ void s5p_gpio_cfg_pin(struct s5p_gpio_bank *bank, int gpio, int cfg) void s5p_gpio_direction_output(struct s5p_gpio_bank *bank, int gpio, int en) { - unsigned int value; - s5p_gpio_cfg_pin(bank, gpio, GPIO_OUTPUT); - - value = readl(&bank->dat); - value &= ~DAT_MASK(gpio); - if (en) - value |= DAT_SET(gpio); - writel(value, &bank->dat); + s5p_gpio_set_value(bank, gpio, en); } void s5p_gpio_direction_input(struct s5p_gpio_bank *bank, int gpio) |