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

Commit 3fe6ccff authored by Marc Zyngier's avatar Marc Zyngier Committed by Eric Miao
Browse files

[ARM] pxa/viper: convert to use plat_serial8250_port irqflags field 



Use .irqflags in the plat_serial8250_port structure to set IRQ
polarity, and get rid of the corresponding set_irq_type().

Signed-off-by: default avatarMarc Zyngier <maz@misterjones.org>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 2fd8e55e

arch/arm/mach-pxa/viper.c

+2 −9
Original line number Original line Diff line number Diff line
@@ -301,15 +301,6 @@ static void __init viper_init_irq(void) 
	set_irq_chained_handler(gpio_to_irq(VIPER_CPLD_GPIO),

	set_irq_chained_handler(gpio_to_irq(VIPER_CPLD_GPIO),

				viper_irq_handler);

				viper_irq_handler);

	set_irq_type(gpio_to_irq(VIPER_CPLD_GPIO), IRQ_TYPE_EDGE_BOTH);

	set_irq_type(gpio_to_irq(VIPER_CPLD_GPIO), IRQ_TYPE_EDGE_BOTH);



#ifndef CONFIG_SERIAL_PXA

	/*

	 * 8250 doesn't support IRQ_TYPE being passed as part

	 * of the plat_serial8250_port structure...

	 */

	set_irq_type(gpio_to_irq(VIPER_UARTA_GPIO), IRQ_TYPE_EDGE_RISING);

	set_irq_type(gpio_to_irq(VIPER_UARTB_GPIO), IRQ_TYPE_EDGE_RISING);

#endif

}

}





/* Flat Panel */

/* Flat Panel */
@@ -539,6 +530,7 @@ static struct plat_serial8250_port serial_platform_data[] = { 
	{

	{

		.mapbase	= VIPER_UARTA_PHYS,

		.mapbase	= VIPER_UARTA_PHYS,

		.irq		= gpio_to_irq(VIPER_UARTA_GPIO),

		.irq		= gpio_to_irq(VIPER_UARTA_GPIO),

		.irqflags	= IRQF_TRIGGER_RISING,

		.uartclk	= 1843200,

		.uartclk	= 1843200,

		.regshift	= 1,

		.regshift	= 1,

		.iotype		= UPIO_MEM,

		.iotype		= UPIO_MEM,
@@ -548,6 +540,7 @@ static struct plat_serial8250_port serial_platform_data[] = { 
	{

	{

		.mapbase	= VIPER_UARTB_PHYS,

		.mapbase	= VIPER_UARTB_PHYS,

		.irq		= gpio_to_irq(VIPER_UARTB_GPIO),

		.irq		= gpio_to_irq(VIPER_UARTB_GPIO),

		.irqflags	= IRQF_TRIGGER_RISING,

		.uartclk	= 1843200,

		.uartclk	= 1843200,

		.regshift	= 1,

		.regshift	= 1,

		.iotype		= UPIO_MEM,

		.iotype		= UPIO_MEM,