From owner-svn-src-projects@FreeBSD.ORG  Sun May  6 23:03:19 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C2B2C106566B;
	Sun,  6 May 2012 23:03:19 +0000 (UTC)
	(envelope-from dmarion@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AD8CD8FC14;
	Sun,  6 May 2012 23:03:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q46N3JD4035772;
	Sun, 6 May 2012 23:03:19 GMT (envelope-from dmarion@svn.freebsd.org)
Received: (from dmarion@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q46N3JTr035769;
	Sun, 6 May 2012 23:03:19 GMT (envelope-from dmarion@svn.freebsd.org)
Message-Id: <201205062303.q46N3JTr035769@svn.freebsd.org>
From: Damjan Marion <dmarion@FreeBSD.org>
Date: Sun, 6 May 2012 23:03:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235113 - projects/armv6/sys/arm/ti/cpsw
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 May 2012 23:03:19 -0000

Author: dmarion
Date: Sun May  6 23:03:19 2012
New Revision: 235113
URL: http://svn.freebsd.org/changeset/base/235113

Log:
  Fix cpsw driver on beaglebone after r234858

Modified:
  projects/armv6/sys/arm/ti/cpsw/if_cpsw.c
  projects/armv6/sys/arm/ti/cpsw/if_cpswvar.h

Modified: projects/armv6/sys/arm/ti/cpsw/if_cpsw.c
==============================================================================
--- projects/armv6/sys/arm/ti/cpsw/if_cpsw.c	Sun May  6 22:50:07 2012	(r235112)
+++ projects/armv6/sys/arm/ti/cpsw/if_cpsw.c	Sun May  6 23:03:19 2012	(r235113)
@@ -76,8 +76,6 @@ __FBSDID("$FreeBSD$");
 
 #include "miibus_if.h"
 
-static struct cpsw_softc *cpsw_sc = NULL;
-
 static int cpsw_probe(device_t dev);
 static int cpsw_attach(device_t dev);
 static int cpsw_detach(device_t dev);
@@ -227,11 +225,8 @@ cpsw_attach(device_t dev)
 	memcpy(sc->mac_addr, mac_addr, ETHER_ADDR_LEN);
 	sc->node = ofw_bus_get_node(dev);
 
-	if (device_get_unit(dev) == 0)
-		cpsw_sc = sc;
-
 	/* Get phy address from fdt */
-	if (fdt_get_phyaddr(sc->node, &phy) != 0) {
+	if (fdt_get_phyaddr(sc->node, sc->dev, &phy, (void **)&sc->phy_sc) != 0) {
 		device_printf(dev, "failed to get PHY address from FDT\n");
 		return (ENXIO);
 	}

Modified: projects/armv6/sys/arm/ti/cpsw/if_cpswvar.h
==============================================================================
--- projects/armv6/sys/arm/ti/cpsw/if_cpswvar.h	Sun May  6 22:50:07 2012	(r235112)
+++ projects/armv6/sys/arm/ti/cpsw/if_cpswvar.h	Sun May  6 23:03:19 2012	(r235113)
@@ -70,6 +70,8 @@ struct cpsw_softc {
 	int		eoq;
 	int		tc[CPSW_MAX_TX_BUFFERS];
 	int		tc_unload[CPSW_MAX_TX_BUFFERS];
+	
+	struct cpsw_softc *phy_sc;
 };
 
 #define CPDMA_BD_SOP		(1<<15)