From patchwork Tue Jan 10 23:14:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaccon Bastiaansen X-Patchwork-Id: 135321 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 8284AB6FDB for ; Wed, 11 Jan 2012 10:15:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757107Ab2AJXPE (ORCPT ); Tue, 10 Jan 2012 18:15:04 -0500 Received: from mail-ey0-f174.google.com ([209.85.215.174]:50720 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757154Ab2AJXPB (ORCPT ); Tue, 10 Jan 2012 18:15:01 -0500 Received: by mail-ey0-f174.google.com with SMTP id d14so35457eaa.19 for ; Tue, 10 Jan 2012 15:15:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=xfadq4aOULas8344Yh7B3GaURd4/NHpQecBdG03gLdY=; b=oxr43E3wiLk+WmCoJ3cRFc4PnAZkPeltZipKUeHlz/kqx+5OGkkRHQ/N8OLfxdnkNm SNFJQH1oWTpCg2wmJe1A5XK2URTWu2o5snR1FrkulcDH0lFwZG4fE1rQtJj3ZqWR2Xvx CIGJP7pnWWsTYRcxUuwXlNpnpzKzj+cvw5rTY= Received: by 10.213.110.12 with SMTP id l12mr665136ebp.73.1326237301110; Tue, 10 Jan 2012 15:15:01 -0800 (PST) Received: from localhost.localdomain (s529d540e.adsl.wanadoo.nl. [82.157.84.14]) by mx.google.com with ESMTPS id t59sm310214175eeh.10.2012.01.10.15.14.59 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 10 Jan 2012 15:15:00 -0800 (PST) From: Jaccon Bastiaansen To: jaccon.bastiaansen@gmail.com, s.hauer@pengutronix.de, kernel@pengutronix.de, u.kleine-koenig@pengutronix.de, davem@davemloft.net, cavokz@gmail.com Cc: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Subject: [PATCH V2 4/4] CS89x0 : remove QQ2440 board support from the CS89x0 driver Date: Wed, 11 Jan 2012 00:14:54 +0100 Message-Id: <1326237294-23698-1-git-send-email-jaccon.bastiaansen@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The QQ2440 board isn't supported anymore in the kernel, so support for this board can be removed from the CS89x0 driver. Signed-off-by: Jaccon Bastiaansen --- drivers/net/Space.c | 2 +- drivers/net/ethernet/cirrus/cs89x0.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/net/Space.c b/drivers/net/Space.c index 04c4561..2e9c222 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c @@ -191,7 +191,7 @@ static struct devprobe2 isa_probes[] __initdata = { #endif #ifdef CONFIG_CS89x0 #if !defined(CONFIG_CS89x0_PLATFORM) || defined(CONFIG_MACH_IXDP2351) || \ - defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_MACH_QQ2440) + defined(CONFIG_ARCH_IXDP2X01) {cs89x0_probe, 0}, #endif #endif diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c index 9149974..af5042d 100644 --- a/drivers/net/ethernet/cirrus/cs89x0.c +++ b/drivers/net/ethernet/cirrus/cs89x0.c @@ -181,10 +181,6 @@ static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0}; #elif defined(CONFIG_ARCH_IXDP2X01) static unsigned int netcard_portlist[] __used __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0}; static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0}; -#elif defined(CONFIG_MACH_QQ2440) -#include -static unsigned int netcard_portlist[] __used __initdata = { QQ2440_CS8900_VIRT_BASE + 0x300, 0 }; -static unsigned int cs8900_irq_map[] = { QQ2440_CS8900_IRQ, 0, 0, 0 }; #endif #else static unsigned int netcard_portlist[] __used __initdata = @@ -297,7 +293,7 @@ __setup("cs89x0_media=", media_fn); #if !defined(CONFIG_CS89x0_PLATFORM) || defined(CONFIG_MACH_IXDP2351) || \ - defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_MACH_QQ2440) + defined(CONFIG_ARCH_IXDP2X01) /* Check for a network adaptor of this type, and return '0' iff one exists. If dev->base_addr == 0, probe all likely locations. If dev->base_addr == 1, always return failure. @@ -534,9 +530,6 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular) lp->force = g_cs89x0_media__force; #endif -#if defined(CONFIG_MACH_QQ2440) - lp->force |= FORCE_RJ45 | FORCE_FULL; -#endif } /* Grab the region so we can find another board if autoIRQ fails. */ @@ -1173,7 +1166,7 @@ write_irq(struct net_device *dev, int chip_type, int irq) if (chip_type == CS8900) { #if !defined(CONFIG_CS89x0_PLATFORM) || defined(CONFIG_MACH_IXDP2351) || \ - defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_MACH_QQ2440) + defined(CONFIG_ARCH_IXDP2X01) /* Search the mapping table for the corresponding IRQ pin. */ for (i = 0; i != ARRAY_SIZE(cs8900_irq_map); i++) if (cs8900_irq_map[i] == irq)