ARM: davinci: make irqs.h a local header
authorBartosz Golaszewski <bgolaszewski@baylibre.com>
Thu, 14 Feb 2019 14:52:03 +0000 (15:52 +0100)
committerSekhar Nori <nsekhar@ti.com>
Tue, 19 Feb 2019 14:14:02 +0000 (19:44 +0530)
The existence of irqs.h in mach-davinci/include/mach only makes sense
without SPARSE_IRQ as it's then expected to define NR_IRQS and is
included from asm/irq.h. As we now support SPARSE_IRQ, this header can
be moved to mach-davinci and used as the source of HW interrupt numbers.

While updating the includes in various files - also rearrange the
headers by directory (linux/asm/mach).

Reviewed-by: David Lechner <david@lechnology.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
17 files changed:
arch/arm/mach-davinci/board-da830-evm.c
arch/arm/mach-davinci/board-da850-evm.c
arch/arm/mach-davinci/board-dm644x-evm.c
arch/arm/mach-davinci/board-dm646x-evm.c
arch/arm/mach-davinci/da830.c
arch/arm/mach-davinci/da850.c
arch/arm/mach-davinci/devices-da8xx.c
arch/arm/mach-davinci/devices.c
arch/arm/mach-davinci/dm355.c
arch/arm/mach-davinci/dm365.c
arch/arm/mach-davinci/dm644x.c
arch/arm/mach-davinci/dm646x.c
arch/arm/mach-davinci/include/mach/irqs.h [deleted file]
arch/arm/mach-davinci/irq.c
arch/arm/mach-davinci/irqs.h [new file with mode: 0644]
arch/arm/mach-davinci/usb-da8xx.c
arch/arm/mach-davinci/usb.c

index 64eeb6087f142b28f8b33f60d7b4070531c22c17..e48a876a04d7a075f63ece60d3351c46962cf477 100644 (file)
 #include <asm/mach/arch.h>
 
 #include <mach/common.h>
-#include <mach/irqs.h>
-#include "cp_intc.h"
 #include <mach/mux.h>
 #include <mach/da8xx.h>
 
+#include "cp_intc.h"
+#include "irqs.h"
+
 #define DA830_EVM_PHY_ID               ""
 /*
  * USB1 VBUS is controlled by GPIO1[15], over-current is reported on GPIO2[4].
index cebaa58d2f77b9ecc0b0640d3c56a44469d9c462..09f67fcdf750a1b6cf24569f9cb273ad0abc3de3 100644 (file)
 #include <linux/spi/flash.h>
 
 #include <mach/common.h>
-#include "cp_intc.h"
 #include <mach/da8xx.h>
 #include <mach/mux.h>
-#include <mach/irqs.h>
+
+#include "cp_intc.h"
+#include "irqs.h"
 #include "sram.h"
 
 #include <asm/mach-types.h>
index fe4f731df3fdc31afcbf3e6f1c7b1d327cb2dd9a..0a338982125490d0857562fff95e2a056cc3b982 100644 (file)
 #include <asm/mach/arch.h>
 
 #include <mach/common.h>
-#include <mach/irqs.h>
-#include <linux/platform_data/i2c-davinci.h>
-#include <mach/serial.h>
 #include <mach/mux.h>
+#include <mach/serial.h>
+
+#include <linux/platform_data/i2c-davinci.h>
 #include <linux/platform_data/mtd-davinci.h>
 #include <linux/platform_data/mmc-davinci.h>
 #include <linux/platform_data/usb-davinci.h>
@@ -47,6 +47,7 @@
 #include <linux/platform_data/ti-aemif.h>
 
 #include "davinci.h"
+#include "irqs.h"
 
 #define DM644X_EVM_PHY_ID              "davinci_mdio-0:01"
 #define LXT971_PHY_ID  (0x001378e2)
index 02b57face11319731982e962be8a8c4a96f1f45c..308109617a47eb0cd543121422fc8be25c931a5a 100644 (file)
 #include <asm/mach/arch.h>
 
 #include <mach/common.h>
-#include <mach/irqs.h>
 #include <mach/serial.h>
 
 #include "davinci.h"
+#include "irqs.h"
 
 #define NAND_BLOCK_SIZE                SZ_128K
 
index aa8da725a325845a26a9c4973e2ea1b183143bd0..ca903c9105e4153462d2cc58f879ae9bd732771e 100644 (file)
@@ -19,9 +19,9 @@
 #include <mach/common.h>
 #include <mach/cputype.h>
 #include <mach/da8xx.h>
-#include <mach/irqs.h>
 #include <mach/time.h>
 
+#include "irqs.h"
 #include "mux.h"
 
 /* Offsets of the 8 compare registers on the da830 */
index d22b1983332610c33ce00549f18c53462e0b57a3..486d534816361b53a5a9b84cd8e8d6a54693fa40 100644 (file)
 #include <mach/cpufreq.h>
 #include <mach/cputype.h>
 #include <mach/da8xx.h>
-#include <mach/irqs.h>
 #include <mach/pm.h>
 #include <mach/time.h>
 
+#include "irqs.h"
 #include "mux.h"
 
 #define DA850_PLL1_BASE                0x01e1a000
index 3104a3eb2ddfc5bfaa818fe577bce9182fec8bec..b8dc674e06bcf04a35735d27fe60524c6052d204 100644 (file)
 #include <mach/cputype.h>
 #include <mach/da8xx.h>
 #include <mach/time.h>
-#include <mach/irqs.h>
 
 #include "asp.h"
 #include "cpuidle.h"
+#include "irqs.h"
 #include "sram.h"
 
 #define DA8XX_TPCC_BASE                        0x01c00000
index 722c463f9b18342e9437bc8328d8081a3424395a..40bd8029e4575d2a6e6eb26979e53df776c2018d 100644 (file)
 
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/platform_data/i2c-davinci.h>
+#include <linux/platform_data/mmc-davinci.h>
+#include <linux/platform_data/edma.h>
 #include <linux/dma-mapping.h>
 #include <linux/io.h>
 #include <linux/reboot.h>
 
 #include <mach/hardware.h>
-#include <linux/platform_data/i2c-davinci.h>
-#include <mach/irqs.h>
 #include <mach/cputype.h>
 #include <mach/mux.h>
-#include <linux/platform_data/mmc-davinci.h>
 #include <mach/time.h>
