|
@@ -94,16 +94,16 @@ static int __init dw_apb_ictl_init(struct device_node *np,
|
|
*/
|
|
*/
|
|
|
|
|
|
/* mask and enable all interrupts */
|
|
/* mask and enable all interrupts */
|
|
- writel(~0, iobase + APB_INT_MASK_L);
|
|
|
|
- writel(~0, iobase + APB_INT_MASK_H);
|
|
|
|
- writel(~0, iobase + APB_INT_ENABLE_L);
|
|
|
|
- writel(~0, iobase + APB_INT_ENABLE_H);
|
|
|
|
|
|
+ writel_relaxed(~0, iobase + APB_INT_MASK_L);
|
|
|
|
+ writel_relaxed(~0, iobase + APB_INT_MASK_H);
|
|
|
|
+ writel_relaxed(~0, iobase + APB_INT_ENABLE_L);
|
|
|
|
+ writel_relaxed(~0, iobase + APB_INT_ENABLE_H);
|
|
|
|
|
|
- reg = readl(iobase + APB_INT_ENABLE_H);
|
|
|
|
|
|
+ reg = readl_relaxed(iobase + APB_INT_ENABLE_H);
|
|
if (reg)
|
|
if (reg)
|
|
nrirqs = 32 + fls(reg);
|
|
nrirqs = 32 + fls(reg);
|
|
else
|
|
else
|
|
- nrirqs = fls(readl(iobase + APB_INT_ENABLE_L));
|
|
|
|
|
|
+ nrirqs = fls(readl_relaxed(iobase + APB_INT_ENABLE_L));
|
|
|
|
|
|
domain = irq_domain_add_linear(np, nrirqs,
|
|
domain = irq_domain_add_linear(np, nrirqs,
|
|
&irq_generic_chip_ops, NULL);
|
|
&irq_generic_chip_ops, NULL);
|