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

Commit 726d722e authored by Markus Brunner's avatar Markus Brunner Committed by David S. Miller
Browse files

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 <super.firetwister@gmail.com>
Signed-off by: Mark Jonas <toertel@gmail.com>

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 2c69448b

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -2063,7 +2063,7 @@ static int __init smc911x_probe(struct net_device *dev, unsigned long ioaddr) 


	/* 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
Original line number Diff line number Diff line
@@ -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