From patchwork Tue Jan 13 15:45:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Glendinning X-Patchwork-Id: 2173 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n0DFpsXb019195 for ; Tue, 13 Jan 2009 07:51:55 -0800 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752250AbZAMPz5 (ORCPT ); Tue, 13 Jan 2009 10:55:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752641AbZAMPz5 (ORCPT ); Tue, 13 Jan 2009 10:55:57 -0500 Received: from [86.54.240.115] ([86.54.240.115]:44799 "EHLO drevil2.shawell.net" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752250AbZAMPz4 (ORCPT ); Tue, 13 Jan 2009 10:55:56 -0500 Received: from localhost.localdomain (unknown [10.0.20.15]) by drevil2.shawell.net (Postfix) with ESMTP id 9330337939; Tue, 13 Jan 2009 15:45:14 +0000 (GMT) From: Steve Glendinning To: linux-sh@vger.kernel.org Cc: Paul Mundt , Nobuhiro Iwamatsu , Ian Saturley , Steve Glendinning Subject: [PATCH 2/3] sh: convert ap325rxa platform to use smsc911x Date: Tue, 13 Jan 2009 15:45:49 +0000 Message-Id: <1231861550-29681-3-git-send-email-steve.glendinning@smsc.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1231861550-29681-2-git-send-email-steve.glendinning@smsc.com> References: <1231861550-29681-1-git-send-email-steve.glendinning@smsc.com> <1231861550-29681-2-git-send-email-steve.glendinning@smsc.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Signed-off-by: Steve Glendinning Tested-by: Nobuhiro Iwamatsu Acked-by: Paul Mundt --- arch/sh/boards/board-ap325rxa.c | 24 +++++++++++++----------- arch/sh/configs/ap325rxa_defconfig | 21 +++++++++++++++++++-- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c index 1c67cba..5d1083b 100644 --- a/arch/sh/boards/board-ap325rxa.c +++ b/arch/sh/boards/board-ap325rxa.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -27,12 +27,14 @@ #include #include -static struct smc911x_platdata smc911x_info = { - .flags = SMC911X_USE_32BIT, - .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_32BIT, + .phy_interface = PHY_INTERFACE_MODE_MII, }; -static struct resource smc9118_resources[] = { +static struct resource smsc9118_resources[] = { [0] = { .start = 0xb6080000, .end = 0xb60fffff, @@ -45,13 +47,13 @@ static struct resource smc9118_resources[] = { } }; -static struct platform_device smc9118_device = { - .name = "smc911x", +static struct platform_device smsc9118_device = { + .name = "smsc911x", .id = -1, - .num_resources = ARRAY_SIZE(smc9118_resources), - .resource = smc9118_resources, + .num_resources = ARRAY_SIZE(smsc9118_resources), + .resource = smsc9118_resources, .dev = { - .platform_data = &smc911x_info, + .platform_data = &smsc911x_config, }, }; @@ -316,7 +318,7 @@ static struct platform_device ceu_device = { }; static struct platform_device *ap325rxa_devices[] __initdata = { - &smc9118_device, + &smsc9118_device, &ap325rxa_nor_flash_device, &lcdc_device, &ceu_device, diff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig index 874dd97..9317e81 100644 --- a/arch/sh/configs/ap325rxa_defconfig +++ b/arch/sh/configs/ap325rxa_defconfig @@ -541,13 +541,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