Merge remote-tracking branches 'regmap/topic/atomic', 'regmap/topic/debugfs' and 'regmap/topic/irq-hdr' into regmap-next

This commit is contained in:
Mark Brown 2015-10-12 19:25:07 +01:00
commit d4a1a317e7
4 changed files with 25 additions and 14 deletions

View file

@ -794,6 +794,9 @@ struct regmap_irq {
unsigned int mask;
};
#define REGMAP_IRQ_REG(_irq, _off, _mask) \
[_irq] = { .reg_offset = (_off), .mask = (_mask) }
/**
* Description of a generic regmap irq_chip. This is not intended to
* handle every possible interrupt controller, but it should handle a