[v4,8/8] board: gw_ventana: enable MV88E61XX DSA support

Message ID	20220928193732.998665-9-tharvey@gateworks.com
State	Superseded
Delegated to:	Ramon Fried
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Tim Harvey <tharvey@gateworks.com> To: u-boot@lists.denx.de, Joe Hershberger <joe.hershberger@ni.com>, Ramon Fried <rfried.dev@gmail.com>, Vladimir Oltean <vladimir.oltean@nxp.com>, Stefano Babic <sbabic@denx.de>, Fabio Estevam <festevam@gmail.com>, "NXP i . MX U-Boot Team" <uboot-imx@nxp.com>, =?utf-8?q?Marek_Beh=C3=BAn?= <marek.behun@nic.cz> Cc: Tim Harvey <tharvey@gateworks.com> Subject: [PATCH v4 8/8] board: gw_ventana: enable MV88E61XX DSA support Date: Wed, 28 Sep 2022 12:37:32 -0700 Message-Id: <20220928193732.998665-9-tharvey@gateworks.com> In-Reply-To: <20220928193732.998665-1-tharvey@gateworks.com> References: <20220928193732.998665-1-tharvey@gateworks.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	Add MV88E6xxx DSA driver and use on gwventana \| expand [v4,0/8] Add MV88E6xxx DSA driver and use on gwventana [v4,1/8] net: mdio-uclass: scan for dm mdio children on post-bind [v4,2/8] net: dsa: move cpu port probe to dsa_post_probe [v4,3/8] net: dsa: ensure dsa driver has proper ops [v4,4/8] net: dsa: allow rcv() and xmit() to be optional [v4,5/8] net: ksz9477: remove unnecessary xmit and recv functions [v4,6/8] net: fec: add support for DM_MDIO [v4,7/8] net: add MV88E61xx DSA driver [v4,8/8] board: gw_ventana: enable MV88E61XX DSA support

