From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anders Darander Subject: [PATCH] Allow MACB to connect to a higher addresses PHY. Date: Tue, 30 Mar 2010 11:58:32 +0200 Message-ID: <1269943112-6975-1-git-send-email-anders.darander@gmail.com> Cc: Ralf Baechle , Maxime Bizon , Anders Darander , David Daney , Sekhar Nori , Anton Vorontsov , Andy Fleming , Grant Likely , netdev@vger.kernel.org, linux-kernel@vger.kernel.org To: "David S. Miller" Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org From: Anders Darander Using the Atmel MACB together with an integrated switch, can make only port 1 work. This is caused by macb_mii_probe trying to attach the MAC to the first PHY, which often is on one of the external ports. E.g. the Micrel KSZ8873 connects to the MAC on port 3, thus phy_addr should be set to 3. Signed-off-by: Anders Darander --- drivers/net/phy/Kconfig | 19 ++++++++++++++++++- drivers/net/phy/phy_device.c | 4 ++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index fc5938b..64aa003 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -15,11 +15,28 @@ if PHYLIB comment "MII PHY device drivers" +config SWITCHING_PHY + bool "An Ethernet switch is connected to the MAC" + depends on MACB + help + If an Ethernet switch is connected to the MAC, it + is quite common to have the connection on a port + higher than the first port. This option allows to + select the desired port number + +config SWITCHING_PHY_ADDR + int "PHYA address" + depends on SWITCHING_PHY + default "3" + help + On e.g. the Micrel KSZ8873MLL, port 3 (and thus phy_addr + 3) is the one connected to the MAC of the MCU. + config MARVELL_PHY tristate "Drivers for Marvell PHYs" ---help--- Currently has a driver for the 88E1011S - + config DAVICOM_PHY tristate "Drivers for Davicom PHYs" ---help--- diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index db17945..891bd0d 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -284,7 +284,11 @@ struct phy_device *phy_find_first(struct mii_bus *bus) { int addr; +#ifdef CONFIG_SWITCHING_PHY + for (addr = CONFIG_SWITCHING_PHY_ADDR; addr < PHY_MAX_ADDR; addr++) { +#else for (addr = 0; addr < PHY_MAX_ADDR; addr++) { +#endif if (bus->phy_map[addr]) return bus->phy_map[addr]; } -- 1.7.0.3