Date: | 2010-06-01 00:15:36 (13 years 9 months ago) |
---|---|
Author: | Lars C. |
Commit: | 50147dd593bc9168a820ea7bdcb5ae0e770a4de5 |
Message: | jz4740: GPIO: get rid of IRQ_TO_REG macro |
Files: |
arch/mips/jz4740/gpio.c (3 diffs) |
Change Details
arch/mips/jz4740/gpio.c | ||
---|---|---|
279 | 279 | #define IRQ_TO_GPIO(irq) (irq - JZ4740_IRQ_GPIO(0)) |
280 | 280 | #define IRQ_TO_BIT(irq) BIT(IRQ_TO_GPIO(irq) & 0x1f) |
281 | 281 | |
282 | #define IRQ_TO_REG(irq, reg) GPIO_TO_REG(IRQ_TO_GPIO(irq), reg) | |
283 | ||
284 | 282 | static void jz_gpio_irq_demux_handler(unsigned int irq, struct irq_desc *desc) |
285 | 283 | { |
286 | 284 | uint32_t flag; |
... | ... | |
312 | 310 | |
313 | 311 | static inline void jz_gpio_set_irq_bit(unsigned int irq, unsigned int reg) |
314 | 312 | { |
315 | writel(IRQ_TO_BIT(irq), IRQ_TO_REG(irq, reg)); | |
313 | struct jz_gpio_chip *chip = get_irq_data(desc); | |
314 | writel(IRQ_TO_BIT(irq), chip->base + reg); | |
316 | 315 | } |
317 | 316 | |
318 | 317 | static void jz_gpio_irq_mask(unsigned int irq) |
319 | 318 | { |
319 | struct jz_gpio_chip *chip = get_irq_data(desc); | |
320 | 320 | jz_gpio_set_irq_bit(irq, JZ_REG_GPIO_MASK_SET); |
321 | 321 | }; |
322 | 322 | |
... | ... | |
364 | 364 | jz_gpio_irq_mask(irq); |
365 | 365 | |
366 | 366 | if (flow_type == IRQ_TYPE_EDGE_BOTH) { |
367 | uint32_t value = readl(IRQ_TO_REG(irq, JZ_REG_GPIO_PIN)); | |
367 | uint32_t value = readl(chip->base + JZ_REG_GPIO_PIN); | |
368 | 368 | if (value & IRQ_TO_BIT(irq)) |
369 | 369 | flow_type = IRQ_TYPE_EDGE_FALLING; |
370 | 370 | else |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9