OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 45... Line 45...
45 + phy_mode == PHY_INTERFACE_MODE_TBI || 45 + phy_mode == PHY_INTERFACE_MODE_TBI ||
46 + phy_mode == PHY_INTERFACE_MODE_RTBI; 46 + phy_mode == PHY_INTERFACE_MODE_RTBI;
47 } 47 }
Line 48... Line 48...
48 48
49 static inline void emac_tx_enable(struct emac_instance *dev) 49 static inline void emac_tx_enable(struct emac_instance *dev)
50 @@ -2870,7 +2870,7 @@ static int emac_init_config(struct emac_ 50 @@ -2865,7 +2865,7 @@ static int emac_init_config(struct emac_
51 /* PHY mode needs some decoding */ 51 /* PHY mode needs some decoding */
52 dev->phy_mode = of_get_phy_mode(np); 52 dev->phy_mode = of_get_phy_mode(np);
53 if (dev->phy_mode < 0) 53 if (dev->phy_mode < 0)
54 - dev->phy_mode = PHY_MODE_NA; 54 - dev->phy_mode = PHY_MODE_NA;
Line 55... Line 55...
55 + dev->phy_mode = PHY_INTERFACE_MODE_NA; 55 + dev->phy_mode = PHY_INTERFACE_MODE_NA;
56 56
57 /* Check EMAC version */ 57 /* Check EMAC version */
58 if (of_device_is_compatible(np, "ibm,emac4sync")) { 58 if (of_device_is_compatible(np, "ibm,emac4sync")) {
59 @@ -3173,7 +3173,7 @@ static int emac_probe(struct platform_de 59 @@ -3168,7 +3168,7 @@ static int emac_probe(struct platform_de
Line 60... Line 60...
60 printk(KERN_INFO "%s: EMAC-%d %pOF, MAC %pM\n", 60 printk(KERN_INFO "%s: EMAC-%d %pOF, MAC %pM\n",
61 ndev->name, dev->cell_index, np, ndev->dev_addr); 61 ndev->name, dev->cell_index, np, ndev->dev_addr);