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

Commit ee9dd763 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Nicolas Ferre
Browse files

ARM: at91: fix at91sam9261ek Ethernet dm9000 irq 



You need to setup the dm9000 irq via gpio_to_irq() since
d0fbda9a (ARM: at91/gpio: drop PIN_BASE).

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Cc: stable <stable@vger.kernel.org>	[3.2+]
parent bf66b0d1

arch/arm/mach-at91/board-sam9261ek.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -85,8 +85,6 @@ static struct resource dm9000_resource[] = { 
		.flags	= IORESOURCE_MEM

		.flags	= IORESOURCE_MEM

	},

	},

	[2] = {

	[2] = {

		.start	= AT91_PIN_PC11,

		.end	= AT91_PIN_PC11,

		.flags	= IORESOURCE_IRQ

		.flags	= IORESOURCE_IRQ

			| IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE,

			| IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE,

	}

	}
@@ -130,6 +128,8 @@ static struct sam9_smc_config __initdata dm9000_smc_config = { 




static void __init ek_add_device_dm9000(void)

static void __init ek_add_device_dm9000(void)

{

{

	struct resource *r = &dm9000_resource[2];



	/* Configure chip-select 2 (DM9000) */

	/* Configure chip-select 2 (DM9000) */

	sam9_smc_configure(0, 2, &dm9000_smc_config);

	sam9_smc_configure(0, 2, &dm9000_smc_config);
@@ -139,6 +139,7 @@ static void __init ek_add_device_dm9000(void) 
	/* Configure Interrupt pin as input, no pull-up */

	/* Configure Interrupt pin as input, no pull-up */

	at91_set_gpio_input(AT91_PIN_PC11, 0);

	at91_set_gpio_input(AT91_PIN_PC11, 0);





	r->start = r->end = gpio_to_irq(AT91_PIN_PC11);

	platform_device_register(&dm9000_device);

	platform_device_register(&dm9000_device);

}

}

#else

#else