Commit 544ca0b0 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Sekhar Nori

ARM: davinci: make irqs.h a local header

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: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent e87addec
...@@ -36,11 +36,12 @@ ...@@ -36,11 +36,12 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/common.h> #include <mach/common.h>
#include <mach/irqs.h>
#include "cp_intc.h"
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/da8xx.h> #include <mach/da8xx.h>
#include "cp_intc.h"
#include "irqs.h"
#define DA830_EVM_PHY_ID "" #define DA830_EVM_PHY_ID ""
/* /*
* USB1 VBUS is controlled by GPIO1[15], over-current is reported on GPIO2[4]. * USB1 VBUS is controlled by GPIO1[15], over-current is reported on GPIO2[4].
......
...@@ -43,10 +43,11 @@ ...@@ -43,10 +43,11 @@
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#include <mach/common.h> #include <mach/common.h>
#include "cp_intc.h"
#include <mach/da8xx.h> #include <mach/da8xx.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/irqs.h>
#include "cp_intc.h"
#include "irqs.h"
#include "sram.h" #include "sram.h"
#include <asm/mach-types.h> #include <asm/mach-types.h>
......
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/common.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/mux.h>
#include <mach/serial.h>
#include <linux/platform_data/i2c-davinci.h>
#include <linux/platform_data/mtd-davinci.h> #include <linux/platform_data/mtd-davinci.h>
#include <linux/platform_data/mmc-davinci.h> #include <linux/platform_data/mmc-davinci.h>
#include <linux/platform_data/usb-davinci.h> #include <linux/platform_data/usb-davinci.h>
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#include <linux/platform_data/ti-aemif.h> #include <linux/platform_data/ti-aemif.h>
#include "davinci.h" #include "davinci.h"
#include "irqs.h"
#define DM644X_EVM_PHY_ID "davinci_mdio-0:01" #define DM644X_EVM_PHY_ID "davinci_mdio-0:01"
#define LXT971_PHY_ID (0x001378e2) #define LXT971_PHY_ID (0x001378e2)
......
...@@ -44,10 +44,10 @@ ...@@ -44,10 +44,10 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/common.h> #include <mach/common.h>
#include <mach/irqs.h>
#include <mach/serial.h> #include <mach/serial.h>
#include "davinci.h" #include "davinci.h"
#include "irqs.h"
#define NAND_BLOCK_SIZE SZ_128K #define NAND_BLOCK_SIZE SZ_128K
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#include <mach/common.h> #include <mach/common.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/da8xx.h> #include <mach/da8xx.h>
#include <mach/irqs.h>
#include <mach/time.h> #include <mach/time.h>
#include "irqs.h"
#include "mux.h" #include "mux.h"
/* Offsets of the 8 compare registers on the da830 */ /* Offsets of the 8 compare registers on the da830 */
......
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
#include <mach/cpufreq.h> #include <mach/cpufreq.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/da8xx.h> #include <mach/da8xx.h>
#include <mach/irqs.h>
#include <mach/pm.h> #include <mach/pm.h>
#include <mach/time.h> #include <mach/time.h>
#include "irqs.h"
#include "mux.h" #include "mux.h"
#define DA850_PLL1_BASE 0x01e1a000 #define DA850_PLL1_BASE 0x01e1a000
......
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/da8xx.h> #include <mach/da8xx.h>
#include <mach/time.h> #include <mach/time.h>
#include <mach/irqs.h>
#include "asp.h" #include "asp.h"
#include "cpuidle.h" #include "cpuidle.h"
#include "irqs.h"
#include "sram.h" #include "sram.h"
#define DA8XX_TPCC_BASE 0x01c00000 #define DA8XX_TPCC_BASE 0x01c00000
......
...@@ -11,21 +11,20 @@ ...@@ -11,21 +11,20 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_device.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/dma-mapping.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <linux/platform_data/i2c-davinci.h>
#include <mach/irqs.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <linux/platform_data/mmc-davinci.h>
#include <mach/time.h> #include <mach/time.h>
#include <linux/platform_data/edma.h>
#include "davinci.h" #include "davinci.h"
#include "irqs.h"
#define DAVINCI_I2C_BASE 0x01C21000 #define DAVINCI_I2C_BASE 0x01C21000
#define DAVINCI_ATA_BASE 0x01C66000 #define DAVINCI_ATA_BASE 0x01C66000
......
...@@ -26,13 +26,13 @@ ...@@ -26,13 +26,13 @@
#include <mach/common.h> #include <mach/common.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/irqs.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/serial.h> #include <mach/serial.h>
#include <mach/time.h> #include <mach/time.h>
#include "asp.h" #include "asp.h"
#include "davinci.h" #include "davinci.h"
#include "irqs.h"
#include "mux.h" #include "mux.h"
#define DM355_UART2_BASE (IO_PHYS + 0x206000) #define DM355_UART2_BASE (IO_PHYS + 0x206000)
......
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
#include <mach/common.h> #include <mach/common.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/irqs.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/serial.h> #include <mach/serial.h>
#include <mach/time.h> #include <mach/time.h>
#include "asp.h" #include "asp.h"
#include "davinci.h" #include "davinci.h"
#include "irqs.h"
#include "mux.h" #include "mux.h"
#define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */ #define DM365_REF_FREQ 24000000 /* 24 MHz on the DM365 EVM */
......
...@@ -23,13 +23,13 @@ ...@@ -23,13 +23,13 @@
#include <mach/common.h> #include <mach/common.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/irqs.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/serial.h> #include <mach/serial.h>
#include <mach/time.h> #include <mach/time.h>
#include "asp.h" #include "asp.h"
#include "davinci.h" #include "davinci.h"
#include "irqs.h"
#include "mux.h" #include "mux.h"
/* /*
......
...@@ -24,13 +24,13 @@ ...@@ -24,13 +24,13 @@
#include <mach/common.h> #include <mach/common.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/irqs.h>
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/serial.h> #include <mach/serial.h>
#include <mach/time.h> #include <mach/time.h>
#include "asp.h" #include "asp.h"
#include "davinci.h" #include "davinci.h"
#include "irqs.h"
#include "mux.h" #include "mux.h"
#define DAVINCI_VPIF_BASE (0x01C12000) #define DAVINCI_VPIF_BASE (0x01C12000)
......
...@@ -28,10 +28,11 @@ ...@@ -28,10 +28,11 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/common.h> #include <mach/common.h>
#include <mach/irqs.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <asm/exception.h> #include <asm/exception.h>
#include "irqs.h"
#define FIQ_REG0_OFFSET 0x0000 #define FIQ_REG0_OFFSET 0x0000
#define FIQ_REG1_OFFSET 0x0004 #define FIQ_REG1_OFFSET 0x0004
#define IRQ_REG0_OFFSET 0x0008 #define IRQ_REG0_OFFSET 0x0008
......
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
#include <mach/common.h> #include <mach/common.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/da8xx.h> #include <mach/da8xx.h>
#include <mach/irqs.h>
#include "irqs.h"
#define DA8XX_USB0_BASE 0x01e00000 #define DA8XX_USB0_BASE 0x01e00000
#define DA8XX_USB1_BASE 0x01e25000 #define DA8XX_USB1_BASE 0x01e25000
......
...@@ -2,16 +2,16 @@ ...@@ -2,16 +2,16 @@
/* /*
* USB * USB
*/ */
#include <linux/dma-mapping.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/dma-mapping.h> #include <linux/platform_data/usb-davinci.h>
#include <linux/usb/musb.h> #include <linux/usb/musb.h>
#include <mach/common.h> #include <mach/common.h>
#include <mach/irqs.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <linux/platform_data/usb-davinci.h>
#include "irqs.h"
#define DAVINCI_USB_OTG_BASE 0x01c64000 #define DAVINCI_USB_OTG_BASE 0x01c64000
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment