diff options
Diffstat (limited to 'drivers/reset/reset-sunxi.c')
| -rw-r--r-- | drivers/reset/reset-sunxi.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c index b44f6b5f87b6..cd585cd2f04d 100644 --- a/drivers/reset/reset-sunxi.c +++ b/drivers/reset/reset-sunxi.c | |||
| @@ -34,15 +34,16 @@ static int sunxi_reset_assert(struct reset_controller_dev *rcdev, | |||
| 34 | struct sunxi_reset_data *data = container_of(rcdev, | 34 | struct sunxi_reset_data *data = container_of(rcdev, |
| 35 | struct sunxi_reset_data, | 35 | struct sunxi_reset_data, |
| 36 | rcdev); | 36 | rcdev); |
| 37 | int bank = id / BITS_PER_LONG; | 37 | int reg_width = sizeof(u32); |
| 38 | int offset = id % BITS_PER_LONG; | 38 | int bank = id / (reg_width * BITS_PER_BYTE); |
| 39 | int offset = id % (reg_width * BITS_PER_BYTE); | ||
| 39 | unsigned long flags; | 40 | unsigned long flags; |
| 40 | u32 reg; | 41 | u32 reg; |
| 41 | 42 | ||
| 42 | spin_lock_irqsave(&data->lock, flags); | 43 | spin_lock_irqsave(&data->lock, flags); |
| 43 | 44 | ||
| 44 | reg = readl(data->membase + (bank * 4)); | 45 | reg = readl(data->membase + (bank * reg_width)); |
| 45 | writel(reg & ~BIT(offset), data->membase + (bank * 4)); | 46 | writel(reg & ~BIT(offset), data->membase + (bank * reg_width)); |
| 46 | 47 | ||
| 47 | spin_unlock_irqrestore(&data->lock, flags); | 48 | spin_unlock_irqrestore(&data->lock, flags); |
| 48 | 49 | ||
| @@ -55,15 +56,16 @@ static int sunxi_reset_deassert(struct reset_controller_dev *rcdev, | |||
| 55 | struct sunxi_reset_data *data = container_of(rcdev, | 56 | struct sunxi_reset_data *data = container_of(rcdev, |
| 56 | struct sunxi_reset_data, | 57 | struct sunxi_reset_data, |
| 57 | rcdev); | 58 | rcdev); |
| 58 | int bank = id / BITS_PER_LONG; | 59 | int reg_width = sizeof(u32); |
| 59 | int offset = id % BITS_PER_LONG; | 60 | int bank = id / (reg_width * BITS_PER_BYTE); |
| 61 | int offset = id % (reg_width * BITS_PER_BYTE); | ||
| 60 | unsigned long flags; | 62 | unsigned long flags; |
| 61 | u32 reg; | 63 | u32 reg; |
| 62 | 64 | ||
| 63 | spin_lock_irqsave(&data->lock, flags); | 65 | spin_lock_irqsave(&data->lock, flags); |
| 64 | 66 | ||
| 65 | reg = readl(data->membase + (bank * 4)); | 67 | reg = readl(data->membase + (bank * reg_width)); |
| 66 | writel(reg | BIT(offset), data->membase + (bank * 4)); | 68 | writel(reg | BIT(offset), data->membase + (bank * reg_width)); |
| 67 | 69 | ||
| 68 | spin_unlock_irqrestore(&data->lock, flags); | 70 | spin_unlock_irqrestore(&data->lock, flags); |
| 69 | 71 | ||