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

Commit 8a28b10e authored by Daniel Mack's avatar Daniel Mack Committed by Eric Miao
Browse files

[ARM] pxa/colibri: get rid of set_irq_type() 



In commit 47cb0355, the ax88796 driver
learned to take IRQ flags from platform_device definition. Use that here
to get rid of the set_irq_type() hack.

Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent 22a0200b

arch/arm/mach-pxa/colibri-pxa300.c

+2 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>

#include <net/ax88796.h>

#include <linux/interrupt.h>



#include <asm/mach-types.h>

#include <asm/sizes.h>
@@ -50,7 +50,7 @@ static struct resource colibri_asix_resource[] = { 
	[1] = {

		.start = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO),

		.end   = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO),

		.flags = IORESOURCE_IRQ

		.flags = IORESOURCE_IRQ | IRQF_TRIGGER_FALLING,

	}

};
@@ -73,7 +73,6 @@ static void __init colibri_pxa300_init_eth(void) 
{

	colibri_pxa3xx_init_eth(&colibri_asix_platdata);

	pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa300_eth_pin_config));

	set_irq_type(gpio_to_irq(COLIBRI_ETH_IRQ_GPIO), IRQ_TYPE_EDGE_FALLING);

	platform_device_register(&asix_device);

}

#else

arch/arm/mach-pxa/colibri-pxa320.c

+2 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>

#include <net/ax88796.h>

#include <linux/interrupt.h>



#include <asm/mach-types.h>

#include <asm/sizes.h>
@@ -51,7 +51,7 @@ static struct resource colibri_asix_resource[] = { 
	[1] = {

		.start = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO),

		.end   = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO),

		.flags = IORESOURCE_IRQ

		.flags = IORESOURCE_IRQ | IRQF_TRIGGER_FALLING,

	}

};
@@ -74,7 +74,6 @@ static void __init colibri_pxa320_init_eth(void) 
{

	colibri_pxa3xx_init_eth(&colibri_asix_platdata);

	pxa3xx_mfp_config(ARRAY_AND_SIZE(colibri_pxa320_eth_pin_config));

	set_irq_type(gpio_to_irq(COLIBRI_ETH_IRQ_GPIO), IRQ_TYPE_EDGE_FALLING);

	platform_device_register(&asix_device);

}

#else

arch/arm/mach-pxa/include/mach/colibri.h

+3 −0
Original line number Diff line number Diff line 
#ifndef _COLIBRI_H_

#define _COLIBRI_H_



#include <net/ax88796.h>



/*

 * common settings for all modules

 */