diff --git a/arch/arm/dts/imx6qdl-gw5904.dtsi b/arch/arm/dts/imx6qdl-gw5904.dtsi index 612b6e068e28..487dd7648274 100644 --- a/arch/arm/dts/imx6qdl-gw5904.dtsi +++ b/arch/arm/dts/imx6qdl-gw5904.dtsi @@ -212,6 +212,27 @@ compatible = "marvell,mv88e6085"; reg = <0>; + mdio { + #address-cells = <1>; + #size-cells = <0>; + + sw_phy0: ethernet-phy@0 { + reg = <0x0>; + }; + + sw_phy1: ethernet-phy@1 { + reg = <0x1>; + }; + + sw_phy2: ethernet-phy@2 { + reg = <0x2>; + }; + + sw_phy3: ethernet-phy@3 { + reg = <0x3>; + }; + }; + ports { #address-cells = <1>; #size-cells = <0>; @@ -219,27 +240,37 @@ port@0 { reg = <0>; label = "lan4"; + phy-handle = <&sw_phy0>; }; port@1 { reg = <1>; label = "lan3"; + phy-handle = <&sw_phy1>; }; port@2 { reg = <2>; label = "lan2"; + phy-handle = <&sw_phy2>; }; port@3 { reg = <3>; label = "lan1"; + phy-handle = <&sw_phy3>; }; port@5 { reg = <5>; label = "cpu"; ethernet = <&fec>; + phy-mode = "rgmii-id"; + + fixed-link { + speed = <1000>; + full-duplex; + }; }; }; }; diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index 99f52b9953e2..1c3da2c82707 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -83,44 +83,30 @@ int board_phy_config(struct phy_device *phydev) break; } + /* Fixed PHY: for GW5904/GW5909 this is Marvell 88E6176 GbE Switch */ + if (phydev->phy_id == PHY_FIXED_ID && + (board_type == GW5904 || board_type == GW5909)) { + struct mii_dev *bus = miiphy_get_dev_by_name("mdio"); + + puts("MV88E61XX "); + /* GPIO[0] output CLK125 for RGMII_REFCLK */ + bus->write(bus, 0x1c, 0, 0x1a, (1 << 15) | (0x62 << 8) | 0xfe); + bus->write(bus, 0x1c, 0, 0x1a, (1 << 15) | (0x68 << 8) | 7); + + /* Port 0-3 LED configuration: Table 80/82 */ + /* LED configuration: 7:4-green (8=Activity) 3:0 amber (8=Link) */ + bus->write(bus, 0x10, 0, 0x16, 0x8088); + bus->write(bus, 0x11, 0, 0x16, 0x8088); + bus->write(bus, 0x12, 0, 0x16, 0x8088); + bus->write(bus, 0x13, 0, 0x16, 0x8088); + } + if (phydev->drv->config) phydev->drv->config(phydev); return 0; } -#ifdef CONFIG_MV88E61XX_SWITCH -int mv88e61xx_hw_reset(struct phy_device *phydev) -{ - struct mii_dev *bus = phydev->bus; - - /* GPIO[0] output, CLK125 */ - debug("enabling RGMII_REFCLK\n"); - bus->write(bus, 0x1c /*MV_GLOBAL2*/, 0, - 0x1a /*MV_SCRATCH_MISC*/, - (1 << 15) | (0x62 /*MV_GPIO_DIR*/ << 8) | 0xfe); - bus->write(bus, 0x1c /*MV_GLOBAL2*/, 0, - 0x1a /*MV_SCRATCH_MISC*/, - (1 << 15) | (0x68 /*MV_GPIO01_CNTL*/ << 8) | 7); - - /* RGMII delay - Physical Control register bit[15:14] */ - debug("setting port%d RGMII rx/tx delay\n", CONFIG_MV88E61XX_CPU_PORT); - /* forced 1000mbps full-duplex link */ - bus->write(bus, 0x10 + CONFIG_MV88E61XX_CPU_PORT, 0, 1, 0xc0fe); - phydev->autoneg = AUTONEG_DISABLE; - phydev->speed = SPEED_1000; - phydev->duplex = DUPLEX_FULL; - - /* LED configuration: 7:4-green (8=Activity) 3:0 amber (8=Link) */ - bus->write(bus, 0x10, 0, 0x16, 0x8088); - bus->write(bus, 0x11, 0, 0x16, 0x8088); - bus->write(bus, 0x12, 0, 0x16, 0x8088); - bus->write(bus, 0x13, 0, 0x16, 0x8088); - - return 0; -} -#endif // CONFIG_MV88E61XX_SWITCH - #if defined(CONFIG_VIDEO_IPUV3) static void enable_hdmi(struct display_info_t const *dev) { diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 8c6baf0ae5e2..33b57c5a1c5d 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -111,11 +111,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y CONFIG_MTD=y CONFIG_PHYLIB=y -CONFIG_MV88E61XX_SWITCH=y -CONFIG_MV88E61XX_CPU_PORT=5 -CONFIG_MV88E61XX_PHY_PORTS=0xf -CONFIG_MV88E61XX_FIXED_PORTS=0x0 +CONFIG_MV88E61XX=y +CONFIG_PHY_FIXED=y +CONFIG_DM_ETH=y CONFIG_DM_MDIO=y +CONFIG_DM_DSA=y CONFIG_E1000=y CONFIG_FEC_MXC=y CONFIG_MII=y diff --git a/drivers/net/mv88e6xxx.c b/drivers/net/mv88e6xxx.c index a3a3f6cf4acc..6064bb73257b 100644 --- a/drivers/net/mv88e6xxx.c +++ b/drivers/net/mv88e6xxx.c @@ -727,31 +727,26 @@ static const struct dsa_ops mv88e6xxx_dsa_ops = { static int mv88e6xxx_probe_mdio(struct udevice *dev) { struct udevice *mdev; - ofnode node, mdios; const char *name; + ofnode node; int ret; - /* bind phy ports of mdios child node to mv88e6xxx_mdio device */ - mdios = dev_read_subnode(dev, "mdios"); - if (!ofnode_valid(mdios)) + /* bind phy ports of mdio child node to mv88e6xxx_mdio device */ + node = dev_read_subnode(dev, "mdio"); + if (!ofnode_valid(node)) return 0; - ofnode_for_each_subnode(node, mdios) { - name = ofnode_get_name(node); - ret = device_bind_driver_to_node(dev, - "mv88e6xxx_mdio", - name, node, NULL); - if (ret) { - dev_err(dev, "failed to bind %s: %d\n", name, ret); - continue; - } - + name = ofnode_get_name(node); + ret = device_bind_driver_to_node(dev, + "mv88e6xxx_mdio", + name, node, NULL); + if (ret) { + dev_err(dev, "failed to bind %s: %d\n", name, ret); + } else { /* need to probe it as there is no compatible to do so */ ret = uclass_get_device_by_ofnode(UCLASS_MDIO, node, &mdev); - if (ret) { + if (ret) dev_err(dev, "failed to probe %s: %d\n", name, ret); - continue; - } } return ret;

[v4,8/8] board: gw_ventana: enable MV88E61XX DSA support

Commit Message

Comments

Patch