Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-davinci/board-da830-evm.c

+3 −2
Original line number Diff line number Diff line
@@ -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].

arch/arm/mach-davinci/board-da850-evm.c

+3 −2
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-davinci/board-dm644x-evm.c

+4 −3
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-davinci/board-dm646x-evm.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-davinci/da830.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */