From patchwork Wed Nov 5 10:35:41 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Glendinning X-Patchwork-Id: 7312 X-Patchwork-Delegate: jgarzik@pobox.com 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 011BDDDDFB for ; Wed, 5 Nov 2008 21:36:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754803AbYKEKgC (ORCPT ); Wed, 5 Nov 2008 05:36:02 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754796AbYKEKf7 (ORCPT ); Wed, 5 Nov 2008 05:35:59 -0500 Received: from [86.54.240.115] ([86.54.240.115]:57511 "EHLO drevil.shawell.net" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754689AbYKEKfz (ORCPT ); Wed, 5 Nov 2008 05:35:55 -0500 Received: from localhost.localdomain (unknown [10.0.20.15]) by drevil.shawell.net (Postfix) with ESMTP id 79910C1A1; Wed, 5 Nov 2008 10:35:46 +0000 (GMT) From: Steve Glendinning To: netdev@vger.kernel.org Cc: catalin.marinas@arm.com, Bahadir.Balban@arm.com, dustin@sensoria.com, bgat@billgatliff.com, Ian Saturley , g.liakhovetski@gmx.de, Peter Korsgaard , Steve Glendinning Subject: [PATCH 5/6] smsc911x: convert rsk7203 platform to use smsc911x Date: Wed, 5 Nov 2008 10:35:41 +0000 Message-Id: <1225881342-3485-6-git-send-email-steve.glendinning@smsc.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1225881342-3485-5-git-send-email-steve.glendinning@smsc.com> References: <1225881342-3485-1-git-send-email-steve.glendinning@smsc.com> <1225881342-3485-2-git-send-email-steve.glendinning@smsc.com> <1225881342-3485-3-git-send-email-steve.glendinning@smsc.com> <1225881342-3485-4-git-send-email-steve.glendinning@smsc.com> <1225881342-3485-5-git-send-email-steve.glendinning@smsc.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Steve Glendinning --- arch/sh/boards/board-rsk7203.c | 24 +++++++++++++----------- arch/sh/configs/rsk7203_defconfig | 21 +++++++++++++++++++-- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/arch/sh/boards/board-rsk7203.c b/arch/sh/boards/board-rsk7203.c index 58266f0..45c0091 100644 --- a/arch/sh/boards/board-rsk7203.c +++ b/arch/sh/boards/board-rsk7203.c @@ -15,19 +15,21 @@ #include #include #include -#include +#include #include #include #include #include #include -static struct smc911x_platdata smc911x_info = { - .flags = SMC911X_USE_16BIT, - .irq_flags = IRQF_TRIGGER_LOW, +static struct smsc911x_platform_config smsc911x_config = { + .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW, + .irq_type = SMSC911X_IRQ_TYPE_OPEN_DRAIN, + .flags = SMSC911X_USE_16BIT, + .phy_interface = PHY_INTERFACE_MODE_MII, }; -static struct resource smc911x_resources[] = { +static struct resource smsc911x_resources[] = { [0] = { .start = 0x24000000, .end = 0x24000000 + 0x100, @@ -40,13 +42,13 @@ static struct resource smc911x_resources[] = { }, }; -static struct platform_device smc911x_device = { - .name = "smc911x", +static struct platform_device smsc911x_device = { + .name = "smsc911x", .id = -1, - .num_resources = ARRAY_SIZE(smc911x_resources), - .resource = smc911x_resources, + .num_resources = ARRAY_SIZE(smsc911x_resources), + .resource = smsc911x_resources, .dev = { - .platform_data = &smc911x_info, + .platform_data = &smsc911x_config, }, }; @@ -154,7 +156,7 @@ static struct platform_device led_device = { }; static struct platform_device *rsk7203_devices[] __initdata = { - &smc911x_device, + &smsc911x_device, &flash_device, &led_device, }; diff --git a/arch/sh/configs/rsk7203_defconfig b/arch/sh/configs/rsk7203_defconfig index 85b0ac4..c48ddcb 100644 --- a/arch/sh/configs/rsk7203_defconfig +++ b/arch/sh/configs/rsk7203_defconfig @@ -496,13 +496,30 @@ CONFIG_NETDEVICES=y # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set # CONFIG_VETH is not set -# CONFIG_PHYLIB is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +CONFIG_SMSC_PHY=y +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set CONFIG_NET_ETHERNET=y CONFIG_MII=y # CONFIG_AX88796 is not set # CONFIG_STNIC is not set # CONFIG_SMC91X is not set -CONFIG_SMC911X=y +# CONFIG_SMC911X is not set +CONFIG_SMSC911X=y # CONFIG_IBM_NEW_EMAC_ZMII is not set # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not set