Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-04 04:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: davinci: make irqs.h a local header

Browse Source 
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>
This commit is contained in:
Bartosz Golaszewski 2019-02-14 15:52:03 +01:00 committed by Sekhar Nori
parent e87addec38
commit 544ca0b0d8
16 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-davinci/board-da830-evm.c
View File

@ -36,11 +36,12 @@
#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].

5
arch/arm/mach-davinci/board-da850-evm.c
View File

@ -43,10 +43,11 @@
#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>

7
arch/arm/mach-davinci/board-dm644x-evm.c
View File

@ -36,10 +36,10 @@
#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)

2
arch/arm/mach-davinci/board-dm646x-evm.c
View File

@ -44,10 +44,10 @@
#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

2
arch/arm/mach-davinci/da830.c
View 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 */

2
arch/arm/mach-davinci/da850.c
View File

@ -32,10 +32,10 @@
#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

2
arch/arm/mach-davinci/devices-da8xx.c
View File

@ -25,10 +25,10 @@
#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

9
arch/arm/mach-davinci/devices.c
View File

@ -11,21 +11,20 @@
#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

2
arch/arm/mach-davinci/dm355.c
View File

@ -26,13 +26,13 @@
#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)

2
arch/arm/mach-davinci/dm365.c
View File

@ -31,13 +31,13 @@
#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 */

2
arch/arm/mach-davinci/dm644x.c
View File

@ -23,13 +23,13 @@
#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"
/*

2
arch/arm/mach-davinci/dm646x.c
View File

@ -24,13 +24,13 @@
#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)

3
arch/arm/mach-davinci/irq.c
View File

@ -28,10 +28,11 @@
#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

0
arch/arm/mach-davinci/include/mach/irqs.h → arch/arm/mach-davinci/irqs.h
View File

3
arch/arm/mach-davinci/usb-da8xx.c
View 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

8
arch/arm/mach-davinci/usb.c
View 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