[PATCH] Colibri: Fix support for DM9000 ethernet device.

[PATCH] Colibri: Fix support for DM9000 ethernet device.

[Michael Abbott]

From: Michael Abbott <michael.abbott@diamond.ac.uk>

Colibri: Fix support for DM9000 ethernet device.

Two changes are necessary to enable proper operation of the DM9000 device
with the Colibri PXA 270 board: firstly, the IRQ type needs to be
configured for rising edge interrupts, and secondly this configuration needs
to be communicated through to the DM9000.

Signed-off-by: Michael Abbott <michael.abbott@diamond.ac.uk>
---
  arch/arm/mach-pxa/colibri.c |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)

Patch applied against v2.6.25

Proper operation of this device also depends on the DM9000 timer patch 
submitted separately.

diff --git a/arch/arm/mach-pxa/colibri.c b/arch/arm/mach-pxa/colibri.c
index 6db54e3..a76f95a 100644
--- a/arch/arm/mach-pxa/colibri.c
+++ b/arch/arm/mach-pxa/colibri.c
@@ -97,7 +97,7 @@ static struct resource dm9000_resources[] = {
  	[2] = {
  		.start	= COLIBRI_ETH_IRQ,
  		.end	= COLIBRI_ETH_IRQ,
-		.flags	= IORESOURCE_IRQ,
+		.flags	= IORESOURCE_IRQ | IRQF_TRIGGER_RISING,
  	},
  };

@@ -118,7 +118,7 @@ static void __init colibri_init(void)
  	/* DM9000 LAN */
  	pxa_gpio_mode(GPIO78_nCS_2_MD);
  	pxa_gpio_mode(GPIO_DM9000 | GPIO_IN);
-	set_irq_type(COLIBRI_ETH_IRQ, IRQT_FALLING);
+	set_irq_type(COLIBRI_ETH_IRQ, IRQT_RISING);

  	platform_add_devices(colibri_devices, ARRAY_SIZE(colibri_devices));
  }
-- 
1.5.5

Re: [PATCH] Colibri: Fix support for DM9000 ethernet device.

[Daniel Mack]

On 24.04.2008, at 12:13, Michael Abbott wrote:

> From: Michael Abbott <michael.abbott@diamond.ac.uk>
>
> Colibri: Fix support for DM9000 ethernet device.
>
> Two changes are necessary to enable proper operation of the DM9000  
> device
> with the Colibri PXA 270 board: firstly, the IRQ type needs to be
> configured for rising edge interrupts, and secondly this  
> configuration needs
> to be communicated through to the DM9000.
>
> Signed-off-by: Michael Abbott <michael.abbott@diamond.ac.uk>

Acked-by: Daniel Mack <daniel@caiaq.de>

Re: [PATCH] Colibri: Fix support for DM9000 ethernet device.

[Ben Dooks]

On Thu, Apr 24, 2008 at 10:13:09AM +0000, Michael Abbott wrote:
> From: Michael Abbott <michael.abbott@diamond.ac.uk>
>
> Colibri: Fix support for DM9000 ethernet device.
>
> Two changes are necessary to enable proper operation of the DM9000 device
> with the Colibri PXA 270 board: firstly, the IRQ type needs to be
> configured for rising edge interrupts, and secondly this configuration needs
> to be communicated through to the DM9000.
>
> Signed-off-by: Michael Abbott <michael.abbott@diamond.ac.uk>
> ---
>  arch/arm/mach-pxa/colibri.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> Patch applied against v2.6.25
>
> Proper operation of this device also depends on the DM9000 timer patch  
> submitted separately.
>
> diff --git a/arch/arm/mach-pxa/colibri.c b/arch/arm/mach-pxa/colibri.c
> index 6db54e3..a76f95a 100644
> --- a/arch/arm/mach-pxa/colibri.c
> +++ b/arch/arm/mach-pxa/colibri.c
> @@ -97,7 +97,7 @@ static struct resource dm9000_resources[] = {
>  	[2] = {
>  		.start	= COLIBRI_ETH_IRQ,
>  		.end	= COLIBRI_ETH_IRQ,
> -		.flags	= IORESOURCE_IRQ,
> +		.flags	= IORESOURCE_IRQ | IRQF_TRIGGER_RISING,
>  	},
>  };
>
> @@ -118,7 +118,7 @@ static void __init colibri_init(void)
>  	/* DM9000 LAN */
>  	pxa_gpio_mode(GPIO78_nCS_2_MD);
>  	pxa_gpio_mode(GPIO_DM9000 | GPIO_IN);
> -	set_irq_type(COLIBRI_ETH_IRQ, IRQT_FALLING);
> +	set_irq_type(COLIBRI_ETH_IRQ, IRQT_RISING);

