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

Commit e309fb18 authored by Shawn Guo's avatar Shawn Guo Committed by Sascha Hauer
Browse files

arm/mxc: do not use gpio_to_irq() for static initializers 



The patch defines IMX_GPIO_TO_IRQ() in mach/hardware.h and replaces
all the uses of gpio_to_irq() in static initializers with
IMX_GPIO_TO_IRQ().

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 93ee7a93

arch/arm/mach-imx/mach-cpuimx35.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static struct i2c_board_info eukrea_cpuimx35_i2c_devices[] = { 
		I2C_BOARD_INFO("tsc2007", 0x48),

		.type		= "tsc2007",

		.platform_data	= &tsc2007_info,

		.irq		= gpio_to_irq(TSC2007_IRQGPIO),

		.irq		= IMX_GPIO_TO_IRQ(TSC2007_IRQGPIO),

	},

};

arch/arm/mach-imx/mach-mx27_3ds.c

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static struct spi_board_info mx27_3ds_spi_devs[] __initdata = { 
		.bus_num	= 1,

		.chip_select	= 0, /* SS0 */

		.platform_data	= &mc13783_pdata,

		.irq = gpio_to_irq(PMIC_INT),

		.irq = IMX_GPIO_TO_IRQ(PMIC_INT),

		.mode = SPI_CS_HIGH,

	}, {

		.modalias	= "l4f00242t03",

arch/arm/mach-imx/mach-vpr200.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static struct i2c_board_info vpr200_i2c_devices[] = { 
	}, {

		I2C_BOARD_INFO("mc13892", 0x08),

		.platform_data = &vpr200_pmic,

		.irq = gpio_to_irq(GPIO_PMIC_INT),

		.irq = IMX_GPIO_TO_IRQ(GPIO_PMIC_INT),

	}

};

arch/arm/mach-mx5/board-cpuimx51.c

+4 −4
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
static struct plat_serial8250_port serial_platform_data[] = {

	{

		.mapbase = (unsigned long)(MX51_CS1_BASE_ADDR + 0x400000),

		.irq = gpio_to_irq(CPUIMX51_QUARTA_GPIO),

		.irq = IMX_GPIO_TO_IRQ(CPUIMX51_QUARTA_GPIO),

		.irqflags = IRQF_TRIGGER_HIGH,

		.uartclk = CPUIMX51_QUART_XTAL,

		.regshift = CPUIMX51_QUART_REGSHIFT,
@@ -65,7 +65,7 @@ static struct plat_serial8250_port serial_platform_data[] = { 
		.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP,

	}, {

		.mapbase = (unsigned long)(MX51_CS1_BASE_ADDR + 0x800000),

		.irq = gpio_to_irq(CPUIMX51_QUARTB_GPIO),

		.irq = IMX_GPIO_TO_IRQ(CPUIMX51_QUARTB_GPIO),

		.irqflags = IRQF_TRIGGER_HIGH,

		.uartclk = CPUIMX51_QUART_XTAL,

		.regshift = CPUIMX51_QUART_REGSHIFT,
@@ -73,7 +73,7 @@ static struct plat_serial8250_port serial_platform_data[] = { 
		.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP,

	}, {

		.mapbase = (unsigned long)(MX51_CS1_BASE_ADDR + 0x1000000),

		.irq = gpio_to_irq(CPUIMX51_QUARTC_GPIO),

		.irq = IMX_GPIO_TO_IRQ(CPUIMX51_QUARTC_GPIO),

		.irqflags = IRQF_TRIGGER_HIGH,

		.uartclk = CPUIMX51_QUART_XTAL,

		.regshift = CPUIMX51_QUART_REGSHIFT,
@@ -81,7 +81,7 @@ static struct plat_serial8250_port serial_platform_data[] = { 
		.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP,

	}, {

		.mapbase = (unsigned long)(MX51_CS1_BASE_ADDR + 0x2000000),

		.irq = gpio_to_irq(CPUIMX51_QUARTD_GPIO),

		.irq = IMX_GPIO_TO_IRQ(CPUIMX51_QUARTD_GPIO),

		.irqflags = IRQF_TRIGGER_HIGH,

		.uartclk = CPUIMX51_QUART_XTAL,

		.regshift = CPUIMX51_QUART_REGSHIFT,

arch/arm/mach-mx5/board-cpuimx51sd.c

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static struct i2c_board_info eukrea_cpuimx51sd_i2c_devices[] = { 
		I2C_BOARD_INFO("tsc2007", 0x49),

		.type		= "tsc2007",

		.platform_data	= &tsc2007_info,

		.irq		= gpio_to_irq(TSC2007_IRQGPIO),

		.irq		= IMX_GPIO_TO_IRQ(TSC2007_IRQGPIO),

	},

};
@@ -245,7 +245,7 @@ static struct spi_board_info cpuimx51sd_spi_device[] = { 
		.mode		= SPI_MODE_0,

		.chip_select     = 0,

		.platform_data   = &mcp251x_info,

		.irq             = gpio_to_irq(CAN_IRQGPIO)

		.irq             = IMX_GPIO_TO_IRQ(CAN_IRQGPIO)

	},

};