KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mcs814x: use the standard device tree binding to represent a PHY node

Browse source 
Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 36059
This commit is contained in:
Florian Fainelli 2013-03-16 22:25:41 +00:00
parent 541344b93e
commit 18908139f3
4 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
target/linux/mcs814x/files-3.3/arch/arm/boot/dts/dlan-usb-extender.dts
View file

@ -19,6 +19,14 @@
ahb { ahb {
vci { vci {
eth0: ethernet@40084000 {
phy = <&phy0>;
phy-mode = "mii";
phy0: ethernet-phy@0 {
reg = <8>;
};
};
adc { adc {
sdram: memory@0,0 { sdram: memory@0,0 {

3
target/linux/mcs814x/files-3.3/arch/arm/boot/dts/mcs8140.dtsi
View file

@ -37,6 +37,9 @@
ranges; ranges;
eth0: ethernet@40084000 { eth0: ethernet@40084000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "moschip,nuport-mac"; compatible = "moschip,nuport-mac";
reg = <0x40084000 0xd8 // mac reg = <0x40084000 0xd8 // mac
0x40080000 0x58>; // dma channels 0x40080000 0x58>; // dma channels

6
target/linux/mcs814x/files-3.3/arch/arm/boot/dts/rbt-832.dts
View file

@ -21,6 +21,12 @@
vci { vci {
eth0: ethernet@40084000 { eth0: ethernet@40084000 {
nuport-mac,link-activity = <0x01>; nuport-mac,link-activity = <0x01>;
phy = <&phy0>;
phy-mode = "mii";
phy0: ethernet-phy@0 {
reg = <1>;
};
}; };
adc { adc {

24
target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
View file

@ -19,6 +19,8 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_mdio.h>
#include <linux/of_net.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/phy.h> #include <linux/phy.h>
@ -168,6 +170,8 @@ struct nuport_mac_priv {
struct platform_device *pdev; struct platform_device *pdev;
struct mii_bus *mii_bus; struct mii_bus *mii_bus;
struct phy_device *phydev; struct phy_device *phydev;
struct device_node *phy_node;
phy_interface_t phy_interface;
int old_link; int old_link;
int old_duplex; int old_duplex;
u32 msg_level; u32 msg_level;
@ -898,9 +902,9 @@ static int nuport_mac_mii_probe(struct net_device *dev)
goto out; goto out;
} }
phydev = phy_connect(dev, dev_name(&phydev->dev), phydev = of_phy_connect(dev, priv->phy_node,
nuport_mac_adjust_link, 0, nuport_mac_adjust_link, 0,
PHY_INTERFACE_MODE_MII); priv->phy_interface);
if (IS_ERR(phydev)) { if (IS_ERR(phydev)) {
netdev_err(dev, "could not attach PHY\n"); netdev_err(dev, "could not attach PHY\n");
ret = PTR_ERR(phydev); ret = PTR_ERR(phydev);
@ -1082,6 +1086,20 @@ static int __init nuport_mac_probe(struct platform_device *pdev)
netif_napi_add(dev, &priv->napi, nuport_mac_poll, 64); netif_napi_add(dev, &priv->napi, nuport_mac_poll, 64);
priv->phy_node = of_parse_phandle(pdev->dev.of_node, "phy", 0);
if (!priv->phy_node) {
dev_err(&pdev->dev, "no associated PHY\n");
ret = -ENODEV;
goto out;
}
priv->phy_interface = of_get_phy_mode(pdev->dev.of_node);
if (priv->phy_interface < 0) {
dev_err(&pdev->dev, "invalid PHY mode\n");
ret = -EINVAL;
goto out;
}
priv->mii_bus = mdiobus_alloc(); priv->mii_bus = mdiobus_alloc();
if (!priv->mii_bus) { if (!priv->mii_bus) {
dev_err(&pdev->dev, "mii bus allocation failed\n"); dev_err(&pdev->dev, "mii bus allocation failed\n");
@ -1106,7 +1124,7 @@ static int __init nuport_mac_probe(struct platform_device *pdev)
for (i = 0; i < PHY_MAX_ADDR; i++) for (i = 0; i < PHY_MAX_ADDR; i++)
priv->mii_bus->irq[i] = PHY_IGNORE_INTERRUPT; priv->mii_bus->irq[i] = PHY_IGNORE_INTERRUPT;
ret = mdiobus_register(priv->mii_bus); ret = of_mdiobus_register(priv->mii_bus, pdev->dev.of_node);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to register mii_bus\n"); dev_err(&pdev->dev, "failed to register mii_bus\n");
goto out_mdio_irq; goto out_mdio_irq;