The set_irq_type() call here should be removed.

-- 
Ben (ben@fluff.org, http://www.fluff.org/)

  'a smiley only costs 4 bytes'

Re: [PATCH] Colibri: Fix support for DM9000 ethernet device.

[Michael Abbott]

On Thu, 24 Apr 2008, Ben Dooks wrote:
> On Thu, Apr 24, 2008 at 10:13:09AM +0000, Michael Abbott wrote:
>> From: Michael Abbott <michael.abbott@diamond.ac.uk>
>>
>> Colibri: Fix support for DM9000 ethernet device.
>> diff --git a/arch/arm/mach-pxa/colibri.c b/arch/arm/mach-pxa/colibri.c
>> --- a/arch/arm/mach-pxa/colibri.c
>> +++ b/arch/arm/mach-pxa/colibri.c
>> @@ -118,7 +118,7 @@ static void __init colibri_init(void)
>>  	/* DM9000 LAN */
>>  	pxa_gpio_mode(GPIO78_nCS_2_MD);
>>  	pxa_gpio_mode(GPIO_DM9000 | GPIO_IN);
>> -	set_irq_type(COLIBRI_ETH_IRQ, IRQT_FALLING);
>> +	set_irq_type(COLIBRI_ETH_IRQ, IRQT_RISING);
>
> The set_irq_type() call here should be removed.

I can confirm that Ben is right, and that the set_irq_type call can be 
removed.

What is the procedure here?  Do I submit a new patch to supersede the old 
one?

Re: [PATCH] Colibri: Fix support for DM9000 ethernet device.

[Andrew Morton]

On Thu, 24 Apr 2008 12:24:43 +0000 (GMT) Michael Abbott <michael@araneidae.co.uk> wrote:

> On Thu, 24 Apr 2008, Ben Dooks wrote:
> > On Thu, Apr 24, 2008 at 10:13:09AM +0000, Michael Abbott wrote:
> >> From: Michael Abbott <michael.abbott@diamond.ac.uk>
> >>
> >> Colibri: Fix support for DM9000 ethernet device.
> >> diff --git a/arch/arm/mach-pxa/colibri.c b/arch/arm/mach-pxa/colibri.c
> >> --- a/arch/arm/mach-pxa/colibri.c
> >> +++ b/arch/arm/mach-pxa/colibri.c
> >> @@ -118,7 +118,7 @@ static void __init colibri_init(void)
> >>  	/* DM9000 LAN */
> >>  	pxa_gpio_mode(GPIO78_nCS_2_MD);
> >>  	pxa_gpio_mode(GPIO_DM9000 | GPIO_IN);
> >> -	set_irq_type(COLIBRI_ETH_IRQ, IRQT_FALLING);
> >> +	set_irq_type(COLIBRI_ETH_IRQ, IRQT_RISING);
> >
> > The set_irq_type() call here should be removed.
> 
> I can confirm that Ben is right, and that the set_irq_type call can be 
> removed.
> 
> What is the procedure here?  Do I submit a new patch to supersede the old 
> one?

Yup, that's OK.