Commit ed175343 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx: eliminate macro IOMUX_TO_IRQ() 



This patch changes all the static gpio irq number assigning with
IOMUX_TO_IRQ() to run-time assigning with gpio_to_irq call, and
in turn eliminates the macro IOMUX_TO_IRQ().

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarDong Aisheng <dong.aisheng@linaro.org>
parent 84715dd6

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

+8 −4
Original line number Diff line number Diff line
@@ -408,7 +408,8 @@ static int armadillo5x0_sdhc1_init(struct device *dev, 
	gpio_direction_input(gpio_wp);



	/* When supported the trigger type have to be BOTH */

	ret = request_irq(IOMUX_TO_IRQ(MX31_PIN_ATA_DMACK), detect_irq,

	ret = request_irq(gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_ATA_DMACK)),

			  detect_irq,

			  IRQF_DISABLED | IRQF_TRIGGER_FALLING,

			  "sdhc-detect", data);
@@ -429,7 +430,7 @@ err_gpio_free: 


static void armadillo5x0_sdhc1_exit(struct device *dev, void *data)

{

	free_irq(IOMUX_TO_IRQ(MX31_PIN_ATA_DMACK), data);

	free_irq(gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_ATA_DMACK)), data);

	gpio_free(IOMUX_TO_GPIO(MX31_PIN_ATA_DMACK));

	gpio_free(IOMUX_TO_GPIO(MX31_PIN_ATA_RESET_B));

}
@@ -450,8 +451,7 @@ static struct resource armadillo5x0_smc911x_resources[] = { 
		.end	= MX31_CS3_BASE_ADDR + SZ_32M - 1,

		.flags	= IORESOURCE_MEM,

	}, {

		.start	= IOMUX_TO_IRQ(MX31_PIN_GPIO1_0),

		.end	= IOMUX_TO_IRQ(MX31_PIN_GPIO1_0),

		/* irq number is run-time assigned */

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,

	},

};
@@ -498,6 +498,10 @@ static void __init armadillo5x0_init(void) 


	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));



	armadillo5x0_smc911x_resources[1].start =

			gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_0));

	armadillo5x0_smc911x_resources[1].end =

			gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_0));

	platform_add_devices(devices, ARRAY_SIZE(devices));

	imx_add_gpio_keys(&armadillo5x0_button_data);

	imx31_add_imx_i2c1(NULL);

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

+15 −5
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static struct plat_serial8250_port serial_platform_data[] = { 
	{

		.membase	= KZM_ARM11_IO_ADDRESS(KZM_ARM11_16550),

		.mapbase	= KZM_ARM11_16550,

		.irq		= IOMUX_TO_IRQ(MX31_PIN_GPIO1_1),

		/* irq number is run-time assigned */

		.irqflags	= IRQ_TYPE_EDGE_RISING,

		.uartclk	= 14745600,

		.regshift	= 0,
@@ -91,8 +91,7 @@ static struct resource serial8250_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= IOMUX_TO_IRQ(MX31_PIN_GPIO1_1),

		.end	= IOMUX_TO_IRQ(MX31_PIN_GPIO1_1),

		/* irq number is run-time assigned */

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -125,6 +124,13 @@ static int __init kzm_init_ext_uart(void) 
	tmp |= 0x2;

	__raw_writeb(tmp, KZM_ARM11_IO_ADDRESS(KZM_ARM11_CTL1));



	serial_platform_data[0].irq =

			gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_1));

	serial8250_resources[1].start =

			gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_1));

	serial8250_resources[1].end =

			gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_1));



	return platform_device_register(&serial_device);

}

#else
@@ -152,8 +158,7 @@ static struct resource kzm_smsc9118_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= IOMUX_TO_IRQ(MX31_PIN_GPIO1_2),

		.end	= IOMUX_TO_IRQ(MX31_PIN_GPIO1_2),

		/* irq number is run-time assigned */

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,

	},

};
@@ -184,6 +189,11 @@ static int __init kzm_init_smsc9118(void) 


	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));



	kzm_smsc9118_resources[1].start =

			gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_2));

	kzm_smsc9118_resources[1].end =

			gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_2));



	return platform_device_register(&kzm_smsc9118_device);

}

#else

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

+6 −7
Original line number Diff line number Diff line
@@ -44,9 +44,6 @@ 


#include "devices-imx31.h"



/* CPLD IRQ line for external uart, external ethernet etc */

#define EXPIO_PARENT_INT	IOMUX_TO_IRQ(MX31_PIN_GPIO1_1)



static int mx31_3ds_pins[] = {

	/* UART1 */

	MX31_PIN_CTS1__CTS1,
@@ -317,7 +314,7 @@ static int mx31_3ds_sdhc1_init(struct device *dev, 
		return ret;

	}



	ret = request_irq(IOMUX_TO_IRQ(MX31_PIN_GPIO3_1),

	ret = request_irq(gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO3_1)),

			  detect_irq, IRQF_DISABLED |

			  IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,

			  "sdhc1-detect", data);
@@ -336,7 +333,7 @@ gpio_free: 


static void mx31_3ds_sdhc1_exit(struct device *dev, void *data)

