From patchwork Mon Nov 17 09:29:54 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Stanley.Miao" X-Patchwork-Id: 9123 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 287F8DDDFF for ; Mon, 17 Nov 2008 20:24:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752313AbYKQJX4 (ORCPT ); Mon, 17 Nov 2008 04:23:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752048AbYKQJXy (ORCPT ); Mon, 17 Nov 2008 04:23:54 -0500 Received: from mail.windriver.com ([147.11.1.11]:56888 "EHLO mail.wrs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751482AbYKQJXv (ORCPT ); Mon, 17 Nov 2008 04:23:51 -0500 Received: from ALA-MAIL03.corp.ad.wrs.com (ala-mail03 [147.11.57.144]) by mail.wrs.com (8.13.6/8.13.6) with ESMTP id mAH9NleN002420; Mon, 17 Nov 2008 01:23:47 -0800 (PST) Received: from ala-mail06.corp.ad.wrs.com ([147.11.57.147]) by ALA-MAIL03.corp.ad.wrs.com with Microsoft SMTPSVC(6.0.3790.1830); Mon, 17 Nov 2008 01:23:46 -0800 Received: from localhost.localdomain ([128.224.162.224]) by ala-mail06.corp.ad.wrs.com with Microsoft SMTPSVC(6.0.3790.1830); Mon, 17 Nov 2008 01:23:46 -0800 From: "Stanley.Miao" To: netdev@vger.kernel.org Cc: davem@davemloft.net, linux-omap@vger.kernel.org Subject: [PATCH 1/2] Add SMC_MEM_RESERVED for OMAP platform. Date: Mon, 17 Nov 2008 17:29:54 +0800 Message-Id: <1226914195-20473-1-git-send-email-stanley.miao@windriver.com> X-Mailer: git-send-email 1.5.6.3 X-OriginalArrivalTime: 17 Nov 2008 09:23:46.0317 (UTC) FILETIME=[311EDBD0:01C94896] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The iomem resource for Ethernet device has been reserved on omap24xx and omap34xx. So, define SMC_MEM_RESERVED for them. Signed-off-by: Stanley.Miao --- drivers/net/smc911x.c | 6 ++++-- drivers/net/smc911x.h | 10 ++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 1f26ab0..291ee46 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -2065,7 +2065,7 @@ static int smc911x_drv_probe(struct platform_device *pdev) ret = -ENODEV; goto out; } - +#ifndef SMC_MEM_RESERVED /* * Request the regions. */ @@ -2073,7 +2073,7 @@ static int smc911x_drv_probe(struct platform_device *pdev) ret = -EBUSY; goto out; } - +#endif ndev = alloc_etherdev(sizeof(struct smc911x_local)); if (!ndev) { printk("%s: could not allocate device.\n", CARDNAME); @@ -2110,7 +2110,9 @@ static int smc911x_drv_probe(struct platform_device *pdev) release_both: free_netdev(ndev); release_1: +#ifndef SMC_MEM_RESERVED release_mem_region(res->start, SMC911X_IO_EXTENT); +#endif out: printk("%s: not found (%d).\n", CARDNAME, ret); } diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index cc7d85b..d1b3b9b 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h @@ -42,6 +42,16 @@ #define SMC_USE_16BIT 0 #define SMC_USE_32BIT 1 #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW +#elif defined(CONFIG_ARCH_OMAP34XX) + #define SMC_USE_16BIT 0 + #define SMC_USE_32BIT 1 + #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW + #define SMC_MEM_RESERVED 1 +#elif defined(CONFIG_ARCH_OMAP24XX) + #define SMC_USE_16BIT 0 + #define SMC_USE_32BIT 1 + #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW + #define SMC_MEM_RESERVED 1 #else /* * Default configuration