diff options
author | Jeff Garzik <jeff@garzik.org> | 2008-09-25 00:40:52 (GMT) |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-25 00:40:52 (GMT) |
commit | ae19161e28a7b48d2752eff3ac8eb7703986c313 (patch) | |
tree | 0d174e0ef02b0e21951dd40df6ebbfc320d11732 /include/linux | |
parent | 152cbcf94baec68b45832db5024184906ab798b1 (diff) | |
parent | 042af53c7839282de15cc7fd7ad8ab938d74ab7c (diff) | |
download | linux-fsl-qoriq-ae19161e28a7b48d2752eff3ac8eb7703986c313.tar.xz |
Merge branch 'for-2.6.28' of git://git.marvell.com/mv643xx_eth into upstream-next
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/mv643xx_eth.h | 13 | ||||
-rw-r--r-- | include/linux/phy.h | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h index 1207857..cbbbe9b 100644 --- a/include/linux/mv643xx_eth.h +++ b/include/linux/mv643xx_eth.h @@ -17,9 +17,14 @@ struct mv643xx_eth_shared_platform_data { struct mbus_dram_target_info *dram; + struct platform_device *shared_smi; unsigned int t_clk; }; +#define MV643XX_ETH_PHY_ADDR_DEFAULT 0 +#define MV643XX_ETH_PHY_ADDR(x) (0x80 | (x)) +#define MV643XX_ETH_PHY_NONE 0xff + struct mv643xx_eth_platform_data { /* * Pointer back to our parent instance, and our port number. @@ -30,8 +35,6 @@ struct mv643xx_eth_platform_data { /* * Whether a PHY is present, and if yes, at which address. */ - struct platform_device *shared_smi; - int force_phy_addr; int phy_addr; /* @@ -49,10 +52,10 @@ struct mv643xx_eth_platform_data { int duplex; /* - * Which RX/TX queues to use. + * How many RX/TX queues to use. */ - int rx_queue_mask; - int tx_queue_mask; + int rx_queue_count; + int tx_queue_count; /* * Override default RX/TX queue sizes if nonzero. diff --git a/include/linux/phy.h b/include/linux/phy.h index 7224c40..5f170f5 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -410,6 +410,8 @@ int phy_start_aneg(struct phy_device *phydev); int mdiobus_register(struct mii_bus *bus); void mdiobus_unregister(struct mii_bus *bus); +struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr); + void phy_sanitize_settings(struct phy_device *phydev); int phy_stop_interrupts(struct phy_device *phydev); int phy_enable_interrupts(struct phy_device *phydev); |