-#include <linux/platform_data/edma.h>
-
 
 #include "davinci.h"
+#include "irqs.h"
 
 #define DAVINCI_I2C_BASE            0x01C21000
 #define DAVINCI_ATA_BASE            0x01C66000
index cb725244fa13b7519cf753d222d2e80e1e0d27ee..b27ea4fc1d517b16f7f7f602033ff373fb422a98 100644 (file)
 
 #include <mach/common.h>
 #include <mach/cputype.h>
-#include <mach/irqs.h>
 #include <mach/mux.h>
 #include <mach/serial.h>
 #include <mach/time.h>
 
 #include "asp.h"
 #include "davinci.h"
+#include "irqs.h"
 #include "mux.h"
 
 #define DM355_UART2_BASE       (IO_PHYS + 0x206000)
index ae1b53ea956ac42ae5f7bee8a9dd5481b7800e0e..d9c6ab9215a6a64276e07ca1e187e625e466927a 100644 (file)
 
 #include <mach/common.h>
 #include <mach/cputype.h>
-#include <mach/irqs.h>
 #include <mach/mux.h>
 #include <mach/serial.h>
 #include <mach/time.h>
 
 #include "asp.h"
 #include "davinci.h"
+#include "irqs.h"
 #include "mux.h"
 
 #define DM365_REF_FREQ         24000000        /* 24 MHz on the DM365 EVM */
index 5ccb49196a7126aa95c5c0fd8895328293334aa8..b2748c82b747b80a6ceae6e04ee10685170ad6b5 100644 (file)
 
 #include <mach/common.h>
 #include <mach/cputype.h>
-#include <mach/irqs.h>
 #include <mach/mux.h>
 #include <mach/serial.h>
 #include <mach/time.h>
 
 #include "asp.h"
 #include "davinci.h"