{

	free_irq(IOMUX_TO_IRQ(MX31_PIN_GPIO3_1), data);

	free_irq(gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO3_1)), data);

	gpio_free_array(mx31_3ds_sdhc1_gpios,

			 ARRAY_SIZE(mx31_3ds_sdhc1_gpios));

}
@@ -539,7 +536,7 @@ static struct spi_board_info mx31_3ds_spi_devs[] __initdata = { 
		.bus_num	= 1,

		.chip_select	= 1, /* SS2 */

		.platform_data	= &mc13783_pdata,

		.irq		= IOMUX_TO_IRQ(MX31_PIN_GPIO1_3),

		/* irq number is run-time assigned */

		.mode = SPI_CS_HIGH,

	}, {

		.modalias	= "l4f00242t03",
@@ -714,6 +711,7 @@ static void __init mx31_3ds_init(void) 
	imx31_add_mxc_nand(&mx31_3ds_nand_board_info);



	imx31_add_spi_imx1(&spi1_pdata);

	mx31_3ds_spi_devs[0].irq = gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_3));

	spi_register_board_info(mx31_3ds_spi_devs,

						ARRAY_SIZE(mx31_3ds_spi_devs));
@@ -736,7 +734,8 @@ static void __init mx31_3ds_init(void) 
	if (!otg_mode_host)

		imx31_add_fsl_usb2_udc(&usbotg_pdata);



	if (mxc_expio_init(MX31_CS5_BASE_ADDR, EXPIO_PARENT_INT))

	if (mxc_expio_init(MX31_CS5_BASE_ADDR,

			   gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_1))))

		printk(KERN_WARNING "Init of the debug board failed, all "

				    "devices on the debug board are unusable.\n");

	imx31_add_imx2_wdt(NULL);

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

+9 −5
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ 
#define PBC_INTSTATUS_REG	(PBC_INTSTATUS + PBC_BASE_ADDRESS)

#define PBC_INTMASK_SET_REG	(PBC_INTMASK_SET + PBC_BASE_ADDRESS)

#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_BOARD_IRQ_START

#define MXC_IRQ_TO_EXPIO(irq)	((irq) - MXC_EXP_IO_BASE)
@@ -209,7 +208,7 @@ static struct irq_chip expio_irq_chip = { 


static void __init mx31ads_init_expio(void)

{

	int i;

	int i, irq;



	printk(KERN_INFO "MX31ADS EXPIO(CPLD) hardware\n");
@@ -226,8 +225,9 @@ static void __init mx31ads_init_expio(void) 
		irq_set_chip_and_handler(i, &expio_irq_chip, handle_level_irq);

		set_irq_flags(i, IRQF_VALID);

	}

	irq_set_irq_type(EXPIO_PARENT_INT, IRQ_TYPE_LEVEL_HIGH);

	irq_set_chained_handler(EXPIO_PARENT_INT, mx31ads_expio_irq_handler);

	irq = gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_4));

	irq_set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);

	irq_set_chained_handler(irq, mx31ads_expio_irq_handler);

}



#ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
@@ -488,13 +488,17 @@ static struct i2c_board_info __initdata mx31ads_i2c1_devices[] = { 
	{

		I2C_BOARD_INFO("wm8350", 0x1a),

		.platform_data = &mx31_wm8350_pdata,

		.irq = IOMUX_TO_IRQ(MX31_PIN_GPIO1_3),

		/* irq number is run-time assigned */

	},

#endif

};



static void __init mxc_init_i2c(void)

{

#ifdef CONFIG_MACH_MX31ADS_WM1133_EV1

	mx31ads_i2c1_devices[0].irq =

			gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_3));

#endif

	i2c_register_board_info(1, mx31ads_i2c1_devices,

				ARRAY_SIZE(mx31ads_i2c1_devices));

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

+7 −3
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ static struct resource smsc91x_resources[] = { 
		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= IOMUX_TO_IRQ(MX31_PIN_GPIO1_0),

		.end	= IOMUX_TO_IRQ(MX31_PIN_GPIO1_0),

		/* irq number is run-time assigned */

		.flags	= IORESOURCE_IRQ | IRQF_TRIGGER_FALLING,

	}

};
@@ -233,7 +232,7 @@ static struct spi_board_info mc13783_dev __initdata = { 
	.bus_num	= 1,

	.chip_select	= 0,

	.platform_data	= &mc13783_pdata,

	.irq		= IOMUX_TO_IRQ(MX31_PIN_GPIO1_3),

	/* irq number is run-time assigned */

};



static struct platform_device *devices[] __initdata = {
@@ -285,10 +284,15 @@ static void __init mx31lilly_board_init(void) 


	imx31_add_spi_imx0(&spi0_pdata);

	imx31_add_spi_imx1(&spi1_pdata);

	mc13783_dev.irq = gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_3));

	spi_register_board_info(&mc13783_dev, 1);



	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));



	smsc91x_resources[1].start =

			gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_0));

	smsc91x_resources[1].end =

			gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_0));

	platform_add_devices(devices, ARRAY_SIZE(devices));



	/* USB */

CRA Git | Maintained and supported by SUSTech CRA and CCSE