Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2230165/?format=api
{ "id": 2230165, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2230165/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20260429121816.1026326-5-mwalle@kernel.org/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/1.1/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null }, "msgid": "<20260429121816.1026326-5-mwalle@kernel.org>", "date": "2026-04-29T12:17:18", "name": "[04/10] boards: remove dead fman code", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "1ef4423e1303dbf26c79665968cc9d5eec240568", "submitter": { "id": 86646, "url": "http://patchwork.ozlabs.org/api/1.1/people/86646/?format=api", "name": "Michael Walle", "email": "mwalle@kernel.org" }, "delegate": { "id": 55230, "url": "http://patchwork.ozlabs.org/api/1.1/users/55230/?format=api", "username": "freenix", "first_name": "Peng", "last_name": "Fan", "email": "van.freenix@gmail.com" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20260429121816.1026326-5-mwalle@kernel.org/mbox/", "series": [ { "id": 502047, "url": "http://patchwork.ozlabs.org/api/1.1/series/502047/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=502047", "date": "2026-04-29T12:17:14", "name": "Generic powerpc fixes and NXP board cleanup", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/502047/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2230165/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2230165/checks/", "tags": {}, "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=Aete6wjg;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=85.214.62.61; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)", "phobos.denx.de;\n dmarc=pass (p=quarantine dis=none) header.from=kernel.org", "phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de", "phobos.denx.de;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.b=\"Aete6wjg\";\n\tdkim-atps=neutral", "phobos.denx.de; dmarc=pass (p=quarantine dis=none)\n header.from=kernel.org", "phobos.denx.de;\n spf=pass smtp.mailfrom=mwalle@kernel.org" ], "Received": [ "from phobos.denx.de (phobos.denx.de [85.214.62.61])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g5GZB3FZnz1yHZ\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 29 Apr 2026 22:19:14 +1000 (AEST)", "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 8E78184860;\n\tWed, 29 Apr 2026 14:18:51 +0200 (CEST)", "by phobos.denx.de (Postfix, from userid 109)\n id 54DFD84869; Wed, 29 Apr 2026 14:18:50 +0200 (CEST)", "from tor.source.kernel.org (tor.source.kernel.org\n [IPv6:2600:3c04:e001:324:0:1991:8:25])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id D33C38485F\n for <u-boot@lists.denx.de>; Wed, 29 Apr 2026 14:18:47 +0200 (CEST)", "from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58])\n by tor.source.kernel.org (Postfix) with ESMTP id 7D73360142;\n Wed, 29 Apr 2026 12:18:46 +0000 (UTC)", "by smtp.kernel.org (Postfix) with ESMTPSA id 23B23C19425;\n Wed, 29 Apr 2026 12:18:41 +0000 (UTC)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,\n RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham\n autolearn_force=no version=3.4.2", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n s=k20201202; t=1777465126;\n bh=zEYnyNLFvKNmeib624A6CPfEhdqeWMVP660Hl/olDQs=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=Aete6wjgcbiOeBaXoKUO5GcncprtzMnxkW5C29y598g+DHG6fSK6rgrcbGJYgQbUF\n uzqZ5NLUiwPqx2A8aMcMV6XEMTlaWjk5VGaD8wqmubjcVPMfy220asu79I8BK/F0mi\n s0xtHm/CICN+5a5Qe6lKxG2XDztpRI07zm/4FKiQfcf5R8wLn23zVgWOJocs7Yp5zA\n 2oB7Gg0Z4nPLt7kYl0agXIjTUj2zFgxBk2VQR3TgEu38ViL9iuY5Qk7Nl8PzhWJyhx\n i8dQBUnX/SvIv8VjyC2J4eFGxHCmnJz05AjfNjrV4kKK453JRswVs8W15vbkvZt1DM\n 0PI+PKESkGb4w==", "From": "Michael Walle <mwalle@kernel.org>", "To": "=?utf-8?q?Marek_Beh=C3=BAn?= <kabel@kernel.org>,\n Tom Rini <trini@konsulko.com>, Pramod Kumar <pramod.kumar_1@nxp.com>,\n Vladimir Oltean <olteanv@gmail.com>, Alison Wang <alison.wang@nxp.com>,\n Tang Yuantian <andy.tang@nxp.com>, Mingkai Hu <mingkai.hu@nxp.com>,\n Priyanka Jain <priyanka.jain@nxp.com>, Wasim Khan <wasim.khan@nxp.com>,\n Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>,\n TsiChung Liew <Tsi-Chung.Liew@nxp.com>, Stefano Babic <sbabic@nabladev.com>,\n Fabio Estevam <festevam@gmail.com>,\n \"NXP i . MX U-Boot Team\" <uboot-imx@nxp.com>, Peng Fan <peng.fan@nxp.com>,\n Shengzhou Liu <Shengzhou.Liu@nxp.com>", "Cc": "Tomas Alvarez Vanoli <tomas.alvarez-vanoli@hitachienergy.com>,\n Jerome Forissier <jerome.forissier@arm.com>, u-boot@lists.denx.de,\n Michael Walle <mwalle@kernel.org>", "Subject": "[PATCH 04/10] boards: remove dead fman code", "Date": "Wed, 29 Apr 2026 14:17:18 +0200", "Message-ID": "<20260429121816.1026326-5-mwalle@kernel.org>", "X-Mailer": "git-send-email 2.47.3", "In-Reply-To": "<20260429121816.1026326-1-mwalle@kernel.org>", "References": "<20260429121816.1026326-1-mwalle@kernel.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.39", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<https://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>", "X-Virus-Scanned": "clamav-milter 0.103.8 at phobos.denx.de", "X-Virus-Status": "Clean" }, "content": "Commit cc2bf624eb71 (\"net: fm: Remove non-DM_ETH code\") removed the call\nto board_ft_fman_fixup_port(). Thus remove the dead code in the board\nfiles.\n\nI'm not sure, all that DT shenanigans are covered by the new DM-version\nof the fman code, but it seems no one complained for the past 4 years.\n\nSigned-off-by: Michael Walle <mwalle@kernel.org>\n---\n board/nxp/ls1043aqds/eth.c | 99 -------------\n board/nxp/ls1046aqds/eth.c | 81 -----------\n board/nxp/p2041rdb/eth.c | 70 ----------\n board/nxp/t102xrdb/eth_t102xrdb.c | 15 --\n board/nxp/t208xqds/eth_t208xqds.c | 225 ------------------------------\n 5 files changed, 490 deletions(-)", "diff": "diff --git a/board/nxp/ls1043aqds/eth.c b/board/nxp/ls1043aqds/eth.c\nindex 5a8ca27b327..5680fd2d377 100644\n--- a/board/nxp/ls1043aqds/eth.c\n+++ b/board/nxp/ls1043aqds/eth.c\n@@ -159,105 +159,6 @@ static int ls1043aqds_mdio_init(char *realbusname, u8 muxval)\n \treturn mdio_register(bus);\n }\n \n-void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,\n-\t\t\t enum fm_port port, int offset)\n-{\n-\tstruct fixed_link f_link;\n-\n-\tif (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_SGMII) {\n-\t\tif (port == FM1_DTSEC9) {\n-\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t \"sgmii-riser-s1-p1\");\n-\t\t} else if (port == FM1_DTSEC2) {\n-\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t \"sgmii-riser-s2-p1\");\n-\t\t} else if (port == FM1_DTSEC5) {\n-\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t \"sgmii-riser-s3-p1\");\n-\t\t} else if (port == FM1_DTSEC6) {\n-\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t \"sgmii-riser-s4-p1\");\n-\t\t}\n-\t} else if (fm_info_get_enet_if(port) ==\n-\t\t PHY_INTERFACE_MODE_2500BASEX) {\n-\t\t/* 2.5G SGMII interface */\n-\t\tf_link.phy_id = cpu_to_fdt32(port);\n-\t\tf_link.duplex = cpu_to_fdt32(1);\n-\t\tf_link.link_speed = cpu_to_fdt32(1000);\n-\t\tf_link.pause = 0;\n-\t\tf_link.asym_pause = 0;\n-\t\t/* no PHY for 2.5G SGMII */\n-\t\tfdt_delprop(fdt, offset, \"phy-handle\");\n-\t\tfdt_setprop(fdt, offset, \"fixed-link\", &f_link, sizeof(f_link));\n-\t\tfdt_setprop_string(fdt, offset, \"phy-connection-type\",\n-\t\t\t\t \"2500base-x\");\n-\t} else if (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_QSGMII) {\n-\t\tswitch (mdio_mux[port]) {\n-\t\tcase EMI1_SLOT1:\n-\t\t\tswitch (port) {\n-\t\t\tcase FM1_DTSEC1:\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t \"qsgmii-s1-p1\");\n-\t\t\t\tbreak;\n-\t\t\tcase FM1_DTSEC2:\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t \"qsgmii-s1-p2\");\n-\t\t\t\tbreak;\n-\t\t\tcase FM1_DTSEC5:\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t \"qsgmii-s1-p3\");\n-\t\t\t\tbreak;\n-\t\t\tcase FM1_DTSEC6:\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t \"qsgmii-s1-p4\");\n-\t\t\t\tbreak;\n-\t\t\tdefault:\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t\tbreak;\n-\t\tcase EMI1_SLOT2:\n-\t\t\tswitch (port) {\n-\t\t\tcase FM1_DTSEC1:\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t \"qsgmii-s2-p1\");\n-\t\t\t\tbreak;\n-\t\t\tcase FM1_DTSEC2:\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t \"qsgmii-s2-p2\");\n-\t\t\t\tbreak;\n-\t\t\tcase FM1_DTSEC5:\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t \"qsgmii-s2-p3\");\n-\t\t\t\tbreak;\n-\t\t\tcase FM1_DTSEC6:\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t \"qsgmii-s2-p4\");\n-\t\t\t\tbreak;\n-\t\t\tdefault:\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\tbreak;\n-\t\t}\n-\t\tfdt_delprop(fdt, offset, \"phy-connection-type\");\n-\t\tfdt_setprop_string(fdt, offset, \"phy-connection-type\",\n-\t\t\t\t \"qsgmii\");\n-\t} else if (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_XGMII &&\n-\t\t port == FM1_10GEC1) {\n-\t\t/* 10GBase-R interface */\n-\t\tf_link.phy_id = cpu_to_fdt32(port);\n-\t\tf_link.duplex = cpu_to_fdt32(1);\n-\t\tf_link.link_speed = cpu_to_fdt32(10000);\n-\t\tf_link.pause = 0;\n-\t\tf_link.asym_pause = 0;\n-\t\t/* no PHY for 10GBase-R */\n-\t\tfdt_delprop(fdt, offset, \"phy-handle\");\n-\t\tfdt_setprop(fdt, offset, \"fixed-link\", &f_link, sizeof(f_link));\n-\t\tfdt_setprop_string(fdt, offset, \"phy-connection-type\", \"xgmii\");\n-\t}\n-}\n-\n void fdt_fixup_board_enet(void *fdt)\n {\n \tint i;\ndiff --git a/board/nxp/ls1046aqds/eth.c b/board/nxp/ls1046aqds/eth.c\nindex cd3500c2e96..8446f438d3c 100644\n--- a/board/nxp/ls1046aqds/eth.c\n+++ b/board/nxp/ls1046aqds/eth.c\n@@ -155,87 +155,6 @@ static int ls1046aqds_mdio_init(char *realbusname, u8 muxval)\n \treturn mdio_register(bus);\n }\n \n-void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,\n-\t\t\t enum fm_port port, int offset)\n-{\n-\tstruct fixed_link f_link;\n-\tconst char *phyconn;\n-\n-\tif (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_SGMII) {\n-\t\tswitch (port) {\n-\t\tcase FM1_DTSEC9:\n-\t\t\tfdt_set_phy_handle(fdt, compat, addr, \"sgmii-s1-p1\");\n-\t\t\tbreak;\n-\t\tcase FM1_DTSEC10:\n-\t\t\tfdt_set_phy_handle(fdt, compat, addr, \"sgmii-s1-p2\");\n-\t\t\tbreak;\n-\t\tcase FM1_DTSEC5:\n-\t\t\tfdt_set_phy_handle(fdt, compat, addr, \"sgmii-s1-p3\");\n-\t\t\tbreak;\n-\t\tcase FM1_DTSEC6:\n-\t\t\tfdt_set_phy_handle(fdt, compat, addr, \"sgmii-s1-p4\");\n-\t\t\tbreak;\n-\t\tcase FM1_DTSEC2:\n-\t\t\tfdt_set_phy_handle(fdt, compat, addr, \"sgmii-s4-p1\");\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\tbreak;\n-\t\t}\n-\t} else if (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_2500BASEX) {\n-\t\t/* 2.5G SGMII interface */\n-\t\tf_link.phy_id = cpu_to_fdt32(port);\n-\t\tf_link.duplex = cpu_to_fdt32(1);\n-\t\tf_link.link_speed = cpu_to_fdt32(1000);\n-\t\tf_link.pause = 0;\n-\t\tf_link.asym_pause = 0;\n-\t\t/* no PHY for 2.5G SGMII on QDS */\n-\t\tfdt_delprop(fdt, offset, \"phy-handle\");\n-\t\tfdt_setprop(fdt, offset, \"fixed-link\", &f_link, sizeof(f_link));\n-\t\tfdt_setprop_string(fdt, offset, \"phy-connection-type\",\n-\t\t\t\t \"2500base-x\");\n-\t} else if (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_QSGMII) {\n-\t\tswitch (port) {\n-\t\tcase FM1_DTSEC1:\n-\t\t\tfdt_set_phy_handle(fdt, compat, addr, \"qsgmii-s2-p4\");\n-\t\t\tbreak;\n-\t\tcase FM1_DTSEC5:\n-\t\t\tfdt_set_phy_handle(fdt, compat, addr, \"qsgmii-s2-p2\");\n-\t\t\tbreak;\n-\t\tcase FM1_DTSEC6:\n-\t\t\tfdt_set_phy_handle(fdt, compat, addr, \"qsgmii-s2-p1\");\n-\t\t\tbreak;\n-\t\tcase FM1_DTSEC10:\n-\t\t\tfdt_set_phy_handle(fdt, compat, addr, \"qsgmii-s2-p3\");\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\tbreak;\n-\t\t}\n-\t\tfdt_delprop(fdt, offset, \"phy-connection-type\");\n-\t\tfdt_setprop_string(fdt, offset, \"phy-connection-type\",\n-\t\t\t\t \"qsgmii\");\n-\t} else if (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_XGMII &&\n-\t\t (port == FM1_10GEC1 || port == FM1_10GEC2)) {\n-\t\tphyconn = fdt_getprop(fdt, offset, \"phy-connection-type\", NULL);\n-\t\tif (is_backplane_mode(phyconn)) {\n-\t\t\t/* Backplane KR mode: skip fixups */\n-\t\t\tprintf(\"Interface %d in backplane KR mode\\n\", port);\n-\t\t} else {\n-\t\t\t/* 10GBase-R interface */\n-\t\t\tf_link.phy_id = cpu_to_fdt32(port);\n-\t\t\tf_link.duplex = cpu_to_fdt32(1);\n-\t\t\tf_link.link_speed = cpu_to_fdt32(10000);\n-\t\t\tf_link.pause = 0;\n-\t\t\tf_link.asym_pause = 0;\n-\t\t\t/* no PHY for 10GBase-R */\n-\t\t\tfdt_delprop(fdt, offset, \"phy-handle\");\n-\t\t\tfdt_setprop(fdt, offset, \"fixed-link\", &f_link,\n-\t\t\t\t sizeof(f_link));\n-\t\t\tfdt_setprop_string(fdt, offset, \"phy-connection-type\",\n-\t\t\t\t\t \"xgmii\");\n-\t\t}\n-\t}\n-}\n-\n void fdt_fixup_board_enet(void *fdt)\n {\n \tint i;\ndiff --git a/board/nxp/p2041rdb/eth.c b/board/nxp/p2041rdb/eth.c\nindex 65850866777..b1ecc8d9642 100644\n--- a/board/nxp/p2041rdb/eth.c\n+++ b/board/nxp/p2041rdb/eth.c\n@@ -56,76 +56,6 @@ static void initialize_lane_to_slot(void)\n \tlane_to_slot[13] = (mux & SERDES_MUX_LANE_D_MASK) ? 0 : 2;\n }\n \n-/*\n- * Given the following ...\n- *\n- * 1) A pointer to an Fman Ethernet node (as identified by the 'compat'\n- * compatible string and 'addr' physical address)\n- *\n- * 2) An Fman port\n- *\n- * ... update the phy-handle property of the Ethernet node to point to the\n- * right PHY. This assumes that we already know the PHY for each port.\n- *\n- * The offset of the Fman Ethernet node is also passed in for convenience, but\n- * it is not used, and we recalculate the offset anyway.\n- *\n- * Note that what we call \"Fman ports\" (enum fm_port) is really an Fman MAC.\n- * Inside the Fman, \"ports\" are things that connect to MACs. We only call them\n- * ports in U-Boot because on previous Ethernet devices (e.g. Gianfar), MACs\n- * and ports are the same thing.\n- *\n- */\n-void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,\n-\t\t\t enum fm_port port, int offset)\n-{\n-\tphy_interface_t intf = fm_info_get_enet_if(port);\n-\tchar phy[16];\n-\tint lane;\n-\tu8 slot;\n-\n-\tswitch (intf) {\n-\t/* The RGMII PHY is identified by the MAC connected to it */\n-\tcase PHY_INTERFACE_MODE_RGMII:\n-\tcase PHY_INTERFACE_MODE_RGMII_TXID:\n-\tcase PHY_INTERFACE_MODE_RGMII_RXID:\n-\tcase PHY_INTERFACE_MODE_RGMII_ID:\n-\t\tsprintf(phy, \"phy_rgmii_%u\", port == FM1_DTSEC5 ? 0 : 1);\n-\t\tfdt_set_phy_handle(fdt, compat, addr, phy);\n-\t\tbreak;\n-\t/* The SGMII PHY is identified by the MAC connected to it */\n-\tcase PHY_INTERFACE_MODE_SGMII:\n-\t\tlane = serdes_get_first_lane(SGMII_FM1_DTSEC1 + port);\n-\t\tif (lane < 0)\n-\t\t\treturn;\n-\t\tslot = lane_to_slot[lane];\n-\t\tif (slot) {\n-\t\t\tsprintf(phy, \"phy_sgmii_%x\",\n-\t\t\t\t\tCFG_SYS_FM1_DTSEC1_RISER_PHY_ADDR\n-\t\t\t\t\t+ (port - FM1_DTSEC1));\n-\t\t\tfdt_set_phy_handle(fdt, compat, addr, phy);\n-\t\t} else {\n-\t\t\tsprintf(phy, \"phy_sgmii_%x\",\n-\t\t\t\t\tCFG_SYS_FM1_DTSEC1_PHY_ADDR\n-\t\t\t\t\t+ (port - FM1_DTSEC1));\n-\t\t\tfdt_set_phy_handle(fdt, compat, addr, phy);\n-\t\t}\n-\t\tbreak;\n-\tcase PHY_INTERFACE_MODE_XGMII:\n-\t\t/* XAUI */\n-\t\tlane = serdes_get_first_lane(XAUI_FM1);\n-\t\tif (lane >= 0) {\n-\t\t\t/* The XAUI PHY is identified by the slot */\n-\t\t\tsprintf(phy, \"phy_xgmii_%u\", lane_to_slot[lane]);\n-\t\t\tfdt_set_phy_handle(fdt, compat, addr, phy);\n-\t\t}\n-\t\tbreak;\n-\tdefault:\n-\t\tbreak;\n-\t}\n-}\n-#endif /* #ifdef CONFIG_FMAN_ENET */\n-\n int board_eth_init(struct bd_info *bis)\n {\n #ifdef CONFIG_FMAN_ENET\ndiff --git a/board/nxp/t102xrdb/eth_t102xrdb.c b/board/nxp/t102xrdb/eth_t102xrdb.c\nindex 7185a0abd52..91f87983dc5 100644\n--- a/board/nxp/t102xrdb/eth_t102xrdb.c\n+++ b/board/nxp/t102xrdb/eth_t102xrdb.c\n@@ -129,21 +129,6 @@ int board_eth_init(struct bd_info *bis)\n \treturn pci_eth_init(bis);\n }\n \n-void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,\n-\t\t\t enum fm_port port, int offset)\n-{\n-#if defined(CONFIG_TARGET_T1024RDB)\n-\tif (((fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_2500BASEX) ||\n-\t (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_SGMII)) &&\n-\t\t\t(port == FM1_DTSEC3)) {\n-\t\tfdt_set_phy_handle(fdt, compat, addr, \"sg_2500_aqr105_phy4\");\n-\t\tfdt_setprop_string(fdt, offset, \"phy-connection-type\",\n-\t\t\t\t \"2500base-x\");\n-\t\tfdt_status_disabled_by_alias(fdt, \"xg_aqr105_phy3\");\n-\t}\n-#endif\n-}\n-\n void fdt_fixup_board_enet(void *fdt)\n {\n }\ndiff --git a/board/nxp/t208xqds/eth_t208xqds.c b/board/nxp/t208xqds/eth_t208xqds.c\nindex b55078c8fe1..12951df591e 100644\n--- a/board/nxp/t208xqds/eth_t208xqds.c\n+++ b/board/nxp/t208xqds/eth_t208xqds.c\n@@ -177,231 +177,6 @@ static int t208xqds_mdio_init(char *realbusname, u8 muxval)\n \treturn mdio_register(bus);\n }\n \n-void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,\n-\t\t\t\tenum fm_port port, int offset)\n-{\n-\tint phy;\n-\tchar alias[20];\n-\tchar lane_mode[2][20] = {\"1000BASE-KX\", \"10GBASE-KR\"};\n-\tchar buf[32] = \"serdes-1,\";\n-\tstruct fixed_link f_link;\n-\tint media_type = 0;\n-\tconst char *phyconn;\n-\tint off;\n-\n-\tccsr_gur_t *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR);\n-#ifdef CONFIG_TARGET_T2080QDS\n-\tserdes_corenet_t *srds_regs =\n-\t\t(void *)CFG_SYS_FSL_CORENET_SERDES_ADDR;\n-\tu32 srds1_pccr1 = in_be32(&srds_regs->srdspccr1);\n-#endif\n-\tu32 srds_s1 = in_be32(&gur->rcwsr[4]) &\n-\t\t\t\tFSL_CORENET2_RCWSR4_SRDS1_PRTCL;\n-\n-\tsrds_s1 >>= FSL_CORENET2_RCWSR4_SRDS1_PRTCL_SHIFT;\n-\n-\tif (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_SGMII) {\n-\t\tphy = fm_info_get_phy_address(port);\n-\t\tswitch (port) {\n-#if defined(CONFIG_TARGET_T2080QDS)\n-\t\tcase FM1_DTSEC1:\n-\t\t\tif (hwconfig_sub(\"fsl_1gkx\", \"fm1_1g1\")) {\n-\t\t\t\tmedia_type = 1;\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t \"phy_1gkx1\");\n-\t\t\t\tfdt_status_okay_by_alias(fdt, \"1gkx_pcs_mdio1\");\n-\t\t\t\tstrcat(buf, \"lane-c,\");\n-\t\t\t\tstrcat(buf, (char *)lane_mode[0]);\n-\t\t\t\tout_be32(&srds_regs->srdspccr1, srds1_pccr1 |\n-\t\t\t\t\t PCCR1_SGMIIH_KX_MASK);\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\tcase FM1_DTSEC2:\n-\t\t\tif (hwconfig_sub(\"fsl_1gkx\", \"fm1_1g2\")) {\n-\t\t\t\tmedia_type = 1;\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t \"phy_1gkx2\");\n-\t\t\t\tfdt_status_okay_by_alias(fdt, \"1gkx_pcs_mdio2\");\n-\t\t\t\tstrcat(buf, \"lane-d,\");\n-\t\t\t\tstrcat(buf, (char *)lane_mode[0]);\n-\t\t\t\tout_be32(&srds_regs->srdspccr1, srds1_pccr1 |\n-\t\t\t\t\t PCCR1_SGMIIG_KX_MASK);\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\tcase FM1_DTSEC9:\n-\t\t\tif (hwconfig_sub(\"fsl_1gkx\", \"fm1_1g9\")) {\n-\t\t\t\tmedia_type = 1;\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t \"phy_1gkx9\");\n-\t\t\t\tfdt_status_okay_by_alias(fdt, \"1gkx_pcs_mdio9\");\n-\t\t\t\tstrcat(buf, \"lane-a,\");\n-\t\t\t\tstrcat(buf, (char *)lane_mode[0]);\n-\t\t\t\tout_be32(&srds_regs->srdspccr1, srds1_pccr1 |\n-\t\t\t\t\t PCCR1_SGMIIE_KX_MASK);\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\tcase FM1_DTSEC10:\n-\t\t\tif (hwconfig_sub(\"fsl_1gkx\", \"fm1_1g10\")) {\n-\t\t\t\tmedia_type = 1;\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t \"phy_1gkx10\");\n-\t\t\t\tfdt_status_okay_by_alias(fdt,\n-\t\t\t\t\t\t\t \"1gkx_pcs_mdio10\");\n-\t\t\t\tstrcat(buf, \"lane-b,\");\n-\t\t\t\tstrcat(buf, (char *)lane_mode[0]);\n-\t\t\t\tout_be32(&srds_regs->srdspccr1, srds1_pccr1 |\n-\t\t\t\t\t PCCR1_SGMIIF_KX_MASK);\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t\tif (mdio_mux[port] == EMI1_SLOT2) {\n-\t\t\t\tsprintf(alias, \"phy_sgmii_s2_%x\", phy);\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr, alias);\n-\t\t\t\tfdt_status_okay_by_alias(fdt, \"emi1_slot2\");\n-\t\t\t} else if (mdio_mux[port] == EMI1_SLOT3) {\n-\t\t\t\tsprintf(alias, \"phy_sgmii_s3_%x\", phy);\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr, alias);\n-\t\t\t\tfdt_status_okay_by_alias(fdt, \"emi1_slot3\");\n-\t\t\t}\n-\t\t\tbreak;\n-\t\tcase FM1_DTSEC5:\n-\t\t\tif (hwconfig_sub(\"fsl_1gkx\", \"fm1_1g5\")) {\n-\t\t\t\tmedia_type = 1;\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t \"phy_1gkx5\");\n-\t\t\t\tfdt_status_okay_by_alias(fdt, \"1gkx_pcs_mdio5\");\n-\t\t\t\tstrcat(buf, \"lane-g,\");\n-\t\t\t\tstrcat(buf, (char *)lane_mode[0]);\n-\t\t\t\tout_be32(&srds_regs->srdspccr1, srds1_pccr1 |\n-\t\t\t\t\t PCCR1_SGMIIC_KX_MASK);\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\tcase FM1_DTSEC6:\n-\t\t\tif (hwconfig_sub(\"fsl_1gkx\", \"fm1_1g6\")) {\n-\t\t\t\tmedia_type = 1;\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t \"phy_1gkx6\");\n-\t\t\t\tfdt_status_okay_by_alias(fdt, \"1gkx_pcs_mdio6\");\n-\t\t\t\tstrcat(buf, \"lane-h,\");\n-\t\t\t\tstrcat(buf, (char *)lane_mode[0]);\n-\t\t\t\tout_be32(&srds_regs->srdspccr1, srds1_pccr1 |\n-\t\t\t\t\t PCCR1_SGMIID_KX_MASK);\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t\tif (mdio_mux[port] == EMI1_SLOT1) {\n-\t\t\t\tsprintf(alias, \"phy_sgmii_s1_%x\", phy);\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr, alias);\n-\t\t\t\tfdt_status_okay_by_alias(fdt, \"emi1_slot1\");\n-\t\t\t} else if (mdio_mux[port] == EMI1_SLOT2) {\n-\t\t\t\tsprintf(alias, \"phy_sgmii_s2_%x\", phy);\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr, alias);\n-\t\t\t\tfdt_status_okay_by_alias(fdt, \"emi1_slot2\");\n-\t\t\t}\n-\t\t\tbreak;\n-#endif\n-\t\tdefault:\n-\t\t\tbreak;\n-\t\t}\n-\t\tif (media_type) {\n-\t\t\t/* set property for 1000BASE-KX in dtb */\n-\t\t\toff = fdt_node_offset_by_compat_reg(fdt,\n-\t\t\t\t\t\"fsl,fman-memac-mdio\", addr + 0x1000);\n-\t\t\tfdt_setprop_string(fdt, off, \"lane-instance\", buf);\n-\t\t}\n-\n-\t} else if (fm_info_get_enet_if(port) == PHY_INTERFACE_MODE_XGMII) {\n-\t\tswitch (srds_s1) {\n-\t\tcase 0x66: /* 10GBase-R interface */\n-\t\tcase 0x6b:\n-\t\tcase 0x6c:\n-\t\tcase 0x6d:\n-\t\tcase 0x71:\n-\t\t\t/*\n-\t\t\t * Check hwconfig to see what is the media type, there\n-\t\t\t * are two types, fiber or copper, fix the dtb\n-\t\t\t * accordingly.\n-\t\t\t */\n-\t\t\tswitch (port) {\n-\t\t\tcase FM1_10GEC1:\n-\t\t\tif (hwconfig_sub(\"fsl_10gkr_copper\", \"fm1_10g1\")) {\n-\t\t\t\t/* it's MAC9 */\n-\t\t\t\tmedia_type = 1;\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t\"phy_xfi9\");\n-\t\t\t\tfdt_status_okay_by_alias(fdt, \"xfi_pcs_mdio9\");\n-\t\t\t\tstrcat(buf, \"lane-a,\");\n-\t\t\t\tstrcat(buf, (char *)lane_mode[1]);\n-\t\t\t}\n-\t\t\t\tbreak;\n-\t\t\tcase FM1_10GEC2:\n-\t\t\tif (hwconfig_sub(\"fsl_10gkr_copper\", \"fm1_10g2\")) {\n-\t\t\t\t/* it's MAC10 */\n-\t\t\t\tmedia_type = 1;\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t\"phy_xfi10\");\n-\t\t\t\tfdt_status_okay_by_alias(fdt, \"xfi_pcs_mdio10\");\n-\t\t\t\tstrcat(buf, \"lane-b,\");\n-\t\t\t\tstrcat(buf, (char *)lane_mode[1]);\n-\t\t\t}\n-\t\t\t\tbreak;\n-\t\t\tcase FM1_10GEC3:\n-\t\t\tif (hwconfig_sub(\"fsl_10gkr_copper\", \"fm1_10g3\")) {\n-\t\t\t\t/* it's MAC1 */\n-\t\t\t\tmedia_type = 1;\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t\"phy_xfi1\");\n-\t\t\t\tfdt_status_okay_by_alias(fdt, \"xfi_pcs_mdio1\");\n-\t\t\t\tstrcat(buf, \"lane-c,\");\n-\t\t\t\tstrcat(buf, (char *)lane_mode[1]);\n-\t\t\t}\n-\t\t\t\tbreak;\n-\t\t\tcase FM1_10GEC4:\n-\t\t\tif (hwconfig_sub(\"fsl_10gkr_copper\", \"fm1_10g4\")) {\n-\t\t\t\t/* it's MAC2 */\n-\t\t\t\tmedia_type = 1;\n-\t\t\t\tfdt_set_phy_handle(fdt, compat, addr,\n-\t\t\t\t\t\t\"phy_xfi2\");\n-\t\t\t\tfdt_status_okay_by_alias(fdt, \"xfi_pcs_mdio2\");\n-\t\t\t\tstrcat(buf, \"lane-d,\");\n-\t\t\t\tstrcat(buf, (char *)lane_mode[1]);\n-\t\t\t}\n-\t\t\t\tbreak;\n-\t\t\tdefault:\n-\t\t\t\treturn;\n-\t\t\t}\n-\n-\t\t\tif (!media_type) {\n-\t\t\t\tphyconn = fdt_getprop(fdt, offset,\n-\t\t\t\t\t\t \"phy-connection-type\",\n-\t\t\t\t\t\t NULL);\n-\t\t\t\tif (is_backplane_mode(phyconn)) {\n-\t\t\t\t\t/* Backplane KR mode: skip fixups */\n-\t\t\t\t\tprintf(\"Interface %d in backplane KR mode\\n\",\n-\t\t\t\t\t port);\n-\t\t\t\t} else {\n-\t\t\t\t\t/* fixed-link for 10GBase-R fiber cable */\n-\t\t\t\t\tf_link.phy_id = port;\n-\t\t\t\t\tf_link.duplex = 1;\n-\t\t\t\t\tf_link.link_speed = 10000;\n-\t\t\t\t\tf_link.pause = 0;\n-\t\t\t\t\tf_link.asym_pause = 0;\n-\t\t\t\t\tfdt_delprop(fdt, offset, \"phy-handle\");\n-\t\t\t\t\tfdt_setprop(fdt, offset, \"fixed-link\",\n-\t\t\t\t\t\t &f_link, sizeof(f_link));\n-\t\t\t\t}\n-\t\t\t} else {\n-\t\t\t\t/* set property for copper cable */\n-\t\t\t\toff = fdt_node_offset_by_compat_reg(fdt,\n-\t\t\t\t\t\"fsl,fman-memac-mdio\", addr + 0x1000);\n-\t\t\t\tfdt_setprop_string(fdt, off,\n-\t\t\t\t\t\"lane-instance\", buf);\n-\t\t\t}\n-\t\t\tbreak;\n-\t\tdefault:\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-}\n-\n void fdt_fixup_board_enet(void *fdt)\n {\n \treturn;\n", "prefixes": [ "04/10" ] }