|
@@ -85,16 +85,17 @@ static void meson_ir_set_mask(struct meson_ir *ir, unsigned int reg,
|
|
|
static irqreturn_t meson_ir_irq(int irqno, void *dev_id)
|
|
|
{
|
|
|
struct meson_ir *ir = dev_id;
|
|
|
- u32 duration;
|
|
|
+ u32 duration, status;
|
|
|
DEFINE_IR_RAW_EVENT(rawir);
|
|
|
|
|
|
spin_lock(&ir->lock);
|
|
|
|
|
|
- duration = readl(ir->reg + IR_DEC_REG1);
|
|
|
+ duration = readl_relaxed(ir->reg + IR_DEC_REG1);
|
|
|
duration = FIELD_GET(REG1_TIME_IV_MASK, duration);
|
|
|
rawir.duration = US_TO_NS(duration * MESON_TRATE);
|
|
|
|
|
|
- rawir.pulse = !!(readl(ir->reg + IR_DEC_STATUS) & STATUS_IR_DEC_IN);
|
|
|
+ status = readl_relaxed(ir->reg + IR_DEC_STATUS);
|
|
|
+ rawir.pulse = !!(status & STATUS_IR_DEC_IN);
|
|
|
|
|
|
ir_raw_event_store_with_filter(ir->rc, &rawir);
|
|
|
ir_raw_event_handle(ir->rc);
|