From patchwork Fri Dec 2 07:05:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Fleming X-Patchwork-Id: 128805 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 A6102B6F6B for ; Fri, 2 Dec 2011 18:06:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751785Ab1LBHFz (ORCPT ); Fri, 2 Dec 2011 02:05:55 -0500 Received: from db3ehsobe001.messaging.microsoft.com ([213.199.154.139]:38277 "EHLO DB3EHSOBE001.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751307Ab1LBHFz (ORCPT ); Fri, 2 Dec 2011 02:05:55 -0500 Received: from mail12-db3-R.bigfish.com (10.3.81.242) by DB3EHSOBE001.bigfish.com (10.3.84.21) with Microsoft SMTP Server id 14.1.225.22; Fri, 2 Dec 2011 07:05:50 +0000 Received: from mail12-db3 (localhost [127.0.0.1]) by mail12-db3-R.bigfish.com (Postfix) with ESMTP id C6F0D6C052F; Fri, 2 Dec 2011 07:05:50 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839h61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail12-db3 (localhost.localdomain [127.0.0.1]) by mail12-db3 (MessageSwitch) id 1322809550675310_14887; Fri, 2 Dec 2011 07:05:50 +0000 (UTC) Received: from DB3EHSMHS011.bigfish.com (unknown [10.3.81.244]) by mail12-db3.bigfish.com (Postfix) with ESMTP id A0F6A340042; Fri, 2 Dec 2011 07:05:50 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB3EHSMHS011.bigfish.com (10.3.87.111) with Microsoft SMTP Server (TLS) id 14.1.225.22; Fri, 2 Dec 2011 07:05:50 +0000 Received: from az33smr02.freescale.net (10.64.34.200) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server id 14.1.339.2; Fri, 2 Dec 2011 01:05:52 -0600 Received: from localhost (right.am.freescale.net [10.82.193.13]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id pB275pT1020588; Fri, 2 Dec 2011 01:05:51 -0600 (CST) From: Andy Fleming To: David Miller , Kumar Gala CC: , Subject: [PATCH] pq3: Add default tbi address Date: Fri, 2 Dec 2011 01:05:49 -0600 Message-ID: <1322809549-32622-2-git-send-email-afleming@freescale.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1322809549-32622-1-git-send-email-afleming@freescale.com> References: <1322809549-32622-1-git-send-email-afleming@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The MDIO driver has been changed so that it no longer supports scanning the MDIO bus for a free address for the TBI PHY. This feature was fragile, and required scanning the bus before the bus was fully up and registered. The intended way for FSL devices to specify the TBI PHY's address is via a tbi node in the device tree. All of the device trees had such a node, except for the recent p1/p2 trees. Rather than hand-fixing all of those boards, set a default value (most boards were using 0x11, anyway), and any board which wants to change it from that default can then override it in its board dts file. This fixes an issue where p1/p2 boards would fail to bring up Ethernet, due to not finding a tbi node. Signed-off-by: Andy Fleming --- arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi | 5 +++++ arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi index a1979ae..0a42e21 100644 --- a/arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi +++ b/arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi @@ -50,4 +50,9 @@ mdio@24520 { #size-cells = <0>; compatible = "fsl,gianfar-mdio"; reg = <0x24520 0x20>; + + tbi-phy@11 { + device-type = "tbi-phy"; + reg = <0x11>; + }; }; diff --git a/arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi b/arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi index 1382fec..964670a 100644 --- a/arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi +++ b/arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi @@ -38,6 +38,11 @@ mdio@24000 { #size-cells = <0>; compatible = "fsl,etsec2-mdio"; reg = <0x24000 0x1000 0xb0030 0x4>; + + tbi-phy@11 { + device-type = "tbi-phy"; + reg = <0x11>; + }; }; ethernet@b0000 {