linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Grant Likely <grant.likely@secretlab.ca>
To: linuxppc-dev@ozlabs.org, netdev@vger.kernel.org, olof@lixom.net
Cc: afleming@freescale.com, davem@davemloft.net
Subject: [PATCH v2 12/13] powerpc/440: Hacks to ml507 .dts and Marvell PHY driver to test ll_temac
Date: Sat, 21 Mar 2009 16:29:18 -0600	[thread overview]
Message-ID: <20090321222918.20493.49830.stgit@localhost.localdomain> (raw)
In-Reply-To: <20090321222047.20493.87335.stgit@localhost.localdomain>

From: Grant Likely <grant.likely@secretlab.ca>

CC: Yoshio Kashiwagi <kashiwagi@co-nss.co.jp>
CC: David H. Lynch Jr. <dhlii@dlasys.net>
CC: John Linn <john.linn@xilinx.com>
CC: John Bonesio <john.bonesio@xilinx.com>
CC: David DeBonis <ddeboni@xilinx.com>
CC: Wilson Yang <wyang@xilinx.com>

For information and testing only.  Do not merge to mainline
---

 arch/powerpc/boot/dts/virtex440-ml507.dts |   14 ++++++++++----
 drivers/net/phy/marvell.c                 |    2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)


diff --git a/arch/powerpc/boot/dts/virtex440-ml507.dts b/arch/powerpc/boot/dts/virtex440-ml507.dts
index 52d8c1a..65cc433 100644
--- a/arch/powerpc/boot/dts/virtex440-ml507.dts
+++ b/arch/powerpc/boot/dts/virtex440-ml507.dts
@@ -31,7 +31,7 @@
 		reg = < 0 0x10000000 >;
 	} ;
 	chosen {
-		bootargs = "console=ttyS0 root=/dev/ram";
+		bootargs = "console=ttyS0,115200 root=/dev/ram";
 		linux,stdout-path = &RS232_Uart_1;
 	} ;
 	cpus {
@@ -257,12 +257,13 @@
 			#size-cells = <1>;
 			compatible = "xlnx,compound";
 			ethernet@81c00000 {
+				#address-cells = < 1 >;
+				#size-cells = < 0 >;
 				compatible = "xlnx,xps-ll-temac-1.01.b";
-				device_type = "network";
 				interrupt-parent = <&xps_intc_0>;
 				interrupts = < 5 2 >;
 				llink-connected = <&DMA0>;
-				local-mac-address = [ 02 00 00 00 00 00 ];
+				local-mac-address = [ 00 00 00 00 00 00 ];
 				reg = < 0x81c00000 0x40 >;
 				xlnx,bus2core-clk-ratio = <1>;
 				xlnx,phy-type = <1>;
@@ -272,6 +273,11 @@
 				xlnx,temac-type = <0>;
 				xlnx,txcsum = <1>;
 				xlnx,txfifo = <0x1000>;
+				phy-handle = < &phy7 >;
+				phy7: phy@7 {
+					compatible = "marvell,88e1111";
+					reg = <7>;
+				};
 			} ;
 		} ;
 		IIC_EEPROM: i2c@81600000 {
@@ -340,7 +346,7 @@
 		RS232_Uart_1: serial@83e00000 {
 			clock-frequency = <100000000>;
 			compatible = "xlnx,xps-uart16550-2.00.b", "ns16550";
-			current-speed = <9600>;
+			current-speed = <115200>;
 			device_type = "serial";
 			interrupt-parent = <&xps_intc_0>;
 			interrupts = < 9 2 >;
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index eb6411c..0d6c25e 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -160,9 +160,11 @@ static int m88e1111_config_init(struct phy_device *phydev)
 	int temp;
 
 	/* Enable Fiber/Copper auto selection */
+#if 0
 	temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
 	temp &= ~MII_M1111_HWCFG_FIBER_COPPER_AUTO;
 	phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
+#endif
 
 	temp = phy_read(phydev, MII_BMCR);
 	temp |= BMCR_RESET;

  parent reply	other threads:[~2009-03-21 22:29 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-21 22:28 [PATCH v2 00/13] Rework network drivers to use of_mdio common code Grant Likely
2009-03-21 22:28 ` [PATCH v2 01/13] net: fix fec_mpc52xx driver to use net_device_ops Grant Likely
2009-03-21 22:28 ` [PATCH v2 02/13] of: add of_parse_phandle() helper for parsing phandle properties Grant Likely
2009-03-21 22:28 ` [PATCH v2 03/13] phylib: rework to prepare for OF registration of PHYs Grant Likely
2009-03-28 16:41   ` Grant Likely
2009-03-21 22:28 ` [PATCH v2 04/13] phylib: add *_direct() variants of phy_connect and phy_attach functions Grant Likely
2009-03-21 22:28 ` [PATCH v2 05/13] openfirmware: Add OF phylib support code Grant Likely
2009-03-21 22:28 ` [PATCH v2 06/13] net: Rework mpc5200 fec driver to use of_mdio infrastructure Grant Likely
2009-03-21 22:28 ` [PATCH v2 07/13] net: Rework gianfar " Grant Likely
2009-03-21 22:28 ` [PATCH v2 08/13] net: Rework ucc_geth " Grant Likely
2009-03-21 22:29 ` [PATCH v2 09/13] net: Rework pasemi_mac " Grant Likely
2009-03-22 15:47   ` Olof Johansson
2009-03-22 18:36     ` Grant Likely
2009-03-22 20:11       ` Olof Johansson
2009-03-21 22:29 ` [PATCH v2 10/13] powerpc/82xx: Rework Embedded Planet ep8248e platform to use of_mdio Grant Likely
2009-03-21 22:29 ` [PATCH v2 11/13] net: Rework fs_enet driver to use of_mdio infrastructure Grant Likely
2009-03-21 22:29 ` Grant Likely [this message]
2009-03-21 22:29 ` [PATCH v2 13/13] net: add Xilinx ll_temac device driver Grant Likely

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090321222918.20493.49830.stgit@localhost.localdomain \
    --to=grant.likely@secretlab.ca \
    --cc=afleming@freescale.com \
    --cc=davem@davemloft.net \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=netdev@vger.kernel.org \
    --cc=olof@lixom.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).