diff options
Diffstat (limited to 'arch/arm/plat-samsung/gpio.c')
| -rw-r--r-- | arch/arm/plat-samsung/gpio.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/plat-samsung/gpio.c b/arch/arm/plat-samsung/gpio.c index 28d2ab8a08db..b83a83351cea 100644 --- a/arch/arm/plat-samsung/gpio.c +++ b/arch/arm/plat-samsung/gpio.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 17 | #include <linux/gpio.h> | 17 | #include <linux/gpio.h> |
| 18 | #include <linux/spinlock.h> | ||
| 18 | 19 | ||
| 19 | #include <plat/gpio-core.h> | 20 | #include <plat/gpio-core.h> |
| 20 | 21 | ||
| @@ -52,14 +53,14 @@ static int s3c_gpiolib_input(struct gpio_chip *chip, unsigned offset) | |||
| 52 | unsigned long flags; | 53 | unsigned long flags; |
| 53 | unsigned long con; | 54 | unsigned long con; |
| 54 | 55 | ||
| 55 | local_irq_save(flags); | 56 | s3c_gpio_lock(ourchip, flags); |
| 56 | 57 | ||
| 57 | con = __raw_readl(base + 0x00); | 58 | con = __raw_readl(base + 0x00); |
| 58 | con &= ~(3 << (offset * 2)); | 59 | con &= ~(3 << (offset * 2)); |
| 59 | 60 | ||
| 60 | __raw_writel(con, base + 0x00); | 61 | __raw_writel(con, base + 0x00); |
| 61 | 62 | ||
| 62 | local_irq_restore(flags); | 63 | s3c_gpio_unlock(ourchip, flags); |
| 63 | return 0; | 64 | return 0; |
| 64 | } | 65 | } |
| 65 | 66 | ||
| @@ -72,7 +73,7 @@ static int s3c_gpiolib_output(struct gpio_chip *chip, | |||
| 72 | unsigned long dat; | 73 | unsigned long dat; |
| 73 | unsigned long con; | 74 | unsigned long con; |
| 74 | 75 | ||
| 75 | local_irq_save(flags); | 76 | s3c_gpio_lock(ourchip, flags); |
| 76 | 77 | ||
| 77 | dat = __raw_readl(base + 0x04); | 78 | dat = __raw_readl(base + 0x04); |
| 78 | dat &= ~(1 << offset); | 79 | dat &= ~(1 << offset); |
| @@ -87,7 +88,7 @@ static int s3c_gpiolib_output(struct gpio_chip *chip, | |||
| 87 | __raw_writel(con, base + 0x00); | 88 | __raw_writel(con, base + 0x00); |
| 88 | __raw_writel(dat, base + 0x04); | 89 | __raw_writel(dat, base + 0x04); |
| 89 | 90 | ||
| 90 | local_irq_restore(flags); | 91 | s3c_gpio_unlock(ourchip, flags); |
| 91 | return 0; | 92 | return 0; |
| 92 | } | 93 | } |
| 93 | 94 | ||
| @@ -99,7 +100,7 @@ static void s3c_gpiolib_set(struct gpio_chip *chip, | |||
| 99 | unsigned long flags; | 100 | unsigned long flags; |
| 100 | unsigned long dat; | 101 | unsigned long dat; |
| 101 | 102 | ||
| 102 | local_irq_save(flags); | 103 | s3c_gpio_lock(ourchip, flags); |
| 103 | 104 | ||
| 104 | dat = __raw_readl(base + 0x04); | 105 | dat = __raw_readl(base + 0x04); |
| 105 | dat &= ~(1 << offset); | 106 | dat &= ~(1 << offset); |
| @@ -107,7 +108,7 @@ static void s3c_gpiolib_set(struct gpio_chip *chip, | |||
| 107 | dat |= 1 << offset; | 108 | dat |= 1 << offset; |
| 108 | __raw_writel(dat, base + 0x04); | 109 | __raw_writel(dat, base + 0x04); |
| 109 | 110 | ||
| 110 | local_irq_restore(flags); | 111 | s3c_gpio_unlock(ourchip, flags); |
| 111 | } | 112 | } |
| 112 | 113 | ||
| 113 | static int s3c_gpiolib_get(struct gpio_chip *chip, unsigned offset) | 114 | static int s3c_gpiolib_get(struct gpio_chip *chip, unsigned offset) |
| @@ -131,6 +132,8 @@ __init void s3c_gpiolib_add(struct s3c_gpio_chip *chip) | |||
| 131 | BUG_ON(!gc->label); | 132 | BUG_ON(!gc->label); |
| 132 | BUG_ON(!gc->ngpio); | 133 | BUG_ON(!gc->ngpio); |
| 133 | 134 | ||
| 135 | spin_lock_init(&chip->lock); | ||
| 136 | |||
| 134 | if (!gc->direction_input) | 137 | if (!gc->direction_input) |
| 135 | gc->direction_input = s3c_gpiolib_input; | 138 | gc->direction_input = s3c_gpiolib_input; |
| 136 | if (!gc->direction_output) | 139 | if (!gc->direction_output) |