diff options
author | Jens Axboe <axboe@kernel.dk> | 2017-06-22 21:55:24 -0600 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2017-06-22 21:55:24 -0600 |
commit | f95a0d6a95b12a79b7492da7ab687ae4cd741124 (patch) | |
tree | 503ad30af40e94bbc090fc7de45a051030646141 /arch/xtensa/platforms/xtfpga/include/platform | |
parent | a9590fe148c03cb4157b56255357419cb4e14124 (diff) | |
parent | 8e8320c9315c47a6a090188720ccff32a6a6ba18 (diff) |
Merge commit '8e8320c9315c' into for-4.13/block
Pull in the fix for shared tags, as it conflicts with the pending
changes in for-4.13/block. We already pulled in v4.12-rc5 to solve
other conflicts or get fixes that went into 4.12, so not a lot
of changes in this merge.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'arch/xtensa/platforms/xtfpga/include/platform')
-rw-r--r-- | arch/xtensa/platforms/xtfpga/include/platform/hardware.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/xtensa/platforms/xtfpga/include/platform/hardware.h b/arch/xtensa/platforms/xtfpga/include/platform/hardware.h index dbeea2b440a1..1fda7e20dfcb 100644 --- a/arch/xtensa/platforms/xtfpga/include/platform/hardware.h +++ b/arch/xtensa/platforms/xtfpga/include/platform/hardware.h @@ -24,16 +24,18 @@ /* Interrupt configuration. */ -#define PLATFORM_NR_IRQS 10 +#define PLATFORM_NR_IRQS 0 /* Default assignment of LX60 devices to external interrupts. */ #ifdef CONFIG_XTENSA_MX #define DUART16552_INTNUM XCHAL_EXTINT3_NUM #define OETH_IRQ XCHAL_EXTINT4_NUM +#define C67X00_IRQ XCHAL_EXTINT8_NUM #else #define DUART16552_INTNUM XCHAL_EXTINT0_NUM #define OETH_IRQ XCHAL_EXTINT1_NUM +#define C67X00_IRQ XCHAL_EXTINT5_NUM #endif /* @@ -63,5 +65,5 @@ #define C67X00_PADDR (XCHAL_KIO_PADDR + 0x0D0D0000) #define C67X00_SIZE 0x10 -#define C67X00_IRQ 5 + #endif /* __XTENSA_XTAVNET_HARDWARE_H */ |