diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-03-31 03:10:55 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-03-31 03:10:55 -0400 |
| commit | d88cf7d7b4240b8df170ba105e414e476fb51cce (patch) | |
| tree | 7efe976da6e0ec854eb0eeda82c1e9a275b8c69f /drivers/pinctrl/pinctrl-sunxi.h | |
| parent | 676e1b2fcd9dbb47a59baac13d089621d22c68b8 (diff) | |
| parent | 6f976267da0e2c873c4b4aaacaf08266d1d1797d (diff) | |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Diffstat (limited to 'drivers/pinctrl/pinctrl-sunxi.h')
| -rw-r--r-- | drivers/pinctrl/pinctrl-sunxi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinctrl-sunxi.h b/drivers/pinctrl/pinctrl-sunxi.h index 01c494f8a14f..552b0e97077a 100644 --- a/drivers/pinctrl/pinctrl-sunxi.h +++ b/drivers/pinctrl/pinctrl-sunxi.h | |||
| @@ -511,7 +511,7 @@ static inline u32 sunxi_pull_offset(u16 pin) | |||
| 511 | 511 | ||
| 512 | static inline u32 sunxi_irq_cfg_reg(u16 irq) | 512 | static inline u32 sunxi_irq_cfg_reg(u16 irq) |
| 513 | { | 513 | { |
| 514 | u8 reg = irq / IRQ_CFG_IRQ_PER_REG; | 514 | u8 reg = irq / IRQ_CFG_IRQ_PER_REG * 0x04; |
| 515 | return reg + IRQ_CFG_REG; | 515 | return reg + IRQ_CFG_REG; |
| 516 | } | 516 | } |
| 517 | 517 | ||
| @@ -523,7 +523,7 @@ static inline u32 sunxi_irq_cfg_offset(u16 irq) | |||
| 523 | 523 | ||
| 524 | static inline u32 sunxi_irq_ctrl_reg(u16 irq) | 524 | static inline u32 sunxi_irq_ctrl_reg(u16 irq) |
| 525 | { | 525 | { |
| 526 | u8 reg = irq / IRQ_CTRL_IRQ_PER_REG; | 526 | u8 reg = irq / IRQ_CTRL_IRQ_PER_REG * 0x04; |
| 527 | return reg + IRQ_CTRL_REG; | 527 | return reg + IRQ_CTRL_REG; |
| 528 | } | 528 | } |
| 529 | 529 | ||
| @@ -535,7 +535,7 @@ static inline u32 sunxi_irq_ctrl_offset(u16 irq) | |||
| 535 | 535 | ||
| 536 | static inline u32 sunxi_irq_status_reg(u16 irq) | 536 | static inline u32 sunxi_irq_status_reg(u16 irq) |
| 537 | { | 537 | { |
| 538 | u8 reg = irq / IRQ_STATUS_IRQ_PER_REG; | 538 | u8 reg = irq / IRQ_STATUS_IRQ_PER_REG * 0x04; |
| 539 | return reg + IRQ_STATUS_REG; | 539 | return reg + IRQ_STATUS_REG; |
| 540 | } | 540 | } |
| 541 | 541 | ||