Skip to contentSkip to conversation

smc911x irq sense request and MPR2 board support

PATCH Applied Markus Brunner 3 participants 4 messages Aug 20, 2007 – Oct 2, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 smc911x irq sense request and MPR2 board support

Hi,

this are the changes to the smc911x driver, which were necessary to get it running on the Magic Panel R2 (smsc9115).
It is a SH3-DSP based board. The other patches are available on the linuxsh-dev mailinglist.
http://marc.info/?l=linuxsh-dev&r=1&b=200708&w=2

It was necessary to set the irq sense to low level. Therefor the SMC_IRQ_SENSE define was added. How are the chances for inclusion in 2.6.24?

Signed-off by: Markus Brunner <[email protected]> Signed-off by: Mark Jonas <[email protected]>

---
 Kconfig   |    2 +-
 smc911x.c |    2 +-
 smc911x.h |    6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)
drivers/net/Kconfig +1 -1
@@ -944,7 +944,7 @@ config SMC911X
 	tristate "SMSC LAN911[5678] support"
 	select CRC32
 	select MII
-	depends on ARCH_PXA
+	depends on ARCH_PXA || SUPERH
 	help
 	  This is a driver for SMSC's LAN911x series of Ethernet chipsets
 	  including the new LAN9115, LAN9116, LAN9117, and LAN9118.
drivers/net/smc911x.c +1 -1
@@ -2084,7 +2084,7 @@ static int __init smc911x_probe(struct n
 
 	/* Grab the IRQ */
 	retval = request_irq(dev->irq, &smc911x_interrupt,
-			IRQF_SHARED | IRQF_TRIGGER_FALLING, dev->name, dev);
+			IRQF_SHARED | SMC_IRQ_SENSE, dev->name, dev);
 	if (retval)
 		goto err_out;
 
drivers/net/smc911x.h +6 -0
@@ -36,6 +36,12 @@
   #define SMC_USE_PXA_DMA	1
   #define SMC_USE_16BIT		0
   #define SMC_USE_32BIT		1
+  #define SMC_IRQ_SENSE IRQF_TRIGGER_FALLING
+#elif CONFIG_SH_MAGIC_PANEL_R2
+  #define SMC_USE_SH_DMA	0
+  #define SMC_USE_16BIT		0
+  #define SMC_USE_32BIT		1
+  #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW
 #endif
#1 lore raw
Quoted 44 lines · Markus Brunner

Hi,

this are the changes to the smc911x driver, which were necessary
to get it running on the Magic Panel R2 (smsc9115).
It is a SH3-DSP based board. The other patches are available on the linuxsh-dev mailinglist.
http://marc.info/?l=linuxsh-dev&r=1&b=200708&w=2

It was necessary to set the irq sense to low level. Therefor the SMC_IRQ_SENSE define was added. How are the chances for inclusion in 2.6.24?

Signed-off by: Markus Brunner <[email protected]> Signed-off by: Mark Jonas <[email protected]>

---
 Kconfig   |    2 +-
 smc911x.c |    2 +-
 smc911x.h |    6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)
drivers/net/Kconfig +1 -1
@@ -944,7 +944,7 @@ config SMC911X
 	tristate "SMSC LAN911[5678] support"
 	select CRC32
 	select MII
-	depends on ARCH_PXA
+	depends on ARCH_PXA || SUPERH
 	help
 	  This is a driver for SMSC's LAN911x series of Ethernet chipsets
 	  including the new LAN9115, LAN9116, LAN9117, and LAN9118.
drivers/net/smc911x.c +1 -1
@@ -2084,7 +2084,7 @@ static int __init smc911x_probe(struct n
 
 	/* Grab the IRQ */
 	retval = request_irq(dev->irq, &smc911x_interrupt,
-			IRQF_SHARED | IRQF_TRIGGER_FALLING, dev->name, dev);
+			IRQF_SHARED | SMC_IRQ_SENSE, dev->name, dev);
 	if (retval)
 		goto err_out;
 

drivers/net/smc911x.h line 45

Quoted 10 lines
drivers/net/smc911x.h +6 -0
@@ -36,6 +36,12 @@
   #define SMC_USE_PXA_DMA	1
   #define SMC_USE_16BIT		0
   #define SMC_USE_32BIT		1
+  #define SMC_IRQ_SENSE IRQF_TRIGGER_FALLING
+#elif CONFIG_SH_MAGIC_PANEL_R2
+  #define SMC_USE_SH_DMA	0
+  #define SMC_USE_16BIT		0
+  #define SMC_USE_32BIT		1
+  #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW
 #endif

does the SuperH maintainer ACK this?

Acked-by
#2 lore raw
Quoted 7 lines · Jeff Garzik
Quoted 6 lines · Markus Brunner

this are the changes to the smc911x driver, which were necessary to get it running on the Magic Panel R2 (smsc9115).
It is a SH3-DSP based board. The other patches are available on the linuxsh-dev mailinglist.
http://marc.info/?l=linuxsh-dev&r=1&b=200708&w=2

Quoted 8 lines
Quoted 6 lines

It was necessary to set the irq sense to low level. Therefor the SMC_IRQ_SENSE define was added. How are the chances for inclusion in 2.6.24?

Signed-off by: Markus Brunner <[email protected]> Signed-off by: Mark Jonas <[email protected]>

does the SuperH maintainer ACK this?

Yes, this looks fine.

Applied
#3 lore raw
In reply to Markus Brunner
Quoted 11 lines · Markus Brunner

Hi,

this are the changes to the smc911x driver, which were necessary
to get it running on the Magic Panel R2 (smsc9115).
It is a SH3-DSP based board. The other patches are available on the linuxsh-dev mailinglist.
http://marc.info/?l=linuxsh-dev&r=1&b=200708&w=2

It was necessary to set the irq sense to low level. Therefor the SMC_IRQ_SENSE define was added. How are the chances for inclusion in 2.6.24?

Quoted 6 lines

Signed-off by: Markus Brunner <[email protected]> Signed-off by: Mark Jonas <[email protected]>

---
 Kconfig   |    2 +-
 smc911x.c |    2 +-
 smc911x.h |    6 ++++++

applied