Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 334363
b: refs/heads/master
c: 7bec207
h: refs/heads/master
i:
  334361: d3c68c3
  334359: b055086
v: v3
  • Loading branch information
Arnd Bergmann authored and Linus Walleij committed Oct 15, 2012
1 parent 6a02c87 commit e613ab2
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 49 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: 3ee73aa077d1468b293bb208814a8c240eefa9b7
refs/heads/master: 7bec207427c2efb79471a2e80906aabd132fd460
13 changes: 0 additions & 13 deletions trunk/arch/arm/mach-prima2/include/mach/gpio.h

This file was deleted.

35 changes: 0 additions & 35 deletions trunk/drivers/pinctrl/pinctrl-sirf.c
Original file line number Diff line number Diff line change
Expand Up @@ -1323,41 +1323,6 @@ static inline struct sirfsoc_gpio_bank *sirfsoc_gpio_to_bank(unsigned int gpio)
return &sgpio_bank[gpio / SIRFSOC_GPIO_BANK_SIZE];
}

void sirfsoc_gpio_set_pull(unsigned gpio, unsigned mode)
{
struct sirfsoc_gpio_bank *bank = sirfsoc_gpio_to_bank(gpio);
int idx = sirfsoc_gpio_to_offset(gpio);
u32 val, offset;
unsigned long flags;

offset = SIRFSOC_GPIO_CTRL(bank->id, idx);

spin_lock_irqsave(&sgpio_lock, flags);

val = readl(bank->chip.regs + offset);

switch (mode) {
case SIRFSOC_GPIO_PULL_NONE:
val &= ~SIRFSOC_GPIO_CTL_PULL_MASK;
break;
case SIRFSOC_GPIO_PULL_UP:
val |= SIRFSOC_GPIO_CTL_PULL_MASK;
val |= SIRFSOC_GPIO_CTL_PULL_HIGH;
break;
case SIRFSOC_GPIO_PULL_DOWN:
val |= SIRFSOC_GPIO_CTL_PULL_MASK;
val &= ~SIRFSOC_GPIO_CTL_PULL_HIGH;
break;
default:
break;
}

writel(val, bank->chip.regs + offset);

spin_unlock_irqrestore(&sgpio_lock, flags);
}
EXPORT_SYMBOL(sirfsoc_gpio_set_pull);

static inline struct sirfsoc_gpio_bank *sirfsoc_irqchip_to_bank(struct gpio_chip *chip)
{
return container_of(to_of_mm_gpio_chip(chip), struct sirfsoc_gpio_bank, chip);
Expand Down

0 comments on commit e613ab2

Please sign in to comment.