From patchwork Tue Mar 31 18:33:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 25415 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 2DBF2DDE0F for ; Wed, 1 Apr 2009 05:34:04 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753882AbZCaSd4 (ORCPT ); Tue, 31 Mar 2009 14:33:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753383AbZCaSd4 (ORCPT ); Tue, 31 Mar 2009 14:33:56 -0400 Received: from [213.79.90.228] ([213.79.90.228]:2821 "EHLO buildserver.ru.mvista.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753246AbZCaSdz (ORCPT ); Tue, 31 Mar 2009 14:33:55 -0400 Received: from localhost (unknown [10.150.0.9]) by buildserver.ru.mvista.com (Postfix) with ESMTP id 9A02F8815; Wed, 1 Apr 2009 00:34:14 +0500 (SAMST) Date: Tue, 31 Mar 2009 22:33:52 +0400 From: Anton Vorontsov To: David Miller Cc: Joakim Tjernlund , Andy Fleming , Li Yang , netdev@vger.kernel.org, linuxppc-dev@ozlabs.org Subject: [PATCH] fsl_pq_mdio: Revive UCC MDIO support Message-ID: <20090331183352.GA4474@oksana.dev.rtsoft.ru> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org commit 1577ecef766650a57fceb171acee2b13cbfaf1d3 ("netdev: Merge UCC and gianfar MDIO bus drivers") introduced a regression so that UCC MDIO buses no longer work. This is because fsl_pq_mdio driver wrongly masks all non-TBI PHYs for !fsl,gianfar-mdio buses, while it should do that only for fsl,gianfar-tbi buses. Signed-off-by: Anton Vorontsov --- drivers/net/fsl_pq_mdio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/fsl_pq_mdio.c index b3079a5..d9e1ecf 100644 --- a/drivers/net/fsl_pq_mdio.c +++ b/drivers/net/fsl_pq_mdio.c @@ -387,7 +387,7 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev, * The TBIPHY-only buses will find PHYs at every address, * so we mask them all but the TBI */ - if (!of_device_is_compatible(np, "fsl,gianfar-mdio")) + if (of_device_is_compatible(np, "fsl,gianfar-tbi")) new_bus->phy_mask = ~(1 << tbiaddr); err = mdiobus_register(new_bus);