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

Commit 9d631b83 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

[ARM] MXC: remove dependency to other include files from irqs.h 



This patch removes the inclusion of mach/hardware.h from mach/irqs.h and
switches to more meaningful names for the irq related macros.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 7c995023

arch/arm/mach-mx1/devices.c

+4 −4
Original line number Diff line number Diff line
@@ -232,25 +232,25 @@ static struct mxc_gpio_port imx_gpio_ports[] = { 
		.chip.label = "gpio-0",

		.base = (void __iomem *)IO_ADDRESS(GPIO_BASE_ADDR),

		.irq = GPIO_INT_PORTA,

		.virtual_irq_start = MXC_MAX_INT_LINES

		.virtual_irq_start = MXC_GPIO_IRQ_START

	},

	[1] = {

		.chip.label = "gpio-1",

		.base = (void __iomem *)IO_ADDRESS(GPIO_BASE_ADDR + 0x100),

		.irq = GPIO_INT_PORTB,

		.virtual_irq_start = MXC_MAX_INT_LINES + 32

		.virtual_irq_start = MXC_GPIO_IRQ_START + 32

	},

	[2] = {

		.chip.label = "gpio-2",

		.base = (void __iomem *)IO_ADDRESS(GPIO_BASE_ADDR + 0x200),

		.irq = GPIO_INT_PORTC,

		.virtual_irq_start = MXC_MAX_INT_LINES + 64

		.virtual_irq_start = MXC_GPIO_IRQ_START + 64

	},

	[3] = {

		.chip.label = "gpio-3",

		.base = (void __iomem *)IO_ADDRESS(GPIO_BASE_ADDR + 0x300),

		.irq = GPIO_INT_PORTD,

		.virtual_irq_start = MXC_MAX_INT_LINES + 96

		.virtual_irq_start = MXC_GPIO_IRQ_START + 96

	}

};

arch/arm/mach-mx2/devices.c

+6 −6
Original line number Diff line number Diff line
@@ -230,32 +230,32 @@ static struct mxc_gpio_port imx_gpio_ports[] = { 
		.chip.label = "gpio-0",

		.irq = MXC_INT_GPIO,

		.base = (void*)(AIPI_BASE_ADDR_VIRT + 0x15000 + 0x100 * 0),

		.virtual_irq_start = MXC_MAX_INT_LINES,

		.virtual_irq_start = MXC_GPIO_IRQ_START,

	},

	[1] = {

		.chip.label = "gpio-1",

		.base = (void*)(AIPI_BASE_ADDR_VIRT + 0x15000 + 0x100 * 1),

		.virtual_irq_start = MXC_MAX_INT_LINES + 32,

		.virtual_irq_start = MXC_GPIO_IRQ_START + 32,

	},

	[2] = {

		.chip.label = "gpio-2",

		.base = (void*)(AIPI_BASE_ADDR_VIRT + 0x15000 + 0x100 * 2),

		.virtual_irq_start = MXC_MAX_INT_LINES + 64,

		.virtual_irq_start = MXC_GPIO_IRQ_START + 64,

	},

	[3] = {

		.chip.label = "gpio-3",

		.base = (void*)(AIPI_BASE_ADDR_VIRT + 0x15000 + 0x100 * 3),

		.virtual_irq_start = MXC_MAX_INT_LINES + 96,

		.virtual_irq_start = MXC_GPIO_IRQ_START + 96,

	},

	[4] = {

		.chip.label = "gpio-4",

		.base = (void*)(AIPI_BASE_ADDR_VIRT + 0x15000 + 0x100 * 4),

		.virtual_irq_start = MXC_MAX_INT_LINES + 128,

		.virtual_irq_start = MXC_GPIO_IRQ_START + 128,

	},

	[5] = {

		.chip.label = "gpio-5",

		.base = (void*)(AIPI_BASE_ADDR_VIRT + 0x15000 + 0x100 * 5),

		.virtual_irq_start = MXC_MAX_INT_LINES + 160,

		.virtual_irq_start = MXC_GPIO_IRQ_START + 160,

	}

};

arch/arm/mach-mx3/devices.c

+3 −3
Original line number Diff line number Diff line
@@ -125,19 +125,19 @@ static struct mxc_gpio_port imx_gpio_ports[] = { 
		.chip.label = "gpio-0",

		.base = IO_ADDRESS(GPIO1_BASE_ADDR),

		.irq = MXC_INT_GPIO1,

		.virtual_irq_start = MXC_GPIO_INT_BASE

		.virtual_irq_start = MXC_GPIO_IRQ_START,

	},

	[1] = {

		.chip.label = "gpio-1",

		.base = IO_ADDRESS(GPIO2_BASE_ADDR),

		.irq = MXC_INT_GPIO2,

		.virtual_irq_start = MXC_GPIO_INT_BASE + GPIO_NUM_PIN

		.virtual_irq_start = MXC_GPIO_IRQ_START + 32,

	},

	[2] = {

		.chip.label = "gpio-2",

		.base = IO_ADDRESS(GPIO3_BASE_ADDR),

		.irq = MXC_INT_GPIO3,

		.virtual_irq_start = MXC_GPIO_INT_BASE + GPIO_NUM_PIN * 2

		.virtual_irq_start = MXC_GPIO_IRQ_START + 64,

	}

};

arch/arm/plat-mxc/include/mach/board-mx27ads.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#define __ASM_ARCH_MXC_BOARD_MX27ADS_H__



/* external interrupt multiplexer */

#define MXC_EXP_IO_BASE		(MXC_GPIO_BASE + MXC_MAX_GPIO_LINES)

#define MXC_EXP_IO_BASE		(MXC_BOARD_IRQ_START)



#define MXC_VIRTUAL_INTS_BASE	(MXC_EXP_IO_BASE + MXC_MAX_EXP_IO_LINES)

#define MXC_SDIO1_CARD_IRQ	MXC_VIRTUAL_INTS_BASE

arch/arm/plat-mxc/include/mach/board-mx31ads.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 
#define PBC_INTMASK_CLEAR_REG	(PBC_INTMASK_CLEAR + PBC_BASE_ADDRESS)

#define EXPIO_PARENT_INT	IOMUX_TO_IRQ(MX31_PIN_GPIO1_4)



#define MXC_EXP_IO_BASE		(MXC_MAX_INT_LINES + MXC_MAX_GPIO_LINES)

#define MXC_EXP_IO_BASE		(MXC_BOARD_IRQ_START)

#define MXC_IRQ_TO_EXPIO(irq)	((irq) - MXC_EXP_IO_BASE)



#define EXPIO_INT_LOW_BAT	(MXC_EXP_IO_BASE + 0)