From patchwork Tue Dec 1 05:48:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 39875 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 4D692B7BCA for ; Tue, 1 Dec 2009 16:48:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751152AbZLAFsH (ORCPT ); Tue, 1 Dec 2009 00:48:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751870AbZLAFsH (ORCPT ); Tue, 1 Dec 2009 00:48:07 -0500 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:37407 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751152AbZLAFsF (ORCPT ); Tue, 1 Dec 2009 00:48:05 -0500 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 9048024C6E4; Mon, 30 Nov 2009 21:48:11 -0800 (PST) Date: Mon, 30 Nov 2009 21:48:11 -0800 (PST) Message-Id: <20091130.214811.233690337.davem@davemloft.net> To: pat@computer-refuge.org Cc: sparclinux@vger.kernel.org Subject: Re: Boot problems on a V880 From: David Miller In-Reply-To: <200911302304.31560.pat@computer-refuge.org> References: <200911301602.14992.pat@computer-refuge.org> <20091130.130521.261909944.davem@davemloft.net> <200911302304.31560.pat@computer-refuge.org> X-Mailer: Mew version 6.2 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From: Patrick Finnegan Date: Mon, 30 Nov 2009 23:04:31 -0500 > I re-ran prtconf -pv under the 2.6.32-rc3 from your sparc git tree, and > have the output here (it looks like it has what you're looking for): > > http://ned.cc.purdue.edu/prtconf-v880 Linus's tree has the fix, via my net-2.6 tree, so if you use a pure sparc-2.6 tree you won't have it. You can thus try adding the following patch on top of your sparc-2.6 tree, or alternatively, try Linus's current tree as all the sparc fixes have been merged there now too. commit e54d5512b600aa0d492010436ff7eb0c9194efc1 Author: David S. Miller Date: Tue Nov 17 04:46:18 2009 -0800 sungem: Fix Serdes detection. We need to look for the 'shared-pins' property to get this right. Based upon a patch by Hermann Lauer. Signed-off-by: David S. Miller --- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 305ec3d..1927b3d 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -2062,7 +2062,15 @@ static int gem_check_invariants(struct gem *gp) mif_cfg &= ~MIF_CFG_PSELECT; writel(mif_cfg, gp->regs + MIF_CFG); } else { - gp->phy_type = phy_serialink; +#ifdef CONFIG_SPARC + const char *p; + + p = of_get_property(gp->of_node, "shared-pins", NULL); + if (p && !strcmp(p, "serdes")) + gp->phy_type = phy_serdes; + else +#endif + gp->phy_type = phy_serialink; } if (gp->phy_type == phy_mii_mdio1 || gp->phy_type == phy_mii_mdio0) {