.. | .. |
---|
45 | 45 | unsigned int gpio_width[2]; |
---|
46 | 46 | u32 gpio_state[2]; |
---|
47 | 47 | u32 gpio_dir[2]; |
---|
48 | | - spinlock_t gpio_lock[2]; |
---|
| 48 | + hard_spinlock_t gpio_lock[2]; |
---|
49 | 49 | }; |
---|
50 | 50 | |
---|
51 | 51 | static inline int xgpio_index(struct xgpio_instance *chip, int gpio) |
---|
.. | .. |
---|
110 | 110 | int index = xgpio_index(chip, gpio); |
---|
111 | 111 | int offset = xgpio_offset(chip, gpio); |
---|
112 | 112 | |
---|
113 | | - spin_lock_irqsave(&chip->gpio_lock[index], flags); |
---|
| 113 | + raw_spin_lock_irqsave(&chip->gpio_lock[index], flags); |
---|
114 | 114 | |
---|
115 | 115 | /* Write to GPIO signal and set its direction to output */ |
---|
116 | 116 | if (val) |
---|
.. | .. |
---|
121 | 121 | xgpio_writereg(chip->regs + XGPIO_DATA_OFFSET + |
---|
122 | 122 | xgpio_regoffset(chip, gpio), chip->gpio_state[index]); |
---|
123 | 123 | |
---|
124 | | - spin_unlock_irqrestore(&chip->gpio_lock[index], flags); |
---|
| 124 | + raw_spin_unlock_irqrestore(&chip->gpio_lock[index], flags); |
---|
125 | 125 | } |
---|
126 | 126 | |
---|
127 | 127 | /** |
---|
.. | .. |
---|
141 | 141 | int index = xgpio_index(chip, 0); |
---|
142 | 142 | int offset, i; |
---|
143 | 143 | |
---|
144 | | - spin_lock_irqsave(&chip->gpio_lock[index], flags); |
---|
| 144 | + raw_spin_lock_irqsave(&chip->gpio_lock[index], flags); |
---|
145 | 145 | |
---|
146 | 146 | /* Write to GPIO signals */ |
---|
147 | 147 | for (i = 0; i < gc->ngpio; i++) { |
---|
.. | .. |
---|
152 | 152 | xgpio_writereg(chip->regs + XGPIO_DATA_OFFSET + |
---|
153 | 153 | index * XGPIO_CHANNEL_OFFSET, |
---|
154 | 154 | chip->gpio_state[index]); |
---|
155 | | - spin_unlock_irqrestore(&chip->gpio_lock[index], flags); |
---|
| 155 | + raw_spin_unlock_irqrestore(&chip->gpio_lock[index], flags); |
---|
156 | 156 | index = xgpio_index(chip, i); |
---|
157 | | - spin_lock_irqsave(&chip->gpio_lock[index], flags); |
---|
| 157 | + raw_spin_lock_irqsave(&chip->gpio_lock[index], flags); |
---|
158 | 158 | } |
---|
159 | 159 | if (__test_and_clear_bit(i, mask)) { |
---|
160 | 160 | offset = xgpio_offset(chip, i); |
---|
.. | .. |
---|
168 | 168 | xgpio_writereg(chip->regs + XGPIO_DATA_OFFSET + |
---|
169 | 169 | index * XGPIO_CHANNEL_OFFSET, chip->gpio_state[index]); |
---|
170 | 170 | |
---|
171 | | - spin_unlock_irqrestore(&chip->gpio_lock[index], flags); |
---|
| 171 | + raw_spin_unlock_irqrestore(&chip->gpio_lock[index], flags); |
---|
172 | 172 | } |
---|
173 | 173 | |
---|
174 | 174 | /** |
---|
.. | .. |
---|
187 | 187 | int index = xgpio_index(chip, gpio); |
---|
188 | 188 | int offset = xgpio_offset(chip, gpio); |
---|
189 | 189 | |
---|
190 | | - spin_lock_irqsave(&chip->gpio_lock[index], flags); |
---|
| 190 | + raw_spin_lock_irqsave(&chip->gpio_lock[index], flags); |
---|
191 | 191 | |
---|
192 | 192 | /* Set the GPIO bit in shadow register and set direction as input */ |
---|
193 | 193 | chip->gpio_dir[index] |= BIT(offset); |
---|
194 | 194 | xgpio_writereg(chip->regs + XGPIO_TRI_OFFSET + |
---|
195 | 195 | xgpio_regoffset(chip, gpio), chip->gpio_dir[index]); |
---|
196 | 196 | |
---|
197 | | - spin_unlock_irqrestore(&chip->gpio_lock[index], flags); |
---|
| 197 | + raw_spin_unlock_irqrestore(&chip->gpio_lock[index], flags); |
---|
198 | 198 | |
---|
199 | 199 | return 0; |
---|
200 | 200 | } |
---|
.. | .. |
---|
218 | 218 | int index = xgpio_index(chip, gpio); |
---|
219 | 219 | int offset = xgpio_offset(chip, gpio); |
---|
220 | 220 | |
---|
221 | | - spin_lock_irqsave(&chip->gpio_lock[index], flags); |
---|
| 221 | + raw_spin_lock_irqsave(&chip->gpio_lock[index], flags); |
---|
222 | 222 | |
---|
223 | 223 | /* Write state of GPIO signal */ |
---|
224 | 224 | if (val) |
---|
.. | .. |
---|
233 | 233 | xgpio_writereg(chip->regs + XGPIO_TRI_OFFSET + |
---|
234 | 234 | xgpio_regoffset(chip, gpio), chip->gpio_dir[index]); |
---|
235 | 235 | |
---|
236 | | - spin_unlock_irqrestore(&chip->gpio_lock[index], flags); |
---|
| 236 | + raw_spin_unlock_irqrestore(&chip->gpio_lock[index], flags); |
---|
237 | 237 | |
---|
238 | 238 | return 0; |
---|
239 | 239 | } |
---|
.. | .. |
---|
291 | 291 | if (of_property_read_u32(np, "xlnx,gpio-width", &chip->gpio_width[0])) |
---|
292 | 292 | chip->gpio_width[0] = 32; |
---|
293 | 293 | |
---|
294 | | - spin_lock_init(&chip->gpio_lock[0]); |
---|
| 294 | + raw_spin_lock_init(&chip->gpio_lock[0]); |
---|
295 | 295 | |
---|
296 | 296 | if (of_property_read_u32(np, "xlnx,is-dual", &is_dual)) |
---|
297 | 297 | is_dual = 0; |
---|
.. | .. |
---|
314 | 314 | &chip->gpio_width[1])) |
---|
315 | 315 | chip->gpio_width[1] = 32; |
---|
316 | 316 | |
---|
317 | | - spin_lock_init(&chip->gpio_lock[1]); |
---|
| 317 | + raw_spin_lock_init(&chip->gpio_lock[1]); |
---|
318 | 318 | } |
---|
319 | 319 | |
---|
320 | 320 | chip->gc.base = -1; |
---|