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

Commit 57e386ce authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Jeff Garzik
Browse files

ne: MIPS: Use platform_driver for ne on RBTX49XX 



This patch lets RBTX49XX boards use generic platform_driver interface
for the ne driver.

* Use platform_device to pass ioaddr and irq to the ne driver.
* Remove unnecessary ifdefs for RBTX49XX from the ne driver.
* Make the ne driver selectable on these boards regardless of CONFIG_ISA

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 1c08bf10

arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c

+19 −0
Original line number Original line Diff line number Diff line
@@ -1049,3 +1049,22 @@ static int __init toshiba_rbtx4927_rtc_init(void) 
	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

}

}

device_initcall(toshiba_rbtx4927_rtc_init);

device_initcall(toshiba_rbtx4927_rtc_init);



static int __init rbtx4927_ne_init(void)

{

	static struct resource __initdata res[] = {

		{

			.start	= RBTX4927_RTL_8019_BASE,

			.end	= RBTX4927_RTL_8019_BASE + 0x20 - 1,

			.flags	= IORESOURCE_IO,

		}, {

			.start	= RBTX4927_RTL_8019_IRQ,

			.flags	= IORESOURCE_IRQ,

		}

	};

	struct platform_device *dev =

		platform_device_register_simple("ne", -1,

						res, ARRAY_SIZE(res));

	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

}

device_initcall(rbtx4927_ne_init);

arch/mips/tx4938/toshiba_rbtx4938/setup.c

+20 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/console.h>

#include <linux/console.h>

#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/pm.h>

#include <linux/pm.h>

#include <linux/platform_device.h>





#include <asm/wbflush.h>

#include <asm/wbflush.h>

#include <asm/reboot.h>

#include <asm/reboot.h>
@@ -1037,3 +1038,22 @@ static int __init tx4938_spi_proc_setup(void) 




__initcall(tx4938_spi_proc_setup);

__initcall(tx4938_spi_proc_setup);

#endif

#endif



static int __init rbtx4938_ne_init(void)

{

	struct resource res[] = {

		{

			.start	= RBTX4938_RTL_8019_BASE,

			.end	= RBTX4938_RTL_8019_BASE + 0x20 - 1,

			.flags	= IORESOURCE_IO,

		}, {

			.start	= RBTX4938_RTL_8019_IRQ,

			.flags	= IORESOURCE_IRQ,

		}

	};

	struct platform_device *dev =

		platform_device_register_simple("ne", -1,

						res, ARRAY_SIZE(res));

	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

}

device_initcall(rbtx4938_ne_init);

drivers/net/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -1104,7 +1104,7 @@ config ETH16I 




config NE2000

config NE2000

	tristate "NE2000/NE1000 support"

	tristate "NE2000/NE1000 support"

	depends on NET_ISA || (Q40 && m) || M32R

	depends on NET_ISA || (Q40 && m) || M32R || TOSHIBA_RBTX4927 || TOSHIBA_RBTX4938

	select CRC32

	select CRC32

	---help---

	---help---

	  If you have a network (Ethernet) card of this type, say Y and read

	  If you have a network (Ethernet) card of this type, say Y and read

drivers/net/ne.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -56,10 +56,6 @@ static const char version2[] = 
#include <asm/system.h>

#include <asm/system.h>

#include <asm/io.h>

#include <asm/io.h>





#if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938)

#include <asm/tx4938/rbtx4938.h>

#endif



#include "8390.h"

#include "8390.h"





#define DRV_NAME "ne"

#define DRV_NAME "ne"
@@ -232,10 +228,6 @@ struct net_device * __init ne_probe(int unit) 
	sprintf(dev->name, "eth%d", unit);

	sprintf(dev->name, "eth%d", unit);

	netdev_boot_setup_check(dev);

	netdev_boot_setup_check(dev);





#ifdef CONFIG_TOSHIBA_RBTX4938

	dev->base_addr = RBTX4938_RTL_8019_BASE;

	dev->irq = RBTX4938_RTL_8019_IRQ;

#endif

	err = do_ne_probe(dev);

	err = do_ne_probe(dev);

	if (err)

	if (err)

		goto out;

		goto out;