Skip to content

Commit daaeec9

Browse files
olofjolofj
committed
Merge tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into fixes
From Linus Walleij: Two fixes to the Nomadik: - Delete a dangling include - Bump IRQ numbers to offset at 32 * tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik: ARM: nomadik: bump the IRQ numbers again ARM: nomadik: delete dangling include
2 parents 1ddda1c + d962117 commit daaeec9

File tree

2 files changed

+39
-40
lines changed

2 files changed

+39
-40
lines changed

‎arch/arm/mach-nomadik/board-nhk8815.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <linux/pinctrl/machine.h>
2828
#include <linux/platform_data/pinctrl-nomadik.h>
2929
#include <linux/platform_data/clocksource-nomadik-mtu.h>
30-
#include <linux/platform_data/mtd-nomadik-nand.h>
3130
#include <asm/hardware/vic.h>
3231
#include <asm/sizes.h>
3332
#include <asm/mach-types.h>

‎arch/arm/mach-nomadik/include/mach/irqs.h

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -22,49 +22,49 @@
2222

2323
#include <mach/hardware.h>
2424

25-
#define IRQ_VIC_START 1 /* first VIC interrupt is 1 */
25+
#define IRQ_VIC_START 32 /* first VIC interrupt is 1 */
2626

2727
/*
2828
* Interrupt numbers generic for all Nomadik Chip cuts
2929
*/
30-
#define IRQ_WATCHDOG 1
31-
#define IRQ_SOFTINT 2
32-
#define IRQ_CRYPTO 3
33-
#define IRQ_OWM 4
34-
#define IRQ_MTU0 5
35-
#define IRQ_MTU1 6
36-
#define IRQ_GPIO0 7
37-
#define IRQ_GPIO1 8
38-
#define IRQ_GPIO2 9
39-
#define IRQ_GPIO3 10
40-
#define IRQ_RTC_RTT 11
41-
#define IRQ_SSP 12
42-
#define IRQ_UART0 13
43-
#define IRQ_DMA1 14
44-
#define IRQ_CLCD_MDIF 15
45-
#define IRQ_DMA0 16
46-
#define IRQ_PWRFAIL 17
47-
#define IRQ_UART1 18
48-
#define IRQ_FIRDA 19
49-
#define IRQ_MSP0 20
50-
#define IRQ_I2C0 21
51-
#define IRQ_I2C1 22
52-
#define IRQ_SDMMC 23
53-
#define IRQ_USBOTG 24
54-
#define IRQ_SVA_IT0 25
55-
#define IRQ_SVA_IT1 26
56-
#define IRQ_SAA_IT0 27
57-
#define IRQ_SAA_IT1 28
58-
#define IRQ_UART2 29
59-
#define IRQ_MSP2 30
60-
#define IRQ_L2CC 49
61-
#define IRQ_HPI 50
62-
#define IRQ_SKE 51
63-
#define IRQ_KP 52
64-
#define IRQ_MEMST 55
65-
#define IRQ_SGA_IT 59
66-
#define IRQ_USBM 61
67-
#define IRQ_MSP1 63
30+
#define IRQ_WATCHDOG (IRQ_VIC_START+0)
31+
#define IRQ_SOFTINT (IRQ_VIC_START+1)
32+
#define IRQ_CRYPTO (IRQ_VIC_START+2)
33+
#define IRQ_OWM (IRQ_VIC_START+3)
34+
#define IRQ_MTU0 (IRQ_VIC_START+4)
35+
#define IRQ_MTU1 (IRQ_VIC_START+5)
36+
#define IRQ_GPIO0 (IRQ_VIC_START+6)
37+
#define IRQ_GPIO1 (IRQ_VIC_START+7)
38+
#define IRQ_GPIO2 (IRQ_VIC_START+8)
39+
#define IRQ_GPIO3 (IRQ_VIC_START+9)
40+
#define IRQ_RTC_RTT (IRQ_VIC_START+10)
41+
#define IRQ_SSP (IRQ_VIC_START+11)
42+
#define IRQ_UART0 (IRQ_VIC_START+12)
43+
#define IRQ_DMA1 (IRQ_VIC_START+13)
44+
#define IRQ_CLCD_MDIF (IRQ_VIC_START+14)
45+
#define IRQ_DMA0 (IRQ_VIC_START+15)
46+
#define IRQ_PWRFAIL (IRQ_VIC_START+16)
47+
#define IRQ_UART1 (IRQ_VIC_START+17)
48+
#define IRQ_FIRDA (IRQ_VIC_START+18)
49+
#define IRQ_MSP0 (IRQ_VIC_START+19)
50+
#define IRQ_I2C0 (IRQ_VIC_START+20)
51+
#define IRQ_I2C1 (IRQ_VIC_START+21)
52+
#define IRQ_SDMMC (IRQ_VIC_START+22)
53+
#define IRQ_USBOTG (IRQ_VIC_START+23)
54+
#define IRQ_SVA_IT0 (IRQ_VIC_START+24)
55+
#define IRQ_SVA_IT1 (IRQ_VIC_START+25)
56+
#define IRQ_SAA_IT0 (IRQ_VIC_START+26)
57+
#define IRQ_SAA_IT1 (IRQ_VIC_START+27)
58+
#define IRQ_UART2 (IRQ_VIC_START+28)
59+
#define IRQ_MSP2 (IRQ_VIC_START+29)
60+
#define IRQ_L2CC (IRQ_VIC_START+30)
61+
#define IRQ_HPI (IRQ_VIC_START+31)
62+
#define IRQ_SKE (IRQ_VIC_START+32)
63+
#define IRQ_KP (IRQ_VIC_START+33)
64+
#define IRQ_MEMST (IRQ_VIC_START+34)
65+
#define IRQ_SGA_IT (IRQ_VIC_START+35)
66+
#define IRQ_USBM (IRQ_VIC_START+36)
67+
#define IRQ_MSP1 (IRQ_VIC_START+37)
6868

6969
#define NOMADIK_GPIO_OFFSET (IRQ_VIC_START+64)
7070

0 commit comments

Comments
 (0)