+#include "irqs.h"
 #include "mux.h"
 
 /*
index 2b55625e8fb54ab8a2087dfb9792a19e6b471aa6..cf210741dfe50f5d083491269d5685509bd4a4eb 100644 (file)
 
 #include <mach/common.h>
 #include <mach/cputype.h>
-#include <mach/irqs.h>
 #include <mach/mux.h>
 #include <mach/serial.h>
 #include <mach/time.h>
 
 #include "asp.h"
 #include "davinci.h"
+#include "irqs.h"
 #include "mux.h"
 
 #define DAVINCI_VPIF_BASE       (0x01C12000)
diff --git a/arch/arm/mach-davinci/include/mach/irqs.h b/arch/arm/mach-davinci/include/mach/irqs.h
deleted file mode 100644 (file)
index 8f9fc7a..0000000
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- * DaVinci interrupt controller definitions
- *
- *  Copyright (C) 2006 Texas Instruments.
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-#ifndef __ASM_ARCH_IRQS_H
-#define __ASM_ARCH_IRQS_H
-
-/* Base address */
-#define DAVINCI_ARM_INTC_BASE 0x01C48000
-
-/* Interrupt lines */
-#define IRQ_VDINT0       0
-#define IRQ_VDINT1       1
-#define IRQ_VDINT2       2
-#define IRQ_HISTINT      3
-#define IRQ_H3AINT       4
-#define IRQ_PRVUINT      5
-#define IRQ_RSZINT       6
-#define IRQ_VFOCINT      7
-#define IRQ_VENCINT      8
-#define IRQ_ASQINT       9
-#define IRQ_IMXINT       10
-#define IRQ_VLCDINT      11
-#define IRQ_USBINT       12
-#define IRQ_EMACINT      13
-
-#define IRQ_CCINT0       16
-#define IRQ_CCERRINT     17
-#define IRQ_TCERRINT0    18
-#define IRQ_TCERRINT     19
-#define IRQ_PSCIN        20
-
-#define IRQ_IDE          22
-#define IRQ_HPIINT       23
-#define IRQ_MBXINT       24
-#define IRQ_MBRINT       25
-#define IRQ_MMCINT       26
-#define IRQ_SDIOINT      27
-#define IRQ_MSINT        28
-#define IRQ_DDRINT       29
-#define IRQ_AEMIFINT     30
-#define IRQ_VLQINT       31
-#define IRQ_TINT0_TINT12 32
-#define IRQ_TINT0_TINT34 33
-#define IRQ_TINT1_TINT12 34
-#define IRQ_TINT1_TINT34 35
-#define IRQ_PWMINT0      36
-#define IRQ_PWMINT1      37
-#define IRQ_PWMINT2      38
-#define IRQ_I2C          39
-#define IRQ_UARTINT0     40
-#define IRQ_UARTINT1     41
-#define IRQ_UARTINT2     42
-#define IRQ_SPINT0       43
-#define IRQ_SPINT1       44
-
-#define IRQ_DSP2ARM0     46
-#define IRQ_DSP2ARM1     47
-#define IRQ_GPIO0        48
-#define IRQ_GPIO1        49
-#define IRQ_GPIO2        50
-#define IRQ_GPIO3        51
-#define IRQ_GPIO4        52
-#define IRQ_GPIO5        53
-#define IRQ_GPIO6        54
-#define IRQ_GPIO7        55
-#define IRQ_GPIOBNK0     56
-#define IRQ_GPIOBNK1     57
-#define IRQ_GPIOBNK2     58
-#define IRQ_GPIOBNK3     59
-#define IRQ_GPIOBNK4     60
-#define IRQ_COMMTX       61
-#define IRQ_COMMRX       62
-#define IRQ_EMUINT       63
-
-#define DAVINCI_N_AINTC_IRQ    64
-
-#define ARCH_TIMER_IRQ IRQ_TINT1_TINT34
-
-/* DaVinci DM6467-specific Interrupts */
-#define IRQ_DM646X_VP_VERTINT0  0
-#define IRQ_DM646X_VP_VERTINT1  1
-#define IRQ_DM646X_VP_VERTINT2  2
-#define IRQ_DM646X_VP_VERTINT3  3
-#define IRQ_DM646X_VP_ERRINT    4
-#define IRQ_DM646X_RESERVED_1   5
-#define IRQ_DM646X_RESERVED_2   6
-#define IRQ_DM646X_WDINT        7
-#define IRQ_DM646X_CRGENINT0    8
-#define IRQ_DM646X_CRGENINT1    9
-#define IRQ_DM646X_TSIFINT0     10
-#define IRQ_DM646X_TSIFINT1     11
-#define IRQ_DM646X_VDCEINT      12
-#define IRQ_DM646X_USBINT       13
-#define IRQ_DM646X_USBDMAINT    14
-#define IRQ_DM646X_PCIINT       15
-#define IRQ_DM646X_TCERRINT2    20
-#define IRQ_DM646X_TCERRINT3    21
-#define IRQ_DM646X_IDE          22
-#define IRQ_DM646X_HPIINT       23
-#define IRQ_DM646X_EMACRXTHINT  24
-#define IRQ_DM646X_EMACRXINT    25
-#define IRQ_DM646X_EMACTXINT    26
-#define IRQ_DM646X_EMACMISCINT  27
-#define IRQ_DM646X_MCASP0TXINT  28
-#define IRQ_DM646X_MCASP0RXINT  29
-#define IRQ_DM646X_MCASP1TXINT  30
-#define IRQ_DM646X_RESERVED_3   31
-#define IRQ_DM646X_VLQINT       38
-#define IRQ_DM646X_UARTINT2     42
-#define IRQ_DM646X_SPINT0       43
-#define IRQ_DM646X_SPINT1       44
-#define IRQ_DM646X_DSP2ARMINT   45
-#define IRQ_DM646X_RESERVED_4   46
-#define IRQ_DM646X_PSCINT       47
-#define IRQ_DM646X_GPIO0        48
-#define IRQ_DM646X_GPIO1        49
-#define IRQ_DM646X_GPIO2        50
-#define IRQ_DM646X_GPIO3        51
-#define IRQ_DM646X_GPIO4        52
-#define IRQ_DM646X_GPIO5        53
-#define IRQ_DM646X_GPIO6        54
-#define IRQ_DM646X_GPIO7        55
-#define IRQ_DM646X_GPIOBNK0     56
-#define IRQ_DM646X_GPIOBNK1     57
-#define IRQ_DM646X_GPIOBNK2     58
-#define IRQ_DM646X_DDRINT       59
-#define IRQ_DM646X_AEMIFINT     60
-
-/* DaVinci DM355-specific Interrupts */
-#define IRQ_DM355_CCDC_VDINT0  0
-#define IRQ_DM355_CCDC_VDINT1  1
-#define IRQ_DM355_CCDC_VDINT2  2
-#define IRQ_DM355_IPIPE_HST    3
-#define IRQ_DM355_H3AINT       4
-#define IRQ_DM355_IPIPE_SDR    5
-#define IRQ_DM355_IPIPEIFINT   6
-#define IRQ_DM355_OSDINT       7
-#define IRQ_DM355_VENCINT      8
-#define IRQ_DM355_IMCOPINT     11
-#define IRQ_DM355_RTOINT       13
-#define IRQ_DM355_TINT4                13
-#define IRQ_DM355_TINT2_TINT12 13
-#define IRQ_DM355_UARTINT2     14
-#define IRQ_DM355_TINT5                14
-#define IRQ_DM355_TINT2_TINT34 14
-#define IRQ_DM355_TINT6                15
-#define IRQ_DM355_TINT3_TINT12 15
-#define IRQ_DM355_SPINT1_0     17
-#define IRQ_DM355_SPINT1_1     18
-#define IRQ_DM355_SPINT2_0     19
-#define IRQ_DM355_SPINT2_1     21
-#define IRQ_DM355_TINT7                22
-#define IRQ_DM355_TINT3_TINT34 22
-#define IRQ_DM355_SDIOINT0     23
-#define IRQ_DM355_MMCINT0      26
-#define IRQ_DM355_MSINT                26
-#define IRQ_DM355_MMCINT1      27
-#define IRQ_DM355_PWMINT3      28
-#define IRQ_DM355_SDIOINT1     31
-#define IRQ_DM355_SPINT0_0     42
-#define IRQ_DM355_SPINT0_1     43
-#define IRQ_DM355_GPIO0                44
-#define IRQ_DM355_GPIO1                45
-#define IRQ_DM355_GPIO2                46
-#define IRQ_DM355_GPIO3                47
-#define IRQ_DM355_GPIO4                48
-#define IRQ_DM355_GPIO5                49
-#define IRQ_DM355_GPIO6                50
-#define IRQ_DM355_GPIO7                51
-#define IRQ_DM355_GPIO8                52
-#define IRQ_DM355_GPIO9                53
-#define IRQ_DM355_GPIOBNK0     54
-#define IRQ_DM355_GPIOBNK1     55
-#define IRQ_DM355_GPIOBNK2     56
-#define IRQ_DM355_GPIOBNK3     57
-#define IRQ_DM355_GPIOBNK4     58
-#define IRQ_DM355_GPIOBNK5     59
-#define IRQ_DM355_GPIOBNK6     60
-
-/* DaVinci DM365-specific Interrupts */
-#define IRQ_DM365_INSFINT      7
-#define IRQ_DM365_IMXINT1      8
-#define IRQ_DM365_IMXINT0      10
-#define IRQ_DM365_KLD_ARMINT   10
-#define IRQ_DM365_IMCOPINT     11
-#define IRQ_DM365_RTOINT       13
-#define IRQ_DM365_TINT5                14
-#define IRQ_DM365_TINT6                15
-#define IRQ_DM365_SPINT2_1     21
-#define IRQ_DM365_TINT7                22
-#define IRQ_DM365_SDIOINT0     23
-#define IRQ_DM365_MMCINT1      27
-#define IRQ_DM365_PWMINT3      28
-#define IRQ_DM365_RTCINT       29
-#define IRQ_DM365_SDIOINT1     31
-#define IRQ_DM365_SPIINT0_0    42
-#define IRQ_DM365_SPIINT3_0    43
-#define IRQ_DM365_GPIO0                44
-#define IRQ_DM365_GPIO1                45
-#define IRQ_DM365_GPIO2                46
-#define IRQ_DM365_GPIO3                47
-#define IRQ_DM365_GPIO4                48
-#define IRQ_DM365_GPIO5                49
-#define IRQ_DM365_GPIO6                50
-#define IRQ_DM365_GPIO7                51
-#define IRQ_DM365_EMAC_RXTHRESH        52
-#define IRQ_DM365_EMAC_RXPULSE 53
-#define IRQ_DM365_EMAC_TXPULSE 54
-#define IRQ_DM365_EMAC_MISCPULSE 55
-#define IRQ_DM365_GPIO12       56
-#define IRQ_DM365_GPIO13       57
-#define IRQ_DM365_GPIO14       58
-#define IRQ_DM365_GPIO15       59
-#define IRQ_DM365_ADCINT       59
-#define IRQ_DM365_KEYINT       60
-#define IRQ_DM365_TCERRINT2    61
-#define IRQ_DM365_TCERRINT3    62
-#define IRQ_DM365_EMUINT       63
-
-/* DA8XX interrupts */
-#define IRQ_DA8XX_COMMTX               0
-#define IRQ_DA8XX_COMMRX               1
-#define IRQ_DA8XX_NINT                 2
-#define IRQ_DA8XX_EVTOUT0              3
-#define IRQ_DA8XX_EVTOUT1              4
-#define IRQ_DA8XX_EVTOUT2              5
-#define IRQ_DA8XX_EVTOUT3              6
-#define IRQ_DA8XX_EVTOUT4              7
-#define IRQ_DA8XX_EVTOUT5              8
-#define IRQ_DA8XX_EVTOUT6              9
-#define IRQ_DA8XX_EVTOUT7              10
-#define IRQ_DA8XX_CCINT0               11
-#define IRQ_DA8XX_CCERRINT             12
-#define IRQ_DA8XX_TCERRINT0            13
-#define IRQ_DA8XX_AEMIFINT             14
-#define IRQ_DA8XX_I2CINT0              15
-#define IRQ_DA8XX_MMCSDINT0            16
-#define IRQ_DA8XX_MMCSDINT1            17
-#define IRQ_DA8XX_ALLINT0              18
-#define IRQ_DA8XX_RTC                  19
-#define IRQ_DA8XX_SPINT0               20
-#define IRQ_DA8XX_TINT12_0             21
-#define IRQ_DA8XX_TINT34_0             22
-#define IRQ_DA8XX_TINT12_1             23
-#define IRQ_DA8XX_TINT34_1             24
-#define IRQ_DA8XX_UARTINT0             25
-#define IRQ_DA8XX_KEYMGRINT            26
-#define IRQ_DA8XX_SECINT               26
-#define IRQ_DA8XX_SECKEYERR            26
-#define IRQ_DA8XX_CHIPINT0             28
-#define IRQ_DA8XX_CHIPINT1             29
-#define IRQ_DA8XX_CHIPINT2             30
-#define IRQ_DA8XX_CHIPINT3             31
-#define IRQ_DA8XX_TCERRINT1            32
-#define IRQ_DA8XX_C0_RX_THRESH_PULSE   33
-#define IRQ_DA8XX_C0_RX_PULSE          34
-#define IRQ_DA8XX_C0_TX_PULSE          35
-#define IRQ_DA8XX_C0_MISC_PULSE                36
-#define IRQ_DA8XX_C1_RX_THRESH_PULSE   37
-#define IRQ_DA8XX_C1_RX_PULSE          38
-#define IRQ_DA8XX_C1_TX_PULSE          39
-#define IRQ_DA8XX_C1_MISC_PULSE                40
-#define IRQ_DA8XX_MEMERR               41
-#define IRQ_DA8XX_GPIO0                        42
-#define IRQ_DA8XX_GPIO1                        43
-#define IRQ_DA8XX_GPIO2                        44
-#define IRQ_DA8XX_GPIO3                        45
-#define IRQ_DA8XX_GPIO4                        46
-#define IRQ_DA8XX_GPIO5                        47
-#define IRQ_DA8XX_GPIO6                        48
-#define IRQ_DA8XX_GPIO7                        49
-#define IRQ_DA8XX_GPIO8                        50
-#define IRQ_DA8XX_I2CINT1              51
-#define IRQ_DA8XX_LCDINT               52
-#define IRQ_DA8XX_UARTINT1             53
-#define IRQ_DA8XX_MCASPINT             54
-#define IRQ_DA8XX_ALLINT1              55
-#define IRQ_DA8XX_SPINT1               56
-#define IRQ_DA8XX_UHPI_INT1            57
-#define IRQ_DA8XX_USB_INT              58
-#define IRQ_DA8XX_IRQN                 59
-#define IRQ_DA8XX_RWAKEUP              60
-#define IRQ_DA8XX_UARTINT2             61
-#define IRQ_DA8XX_DFTSSINT             62
-#define IRQ_DA8XX_EHRPWM0              63
-#define IRQ_DA8XX_EHRPWM0TZ            64
-#define IRQ_DA8XX_EHRPWM1              65
-#define IRQ_DA8XX_EHRPWM1TZ            66
-#define IRQ_DA8XX_ECAP0                        69
-#define IRQ_DA8XX_ECAP1                        70
-#define IRQ_DA8XX_ECAP2                        71
-#define IRQ_DA8XX_ARMCLKSTOPREQ                90
-
-/* DA830 specific interrupts */
-#define IRQ_DA830_MPUERR               27
-#define IRQ_DA830_IOPUERR              27
-#define IRQ_DA830_BOOTCFGERR           27
-#define IRQ_DA830_EHRPWM2              67
-#define IRQ_DA830_EHRPWM2TZ            68
-#define IRQ_DA830_EQEP0                        72
-#define IRQ_DA830_EQEP1                        73
-#define IRQ_DA830_T12CMPINT0_0         74
-#define IRQ_DA830_T12CMPINT1_0         75
-#define IRQ_DA830_T12CMPINT2_0         76
-#define IRQ_DA830_T12CMPINT3_0         77
-#define IRQ_DA830_T12CMPINT4_0         78
-#define IRQ_DA830_T12CMPINT5_0         79
-#define IRQ_DA830_T12CMPINT6_0         80
-#define IRQ_DA830_T12CMPINT7_0         81
-#define IRQ_DA830_T12CMPINT0_1         82
-#define IRQ_DA830_T12CMPINT1_1         83
-#define IRQ_DA830_T12CMPINT2_1         84
-#define IRQ_DA830_T12CMPINT3_1         85
-#define IRQ_DA830_T12CMPINT4_1         86
-#define IRQ_DA830_T12CMPINT5_1         87
-#define IRQ_DA830_T12CMPINT6_1         88
-#define IRQ_DA830_T12CMPINT7_1         89
-
-#define DA830_N_CP_INTC_IRQ            96
-
-/* DA850 speicific interrupts */
-#define IRQ_DA850_MPUADDRERR0          27
-#define IRQ_DA850_MPUPROTERR0          27
-#define IRQ_DA850_IOPUADDRERR0         27
-#define IRQ_DA850_IOPUPROTERR0         27
-#define IRQ_DA850_IOPUADDRERR1         27
-#define IRQ_DA850_IOPUPROTERR1         27
-#define IRQ_DA850_IOPUADDRERR2         27
-#define IRQ_DA850_IOPUPROTERR2         27
-#define IRQ_DA850_BOOTCFG_ADDR_ERR     27
-#define IRQ_DA850_BOOTCFG_PROT_ERR     27
-#define IRQ_DA850_MPUADDRERR1          27
-#define IRQ_DA850_MPUPROTERR1          27
-#define IRQ_DA850_IOPUADDRERR3         27
-#define IRQ_DA850_IOPUPROTERR3         27
-#define IRQ_DA850_IOPUADDRERR4         27
-#define IRQ_DA850_IOPUPROTERR4         27
-#define IRQ_DA850_IOPUADDRERR5         27
-#define IRQ_DA850_IOPUPROTERR5         27
-#define IRQ_DA850_MIOPU_BOOTCFG_ERR    27
-#define IRQ_DA850_SATAINT              67
-#define IRQ_DA850_TINT12_2             68
-#define IRQ_DA850_TINT34_2             68
-#define IRQ_DA850_TINTALL_2            68
-#define IRQ_DA850_MMCSDINT0_1          72
-#define IRQ_DA850_MMCSDINT1_1          73
-#define IRQ_DA850_T12CMPINT0_2         74
-#define IRQ_DA850_T12CMPINT1_2         75
-#define IRQ_DA850_T12CMPINT2_2         76
-#define IRQ_DA850_T12CMPINT3_2         77
-#define IRQ_DA850_T12CMPINT4_2         78
-#define IRQ_DA850_T12CMPINT5_2         79
-#define IRQ_DA850_T12CMPINT6_2         80
-#define IRQ_DA850_T12CMPINT7_2         81
-#define IRQ_DA850_T12CMPINT0_3         82
-#define IRQ_DA850_T12CMPINT1_3         83
-#define IRQ_DA850_T12CMPINT2_3         84
-#define IRQ_DA850_T12CMPINT3_3         85
-#define IRQ_DA850_T12CMPINT4_3         86
-#define IRQ_DA850_T12CMPINT5_3         87
-#define IRQ_DA850_T12CMPINT6_3         88
-#define IRQ_DA850_T12CMPINT7_3         89
-#define IRQ_DA850_RPIINT               91
-#define IRQ_DA850_VPIFINT              92
-#define IRQ_DA850_CCINT1               93
-#define IRQ_DA850_CCERRINT1            94
-#define IRQ_DA850_TCERRINT2            95
-#define IRQ_DA850_TINT12_3             96
-#define IRQ_DA850_TINT34_3             96
-#define IRQ_DA850_TINTALL_3            96
-#define IRQ_DA850_MCBSP0RINT           97
-#define IRQ_DA850_MCBSP0XINT           98
-#define IRQ_DA850_MCBSP1RINT           99
-#define IRQ_DA850_MCBSP1XINT           100
-
-#define DA850_N_CP_INTC_IRQ            101
-
-/* da850 currently has the most gpio pins (144) */
-#define DAVINCI_N_GPIO                 144
-/* da850 currently has the most irqs so use DA850_N_CP_INTC_IRQ */
-
-#endif /* __ASM_ARCH_IRQS_H */
index 34b0eec4de4eb5442c0c245e72c6b6b3686736d0..5bfbd9c70a2e021d8640531194c7231005efdc2a 100644 (file)
 #include <mach/hardware.h>
 #include <mach/cputype.h>
 #include <mach/common.h>
