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

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

ARM: davinci: cp-intc: remove cp_intc.h 



There's no need to have a local header for cp-intc. Move the only
declaration for a public function to common.h. Move all register
offsets into the driver source file and drop all unused defines.
Make cp_intc_of_init() static.

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 0145beed

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

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <mach/mux.h>

#include <mach/da8xx.h>



#include "cp_intc.h"

#include "irqs.h"



#define DA830_EVM_PHY_ID		""

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

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include <mach/da8xx.h>

#include <mach/mux.h>



#include "cp_intc.h"

#include "irqs.h"

#include "sram.h"

arch/arm/mach-davinci/board-mityomapl138.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <mach/common.h>

#include "cp_intc.h"

#include <mach/da8xx.h>

#include <linux/platform_data/mtd-davinci.h>

#include <linux/platform_data/mtd-davinci-aemif.h>

arch/arm/mach-davinci/board-omapl138-hawk.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <asm/mach/arch.h>



#include <mach/common.h>

#include "cp_intc.h"

#include <mach/da8xx.h>

#include <mach/mux.h>

arch/arm/mach-davinci/cp_intc.c

+18 −2
Original line number Diff line number Diff line
@@ -21,7 +21,22 @@ 


#include <asm/exception.h>

#include <mach/common.h>

#include "cp_intc.h"



#define CP_INTC_CTRL			0x04

#define CP_INTC_HOST_CTRL		0x0C

#define CP_INTC_GLOBAL_ENABLE		0x10

#define CP_INTC_SYS_STAT_IDX_CLR	0x24

#define CP_INTC_SYS_ENABLE_IDX_SET	0x28

#define CP_INTC_SYS_ENABLE_IDX_CLR	0x2C

#define CP_INTC_HOST_ENABLE_IDX_SET	0x34

#define CP_INTC_HOST_ENABLE_IDX_CLR	0x38

#define CP_INTC_PRIO_IDX		0x80

#define CP_INTC_SYS_STAT_CLR(n)		(0x0280 + (n << 2))

#define CP_INTC_SYS_ENABLE_CLR(n)	(0x0380 + (n << 2))

#define CP_INTC_CHAN_MAP(n)		(0x0400 + (n << 2))

#define CP_INTC_SYS_POLARITY(n)		(0x0D00 + (n << 2))

#define CP_INTC_SYS_TYPE(n)		(0x0D80 + (n << 2))

#define CP_INTC_HOST_ENABLE(n)		(0x1500 + (n << 2))



#define DAVINCI_CP_INTC_PRI_INDX_MASK		GENMASK(9, 0)

#define DAVINCI_CP_INTC_GPIR_NONE		BIT(31)
@@ -141,7 +156,8 @@ static const struct irq_domain_ops cp_intc_host_ops = { 
	.xlate = irq_domain_xlate_onetwocell,

};



int __init cp_intc_of_init(struct device_node *node, struct device_node *parent)

static int __init cp_intc_of_init(struct device_node *node,

				  struct device_node *parent)

{

	u32 num_irq		= davinci_soc_info.intc_irq_num;

	u8 *irq_prio		= davinci_soc_info.intc_irq_prios;