diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-20 14:54:53 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-20 14:54:53 -0500 |
| commit | 4c971aa78314253cce914ed29e3d90df3326d646 (patch) | |
| tree | a9dcf0b1fdc9e1aacff90afb5b3ab79983115dcc /include/dt-bindings/interrupt-controller | |
| parent | 4ba24fef3eb3b142197135223b90ced2f319cd53 (diff) | |
| parent | 290b799c390d77d27effee3ce312203aaa32ee74 (diff) | |
Merge branch 'next' into for-linus
Second round of updates for 3.20.
Diffstat (limited to 'include/dt-bindings/interrupt-controller')
| -rw-r--r-- | include/dt-bindings/interrupt-controller/arm-gic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/dt-bindings/interrupt-controller/arm-gic.h b/include/dt-bindings/interrupt-controller/arm-gic.h index 1ea1b702fec2..d4110d5caa3e 100644 --- a/include/dt-bindings/interrupt-controller/arm-gic.h +++ b/include/dt-bindings/interrupt-controller/arm-gic.h | |||
| @@ -7,14 +7,14 @@ | |||
| 7 | 7 | ||
| 8 | #include <dt-bindings/interrupt-controller/irq.h> | 8 | #include <dt-bindings/interrupt-controller/irq.h> |
| 9 | 9 | ||
| 10 | /* interrupt specific cell 0 */ | 10 | /* interrupt specifier cell 0 */ |
| 11 | 11 | ||
| 12 | #define GIC_SPI 0 | 12 | #define GIC_SPI 0 |
| 13 | #define GIC_PPI 1 | 13 | #define GIC_PPI 1 |
| 14 | 14 | ||
| 15 | /* | 15 | /* |
| 16 | * Interrupt specifier cell 2. | 16 | * Interrupt specifier cell 2. |
| 17 | * The flaggs in irq.h are valid, plus those below. | 17 | * The flags in irq.h are valid, plus those below. |
| 18 | */ | 18 | */ |
| 19 | #define GIC_CPU_MASK_RAW(x) ((x) << 8) | 19 | #define GIC_CPU_MASK_RAW(x) ((x) << 8) |
| 20 | #define GIC_CPU_MASK_SIMPLE(num) GIC_CPU_MASK_RAW((1 << (num)) - 1) | 20 | #define GIC_CPU_MASK_SIMPLE(num) GIC_CPU_MASK_RAW((1 << (num)) - 1) |