diff options
| -rw-r--r-- | drivers/gpio/gpio-moxart.c | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/drivers/gpio/gpio-moxart.c b/drivers/gpio/gpio-moxart.c index 2af990022cc9..a19a14d590f9 100644 --- a/drivers/gpio/gpio-moxart.c +++ b/drivers/gpio/gpio-moxart.c | |||
| @@ -48,25 +48,6 @@ static void moxart_gpio_free(struct gpio_chip *chip, unsigned offset) | |||
| 48 | pinctrl_free_gpio(offset); | 48 | pinctrl_free_gpio(offset); |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | static int moxart_gpio_direction_input(struct gpio_chip *chip, unsigned offset) | ||
| 52 | { | ||
| 53 | struct moxart_gpio_chip *gc = to_moxart_gpio(chip); | ||
| 54 | void __iomem *ioaddr = gc->base + GPIO_PIN_DIRECTION; | ||
| 55 | |||
| 56 | writel(readl(ioaddr) & ~BIT(offset), ioaddr); | ||
| 57 | return 0; | ||
| 58 | } | ||
| 59 | |||
| 60 | static int moxart_gpio_direction_output(struct gpio_chip *chip, | ||
| 61 | unsigned offset, int value) | ||
| 62 | { | ||
| 63 | struct moxart_gpio_chip *gc = to_moxart_gpio(chip); | ||
| 64 | void __iomem *ioaddr = gc->base + GPIO_PIN_DIRECTION; | ||
| 65 | |||
| 66 | writel(readl(ioaddr) | BIT(offset), ioaddr); | ||
| 67 | return 0; | ||
| 68 | } | ||
| 69 | |||
| 70 | static void moxart_gpio_set(struct gpio_chip *chip, unsigned offset, int value) | 51 | static void moxart_gpio_set(struct gpio_chip *chip, unsigned offset, int value) |
| 71 | { | 52 | { |
| 72 | struct moxart_gpio_chip *gc = to_moxart_gpio(chip); | 53 | struct moxart_gpio_chip *gc = to_moxart_gpio(chip); |
| @@ -78,7 +59,6 @@ static void moxart_gpio_set(struct gpio_chip *chip, unsigned offset, int value) | |||
| 78 | else | 59 | else |
| 79 | reg = reg & ~BIT(offset); | 60 | reg = reg & ~BIT(offset); |
| 80 | 61 | ||
| 81 | |||
| 82 | writel(reg, ioaddr); | 62 | writel(reg, ioaddr); |
| 83 | } | 63 | } |
| 84 | 64 | ||
| @@ -93,6 +73,25 @@ static int moxart_gpio_get(struct gpio_chip *chip, unsigned offset) | |||
| 93 | return !!(readl(gc->base + GPIO_DATA_IN) & BIT(offset)); | 73 | return !!(readl(gc->base + GPIO_DATA_IN) & BIT(offset)); |
| 94 | } | 74 | } |
| 95 | 75 | ||
| 76 | static int moxart_gpio_direction_input(struct gpio_chip *chip, unsigned offset) | ||
| 77 | { | ||
| 78 | struct moxart_gpio_chip *gc = to_moxart_gpio(chip); | ||
| 79 | void __iomem *ioaddr = gc->base + GPIO_PIN_DIRECTION; | ||
| 80 | |||
| 81 | writel(readl(ioaddr) & ~BIT(offset), ioaddr); | ||
| 82 | return 0; | ||
| 83 | } | ||
| 84 | |||
| 85 | static int moxart_gpio_direction_output(struct gpio_chip *chip, | ||
| 86 | unsigned offset, int value) | ||
| 87 | { | ||
| 88 | struct moxart_gpio_chip *gc = to_moxart_gpio(chip); | ||
| 89 | void __iomem *ioaddr = gc->base + GPIO_PIN_DIRECTION; | ||
| 90 | |||
| 91 | writel(readl(ioaddr) | BIT(offset), ioaddr); | ||
| 92 | return 0; | ||
| 93 | } | ||
| 94 | |||
| 96 | static struct gpio_chip moxart_template_chip = { | 95 | static struct gpio_chip moxart_template_chip = { |
| 97 | .label = "moxart-gpio", | 96 | .label = "moxart-gpio", |
| 98 | .request = moxart_gpio_request, | 97 | .request = moxart_gpio_request, |
