Title: [4212] trunk: [#2424]
Enable NET2272 on BF561-EZkit - remove request_mem_region
- Revision
- 4212
- Author
- hennerich
- Date
- 2008-02-01 08:47:24 -0600 (Fri, 01 Feb 2008)
Log Message
[#2424] Enable NET2272 on BF561-EZkit - remove request_mem_region
Diffstat
arch/blackfin/mach-bf561/boards/ezkit.c | 25 +++++++++++++++++++++++++
drivers/usb/gadget/net2272.c | 9 ---------
2 files changed, 25 insertions(+), 9 deletions(-)
Modified Paths
Diff
Modified: trunk/arch/blackfin/mach-bf561/boards/ezkit.c (4211 => 4212)
--- trunk/arch/blackfin/mach-bf561/boards/ezkit.c 2008-02-01 14:43:26 UTC (rev 4211)
+++ trunk/arch/blackfin/mach-bf561/boards/ezkit.c 2008-02-01 14:47:24 UTC (rev 4212)
@@ -133,6 +133,27 @@
};
#endif
+#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+static struct resource net2272_bfin_resources[] = {
+ {
+ .start = 0x2C000000,
+ .end = 0x2C000000 + 0x7F,
+ .flags = IORESOURCE_MEM,
+ }, {
+ .start = IRQ_PF10,
+ .end = IRQ_PF10,
+ .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
+ },
+};
+
+static struct platform_device net2272_bfin_device = {
+ .name = "net2272",
+ .id = -1,
+ .num_resources = ARRAY_SIZE(net2272_bfin_resources),
+ .resource = net2272_bfin_resources,
+};
+#endif
+
/*
* USB-LAN EzExtender board
* Driver needs to know address, irq and flag pin.
@@ -381,6 +402,10 @@
&ax88180_device,
#endif
+#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
+ &net2272_bfin_device,
+#endif
+
#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
&bfin_spi0_device,
#endif
Modified: trunk/drivers/usb/gadget/net2272.c (4211 => 4212)
--- trunk/drivers/usb/gadget/net2272.c 2008-02-01 14:43:26 UTC (rev 4211)
+++ trunk/drivers/usb/gadget/net2272.c 2008-02-01 14:47:24 UTC (rev 4212)
@@ -2460,8 +2460,6 @@
if (dev->got_irq)
free_irq (pdev->resource [1].start, dev);
- release_mem_region (pdev->resource [0].start, 0xF0);
-
if (dev->base_addr)
iounmap (dev->base_addr);
@@ -2585,13 +2583,6 @@
dev->enabled = 1;
- // FIXME, hardcoding register base memory resource length to 0xF0!
- if (!request_mem_region (base,
- 0xF0, driver_name)) {
- DEBUG (dev, "get request memory region!\n");
- retval = -EBUSY;
- goto done;
- }
dev->base_addr = ioremap_nocache (base, 256);
if (!dev->base_addr) {
DEBUG (dev, "can't map memory\n");
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
