Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 328494
b: refs/heads/master
c: 58d26c1
h: refs/heads/master
v: v3
  • Loading branch information
Barry Song authored and Linus Walleij committed Sep 28, 2012
1 parent 42caa2a commit 8aa59f0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8dd9766f68f647692fa38f339fb70f9c8560e729
refs/heads/master: 58d26c1eab8e94f89f17593e11d88a3821be6c3c
5 changes: 0 additions & 5 deletions trunk/drivers/pinctrl/pinctrl-sirf.c
Original file line number Diff line number Diff line change
Expand Up @@ -1458,15 +1458,10 @@ static void sirfsoc_gpio_handle_irq(unsigned int irq, struct irq_desc *desc)
static inline void sirfsoc_gpio_set_input(struct sirfsoc_gpio_bank *bank, unsigned ctrl_offset)
{
u32 val;
unsigned long flags;

spin_lock_irqsave(&bank->lock, flags);

val = readl(bank->chip.regs + ctrl_offset);
val &= ~SIRFSOC_GPIO_CTL_OUT_EN_MASK;
writel(val, bank->chip.regs + ctrl_offset);

spin_unlock_irqrestore(&bank->lock, flags);
}

static int sirfsoc_gpio_request(struct gpio_chip *chip, unsigned offset)
Expand Down

0 comments on commit 8aa59f0

Please sign in to comment.