pengwyn: nand and ethernet fixes

-> Add National instrument ethernet transceiver configuration used (DP83848)
-> Change cpsw slave phy address
-> modify nand configuration to use the correct ECC and correct nand features

1 files changed, 43 insertions, 2 deletions

diff --git a/drivers/net/phy/natsemi.c b/drivers/net/phy/natsemi.c
index ea9fe833ed8..d2e4c3c487e 100644
--- a/drivers/net/phy/natsemi.c
+++ b/drivers/net/phy/natsemi.c
@@ -53,7 +53,7 @@ static struct phy_driver DP83630_driver = {
 
 
 /* NatSemi DP83865 */
-static int dp83865_config(struct phy_device *phydev)
+static int dp838xx_config(struct phy_device *phydev)
 {
 	phy_write(phydev, MDIO_DEVAD_NONE, MII_BMCR, BMCR_RESET);
 	genphy_config_aneg(phydev);
@@ -105,15 +105,56 @@ static struct phy_driver DP83865_driver = {
 	.uid = 0x20005c70,
 	.mask = 0xfffffff0,
 	.features = PHY_GBIT_FEATURES,
-	.config = &dp83865_config,
+	.config = &dp838xx_config,
 	.startup = &dp83865_startup,
 	.shutdown = &genphy_shutdown,
 };
 
+/* NatSemi DP83848 */
+static int dp83848_parse_status(struct phy_device *phydev)
+{
+	int mii_reg;
+
+	mii_reg = phy_read(phydev, MDIO_DEVAD_NONE, MII_BMSR);
+
+	if(mii_reg & (BMSR_100FULL | BMSR_100HALF)) {
+		phydev->speed = SPEED_100;
+	} else {
+		phydev->speed = SPEED_10;
+	}
+
+	if (mii_reg & (BMSR_10FULL | BMSR_100FULL)) {
+		phydev->duplex = DUPLEX_FULL;
+	} else {
+		phydev->duplex = DUPLEX_HALF;
+	}
+
+	return 0;
+}
+
+static int dp83848_startup(struct phy_device *phydev)
+{
+	genphy_update_link(phydev);
+	dp83848_parse_status(phydev);
+
+	return 0;
+}
+
+static struct phy_driver DP83848_driver = {
+	.name = "NatSemi DP83848",
+	.uid = 0x20005c90,
+	.mask = 0x2000ff90,
+	.features = PHY_BASIC_FEATURES,
+	.config = &dp838xx_config,
+	.startup = &dp83848_startup,
+	.shutdown = &genphy_shutdown,
+};
+
 int phy_natsemi_init(void)
 {
 	phy_register(&DP83630_driver);
 	phy_register(&DP83865_driver);
+	phy_register(&DP83848_driver);
 
 	return 0;
 }