-#include <mach/irqs.h>
 #include <asm/mach/irq.h>
 #include <asm/exception.h>
 
+#include "irqs.h"
+
 #define FIQ_REG0_OFFSET                0x0000
 #define FIQ_REG1_OFFSET                0x0004
 #define IRQ_REG0_OFFSET                0x0008
diff --git a/arch/arm/mach-davinci/irqs.h b/arch/arm/mach-davinci/irqs.h
new file mode 100644 (file)
index 0000000..8f9fc7a
--- /dev/null
@@ -0,0 +1,405 @@
+/*
+ * DaVinci interrupt controller definitions
+ *
+ *  Copyright (C) 2006 Texas Instruments.
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#ifndef __ASM_ARCH_IRQS_H
+#define __ASM_ARCH_IRQS_H
+
+/* Base address */
+#define DAVINCI_ARM_INTC_BASE 0x01C48000
+
+/* Interrupt lines */
+#define IRQ_VDINT0       0
+#define IRQ_VDINT1       1
+#define IRQ_VDINT2       2
+#define IRQ_HISTINT      3
+#define IRQ_H3AINT       4
+#define IRQ_PRVUINT      5
+#define IRQ_RSZINT       6
+#define IRQ_VFOCINT      7
+#define IRQ_VENCINT      8
+#define IRQ_ASQINT       9
+#define IRQ_IMXINT       10
+#define IRQ_VLCDINT      11
+#define IRQ_USBINT       12
+#define IRQ_EMACINT      13
+
+#define IRQ_CCINT0       16
+#define IRQ_CCERRINT     17
+#define IRQ_TCERRINT0    18
+#define IRQ_TCERRINT     19
+#define IRQ_PSCIN        20
+
+#define IRQ_IDE          22
+#define IRQ_HPIINT       23
+#define IRQ_MBXINT       24
+#define IRQ_MBRINT       25
+#define IRQ_MMCINT       26
+#define IRQ_SDIOINT      27
+#define IRQ_MSINT        28
+#define IRQ_DDRINT       29
+#define IRQ_AEMIFINT     30
+#define IRQ_VLQINT       31
+#define IRQ_TINT0_TINT12 32
+#define IRQ_TINT0_TINT34 33
+#define IRQ_TINT1_TINT12 34
+#define IRQ_TINT1_TINT34 35
+#define IRQ_PWMINT0      36
+#define IRQ_PWMINT1      37
+#define IRQ_PWMINT2      38
+#define IRQ_I2C          39
+#define IRQ_UARTINT0     40
+#define IRQ_UARTINT1     41
+#define IRQ_UARTINT2     42
+#define IRQ_SPINT0       43
+#define IRQ_SPINT1       44
+
+#define IRQ_DSP2ARM0     46
+#define IRQ_DSP2ARM1     47
+#define IRQ_GPIO0        48
+#define IRQ_GPIO1        49
+#define IRQ_GPIO2        50
+#define IRQ_GPIO3        51
+#define IRQ_GPIO4        52
+#define IRQ_GPIO5        53
+#define IRQ_GPIO6        54
+#define IRQ_GPIO7        55
+#define IRQ_GPIOBNK0     56
+#define IRQ_GPIOBNK1     57
+#define IRQ_GPIOBNK2     58
+#define IRQ_GPIOBNK3     59
+#define IRQ_GPIOBNK4     60
+#define IRQ_COMMTX       61
+#define IRQ_COMMRX       62
+#define IRQ_EMUINT       63
+
+#define DAVINCI_N_AINTC_IRQ    64
+
+#define ARCH_TIMER_IRQ IRQ_TINT1_TINT34
+
+/* DaVinci DM6467-specific Interrupts */
+#define IRQ_DM646X_VP_VERTINT0  0
+#define IRQ_DM646X_VP_VERTINT1  1
+#define IRQ_DM646X_VP_VERTINT2  2
+#define IRQ_DM646X_VP_VERTINT3  3
+#define IRQ_DM646X_VP_ERRINT    4
+#define IRQ_DM646X_RESERVED_1   5
+#define IRQ_DM646X_RESERVED_2   6
+#define IRQ_DM646X_WDINT        7
+#define IRQ_DM646X_CRGENINT0    8
+#define IRQ_DM646X_CRGENINT1    9
+#define IRQ_DM646X_TSIFINT0     10
+#define IRQ_DM646X_TSIFINT1     11
+#define IRQ_DM646X_VDCEINT      12
+#define IRQ_DM646X_USBINT       13
+#define IRQ_DM646X_USBDMAINT    14
+#define IRQ_DM646X_PCIINT       15
+#define IRQ_DM646X_TCERRINT2    20
+#define IRQ_DM646X_TCERRINT3    21
+#define IRQ_DM646X_IDE          22
+#define IRQ_DM646X_HPIINT       23
+#define IRQ_DM646X_EMACRXTHINT  24
+#define IRQ_DM646X_EMACRXINT    25
+#define IRQ_DM646X_EMACTXINT    26
+#define IRQ_DM646X_EMACMISCINT  27
+#define IRQ_DM646X_MCASP0TXINT  28
+#define IRQ_DM646X_MCASP0RXINT  29
+#define IRQ_DM646X_MCASP1TXINT  30
+#define IRQ_DM646X_RESERVED_3   31
+#define IRQ_DM646X_VLQINT       38
+#define IRQ_DM646X_UARTINT2     42
+#define IRQ_DM646X_SPINT0       43
+#define IRQ_DM646X_SPINT1       44
+#define IRQ_DM646X_DSP2ARMINT   45
+#define IRQ_DM646X_RESERVED_4   46
+#define IRQ_DM646X_PSCINT       47
+#define IRQ_DM646X_GPIO0        48
+#define IRQ_DM646X_GPIO1        49
+#define IRQ_DM646X_GPIO2        50
+#define IRQ_DM646X_GPIO3        51
+#define IRQ_DM646X_GPIO4        52
+#define IRQ_DM646X_GPIO5        53
+#define IRQ_DM646X_GPIO6        54
+#define IRQ_DM646X_GPIO7        55
+#define IRQ_DM646X_GPIOBNK0     56
+#define IRQ_DM646X_GPIOBNK1     57
+#define IRQ_DM646X_GPIOBNK2     58
+#define IRQ_DM646X_DDRINT       59
+#define IRQ_DM646X_AEMIFINT     60
+
+/* DaVinci DM355-specific Interrupts */
+#define IRQ_DM355_CCDC_VDINT0  0
+#define IRQ_DM355_CCDC_VDINT1  1
+#define IRQ_DM355_CCDC_VDINT2  2
+#define IRQ_DM355_IPIPE_HST    3
+#define IRQ_DM355_H3AINT       4
+#define IRQ_DM355_IPIPE_SDR    5
+#define IRQ_DM355_IPIPEIFINT   6
+#define IRQ_DM355_OSDINT       7
+#define IRQ_DM355_VENCINT      8
+#define IRQ_DM355_IMCOPINT     11
+#define IRQ_DM355_RTOINT       13
+#define IRQ_DM355_TINT4                13
+#define IRQ_DM355_TINT2_TINT12 13
+#define IRQ_DM355_UARTINT2     14
+#define IRQ_DM355_TINT5                14
+#define IRQ_DM355_TINT2_TINT34 14
+#define IRQ_DM355_TINT6                15
+#define IRQ_DM355_TINT3_TINT12 15
+#define IRQ_DM355_SPINT1_0     17
+#define IRQ_DM355_SPINT1_1     18
+#define IRQ_DM355_SPINT2_0     19
+#define IRQ_DM355_SPINT2_1     21
+#define IRQ_DM355_TINT7                22
+#define IRQ_DM355_TINT3_TINT34 22
+#define IRQ_DM355_SDIOINT0     23
+#define IRQ_DM355_MMCINT0      26
+#define IRQ_DM355_MSINT                26
+#define IRQ_DM355_MMCINT1      27
+#define IRQ_DM355_PWMINT3      28
+#define IRQ_DM355_SDIOINT1     31
+#define IRQ_DM355_SPINT0_0     42
+#define IRQ_DM355_SPINT0_1     43
+#define IRQ_DM355_GPIO0                44
+#define IRQ_DM355_GPIO1                45
+#define IRQ_DM355_GPIO2                46
+#define IRQ_DM355_GPIO3                47
+#define IRQ_DM355_GPIO4                48
+#define IRQ_DM355_GPIO5                49
+#define IRQ_DM355_GPIO6                50
+#define IRQ_DM355_GPIO7                51
+#define IRQ_DM355_GPIO8                52
+#define IRQ_DM355_GPIO9                53
+#define IRQ_DM355_GPIOBNK0     54
+#define IRQ_DM355_GPIOBNK1     55
+#define IRQ_DM355_GPIOBNK2     56
+#define IRQ_DM355_GPIOBNK3     57
+#define IRQ_DM355_GPIOBNK4     58
+#define IRQ_DM355_GPIOBNK5     59
+#define IRQ_DM355_GPIOBNK6     60
+
+/* DaVinci DM365-specific Interrupts */
+#define IRQ_DM365_INSFINT      7
+#define IRQ_DM365_IMXINT1      8
+#define IRQ_DM365_IMXINT0      10
+#define IRQ_DM365_KLD_ARMINT   10
+#define IRQ_DM365_IMCOPINT     11
+#define IRQ_DM365_RTOINT       13
+#define IRQ_DM365_TINT5                14
+#define IRQ_DM365_TINT6                15
+#define IRQ_DM365_SPINT2_1     21
+#define IRQ_DM365_TINT7                22
+#define IRQ_DM365_SDIOINT0     23
+#define IRQ_DM365_MMCINT1      27
+#define IRQ_DM365_PWMINT3      28
+#define IRQ_DM365_RTCINT       29
+#define IRQ_DM365_SDIOINT1     31
+#define IRQ_DM365_SPIINT0_0    42
+#define IRQ_DM365_SPIINT3_0    43
+#define IRQ_DM365_GPIO0                44
+#define IRQ_DM365_GPIO1                45
+#define IRQ_DM365_GPIO2                46
+#define IRQ_DM365_GPIO3                47
+#define IRQ_DM365_GPIO4                48
+#define IRQ_DM365_GPIO5                49
+#define IRQ_DM365_GPIO6                50
+#define IRQ_DM365_GPIO7                51
+#define IRQ_DM365_EMAC_RXTHRESH        52
+#define IRQ_DM365_EMAC_RXPULSE 53
+#define IRQ_DM365_EMAC_TXPULSE 54
+#define IRQ_DM365_EMAC_MISCPULSE 55
+#define IRQ_DM365_GPIO12       56
+#define IRQ_DM365_GPIO13       57
+#define IRQ_DM365_GPIO14       58
+#define IRQ_DM365_GPIO15       59
+#define IRQ_DM365_ADCINT       59
+#define IRQ_DM365_KEYINT       60
+#define IRQ_DM365_TCERRINT2    61
+#define IRQ_DM365_TCERRINT3    62
+#define IRQ_DM365_EMUINT       63
+
+/* DA8XX interrupts */
+#define IRQ_DA8XX_COMMTX               0
+#define IRQ_DA8XX_COMMRX               1
+#define IRQ_DA8XX_NINT                 2
+#define IRQ_DA8XX_EVTOUT0              3
+#define IRQ_DA8XX_EVTOUT1              4
+#define IRQ_DA8XX_EVTOUT2              5
+#define IRQ_DA8XX_EVTOUT3              6
+#define IRQ_DA8XX_EVTOUT4              7
+#define IRQ_DA8XX_EVTOUT5              8
+#define IRQ_DA8XX_EVTOUT6              9
+#define IRQ_DA8XX_EVTOUT7              10
+#define IRQ_DA8XX_CCINT0               11
+#define IRQ_DA8XX_CCERRINT             12
+#define IRQ_DA8XX_TCERRINT0            13
+#define IRQ_DA8XX_AEMIFINT             14
+#define IRQ_DA8XX_I2CINT0              15
+#define IRQ_DA8XX_MMCSDINT0            16
+#define IRQ_DA8XX_MMCSDINT1            17
+#define IRQ_DA8XX_ALLINT0              18
+#define IRQ_DA8XX_RTC                  19
+#define IRQ_DA8XX_SPINT0               20
+#define IRQ_DA8XX_TINT12_0             21
+#define IRQ_DA8XX_TINT34_0             22
+#define IRQ_DA8XX_TINT12_1             23
+#define IRQ_DA8XX_TINT34_1             24
+#define IRQ_DA8XX_UARTINT0             25
+#define IRQ_DA8XX_KEYMGRINT            26
+#define IRQ_DA8XX_SECINT               26
+#define IRQ_DA8XX_SECKEYERR            26
+#define IRQ_DA8XX_CHIPINT0             28
+#define IRQ_DA8XX_CHIPINT1             29
+#define IRQ_DA8XX_CHIPINT2             30
+#define IRQ_DA8XX_CHIPINT3             31
+#define IRQ_DA8XX_TCERRINT1            32
+#define IRQ_DA8XX_C0_RX_THRESH_PULSE   33
+#define IRQ_DA8XX_C0_RX_PULSE          34
+#define IRQ_DA8XX_C0_TX_PULSE          35
+#define IRQ_DA8XX_C0_MISC_PULSE                36
+#define IRQ_DA8XX_C1_RX_THRESH_PULSE   37
+#define IRQ_DA8XX_C1_RX_PULSE          38
+#define IRQ_DA8XX_C1_TX_PULSE          39
+#define IRQ_DA8XX_C1_MISC_PULSE                40
+#define IRQ_DA8XX_MEMERR               41
+#define IRQ_DA8XX_GPIO0                        42
+#define IRQ_DA8XX_GPIO1                        43
+#define IRQ_DA8XX_GPIO2                        44
+#define IRQ_DA8XX_GPIO3                        45
+#define IRQ_DA8XX_GPIO4                        46
+#define IRQ_DA8XX_GPIO5                        47
+#define IRQ_DA8XX_GPIO6                        48
+#define IRQ_DA8XX_GPIO7                        49
+#define IRQ_DA8XX_GPIO8                        50
+#define IRQ_DA8XX_I2CINT1              51
+#define IRQ_DA8XX_LCDINT               52
+#define IRQ_DA8XX_UARTINT1             53
+#define IRQ_DA8XX_MCASPINT             54
+#define IRQ_DA8XX_ALLINT1              55
+#define IRQ_DA8XX_SPINT1               56
+#define IRQ_DA8XX_UHPI_INT1            57
+#define IRQ_DA8XX_USB_INT              58
+#define IRQ_DA8XX_IRQN                 59
+#define IRQ_DA8XX_RWAKEUP              60
+#define IRQ_DA8XX_UARTINT2             61
+#define IRQ_DA8XX_DFTSSINT             62
+#define IRQ_DA8XX_EHRPWM0              63
+#define IRQ_DA8XX_EHRPWM0TZ            64
+#define IRQ_DA8XX_EHRPWM1              65
+#define IRQ_DA8XX_EHRPWM1TZ            66
+#define IRQ_DA8XX_ECAP0                        69
+#define IRQ_DA8XX_ECAP1                        70
+#define IRQ_DA8XX_ECAP2                        71
+#define IRQ_DA8XX_ARMCLKSTOPREQ                90
+
+/* DA830 specific interrupts */
+#define IRQ_DA830_MPUERR               27
+#define IRQ_DA830_IOPUERR              27
+#define IRQ_DA830_BOOTCFGERR           27
+#define IRQ_DA830_EHRPWM2              67
+#define IRQ_DA830_EHRPWM2TZ            68
+#define IRQ_DA830_EQEP0                        72
+#define IRQ_DA830_EQEP1                        73
+#define IRQ_DA830_T12CMPINT0_0         74
+#define IRQ_DA830_T12CMPINT1_0         75
+#define IRQ_DA830_T12CMPINT2_0         76
+#define IRQ_DA830_T12CMPINT3_0         77
+#define IRQ_DA830_T12CMPINT4_0         78
+#define IRQ_DA830_T12CMPINT5_0         79
+#define IRQ_DA830_T12CMPINT6_0         80
+#define IRQ_DA830_T12CMPINT7_0         81
+#define IRQ_DA830_T12CMPINT0_1         82
+#define IRQ_DA830_T12CMPINT1_1         83
+#define IRQ_DA830_T12CMPINT2_1         84
+#define IRQ_DA830_T12CMPINT3_1         85
+#define IRQ_DA830_T12CMPINT4_1         86
+#define IRQ_DA830_T12CMPINT5_1         87
+#define IRQ_DA830_T12CMPINT6_1         88
+#define IRQ_DA830_T12CMPINT7_1         89
+
+#define DA830_N_CP_INTC_IRQ            96
+
+/* DA850 speicific interrupts */
+#define IRQ_DA850_MPUADDRERR0          27
+#define IRQ_DA850_MPUPROTERR0          27
+#define IRQ_DA850_IOPUADDRERR0         27
+#define IRQ_DA850_IOPUPROTERR0         27
+#define IRQ_DA850_IOPUADDRERR1         27
+#define IRQ_DA850_IOPUPROTERR1         27
+#define IRQ_DA850_IOPUADDRERR2         27
+#define IRQ_DA850_IOPUPROTERR2         27
+#define IRQ_DA850_BOOTCFG_ADDR_ERR     27
+#define IRQ_DA850_BOOTCFG_PROT_ERR     27
+#define IRQ_DA850_MPUADDRERR1          27
+#define IRQ_DA850_MPUPROTERR1          27
+#define IRQ_DA850_IOPUADDRERR3         27
+#define IRQ_DA850_IOPUPROTERR3         27
+#define IRQ_DA850_IOPUADDRERR4         27
+#define IRQ_DA850_IOPUPROTERR4         27
+#define IRQ_DA850_IOPUADDRERR5         27
+#define IRQ_DA850_IOPUPROTERR5         27
+#define IRQ_DA850_MIOPU_BOOTCFG_ERR    27
+#define IRQ_DA850_SATAINT              67
+#define IRQ_DA850_TINT12_2             68
+#define IRQ_DA850_TINT34_2             68
+#define IRQ_DA850_TINTALL_2            68
+#define IRQ_DA850_MMCSDINT0_1          72
+#define IRQ_DA850_MMCSDINT1_1          73
+#define IRQ_DA850_T12CMPINT0_2         74
+#define IRQ_DA850_T12CMPINT1_2         75
+#define IRQ_DA850_T12CMPINT2_2         76
+#define IRQ_DA850_T12CMPINT3_2         77
+#define IRQ_DA850_T12CMPINT4_2         78
+#define IRQ_DA850_T12CMPINT5_2         79
+#define IRQ_DA850_T12CMPINT6_2         80
+#define IRQ_DA850_T12CMPINT7_2         81
+#define IRQ_DA850_T12CMPINT0_3         82
+#define IRQ_DA850_T12CMPINT1_3         83
+#define IRQ_DA850_T12CMPINT2_3         84
+#define IRQ_DA850_T12CMPINT3_3         85
+#define IRQ_DA850_T12CMPINT4_3         86
+#define IRQ_DA850_T12CMPINT5_3         87
+#define IRQ_DA850_T12CMPINT6_3         88
+#define IRQ_DA850_T12CMPINT7_3         89
+#define IRQ_DA850_RPIINT               91
+#define IRQ_DA850_VPIFINT              92
+#define IRQ_DA850_CCINT1               93
+#define IRQ_DA850_CCERRINT1            94
+#define IRQ_DA850_TCERRINT2            95
+#define IRQ_DA850_TINT12_3             96
+#define IRQ_DA850_TINT34_3             96
+#define IRQ_DA850_TINTALL_3            96
+#define IRQ_DA850_MCBSP0RINT           97
+#define IRQ_DA850_MCBSP0XINT           98
+#define IRQ_DA850_MCBSP1RINT           99
+#define IRQ_DA850_MCBSP1XINT           100
+
+#define DA850_N_CP_INTC_IRQ            101
+
+/* da850 currently has the most gpio pins (144) */
+#define DAVINCI_N_GPIO                 144
+/* da850 currently has the most irqs so use DA850_N_CP_INTC_IRQ */
+
+#endif /* __ASM_ARCH_IRQS_H */
index 2de5a04ffc24d74dc48bca3fce2b8151455dd33c..25f21ee86f1ab7a709bb5258fd598d91127f3bcd 100644 (file)
@@ -18,7 +18,8 @@
 #include <mach/common.h>
 #include <mach/cputype.h>
 #include <mach/da8xx.h>
-#include <mach/irqs.h>
+
+#include "irqs.h"
 
 #define DA8XX_USB0_BASE                0x01e00000
 #define DA8XX_USB1_BASE                0x01e25000
index 9d4a58a3113ad1cd79618da5e99e56501c464e10..dd8db61cdd1c7bfb8f00fcecc11948c5c8711d04 100644 (file)
@@ -2,16 +2,16 @@
 /*
  * USB
  */
+#include <linux/dma-mapping.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/dma-mapping.h>
-
+#include <linux/platform_data/usb-davinci.h>
 #include <linux/usb/musb.h>
 
 #include <mach/common.h>
-#include <mach/irqs.h>
 #include <mach/cputype.h>
-#include <linux/platform_data/usb-davinci.h>
+
+#include "irqs.h"
 
 #define DAVINCI_USB_OTG_BASE   0x01c64000