Commit 3d4af5ca authored by Atul Dahiya's avatar Atul Dahiya Committed by Kukjin Kim

ARM: S5P64X0: Fix GPIO rbank support

The patch removes s3c_gpio_lock/unlock to avoid acquiring the lock
recursively as lock is already acquired by calling function.
Signed-off-by: default avatarAtul Dahiya <atul.dahiya@samsung.com>
Signed-off-by: default avatarSangbeom Kim <sbkim73@samsung.com>
[kgene.kim@samsung.com: removed useless variable due to this]
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent d7297612
...@@ -132,7 +132,6 @@ int s5p64x0_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip, ...@@ -132,7 +132,6 @@ int s5p64x0_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip,
{ {
void __iomem *reg = chip->base; void __iomem *reg = chip->base;
unsigned int shift; unsigned int shift;
unsigned long flags;
u32 con; u32 con;
switch (off) { switch (off) {
...@@ -158,15 +157,11 @@ int s5p64x0_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip, ...@@ -158,15 +157,11 @@ int s5p64x0_gpio_setcfg_4bit_rbank(struct s3c_gpio_chip *chip,
cfg <<= shift; cfg <<= shift;
} }
s3c_gpio_lock(chip, flags);
con = __raw_readl(reg); con = __raw_readl(reg);
con &= ~(0xf << shift); con &= ~(0xf << shift);
con |= cfg; con |= cfg;
__raw_writel(con, reg); __raw_writel(con, reg);
s3c_gpio_unlock(chip, flags);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment