From patchwork Fri Apr 9 14:23:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Camelia Groza X-Patchwork-Id: 1464410 X-Patchwork-Delegate: priyanka.jain@nxp.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=TXQ2Ey+n; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FH0lZ5JQVz9sWC for ; Sat, 10 Apr 2021 00:25:14 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9F57F801F0; Fri, 9 Apr 2021 16:25:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="TXQ2Ey+n"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9283880204; Fri, 9 Apr 2021 16:25:00 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03on062c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0a::62c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CC6C5801F0 for ; Fri, 9 Apr 2021 16:24:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=camelia.groza@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X1XJAdcBQGkX/x3sk1io4rDj1nFMRQ5lXtHdQXk9w4o4f6UMHUGxSbzFmrK4Lu/wBNTSI1qeOJViu9xeIuyTrH3OUY3pY56d/OGzChi5bd7LlcsUMEMyjDlxH8aiUmU4OCz7A1cPwJPMYteoYzfgCGdevBTA89bG3EvpiWjRBtkU6i6M5OqPzJZcnxRJB4bhRUmoL/nXPQR9nwDQCfv/u2g0QTgu8y/akvQpFczNe4GbYTcl0WJO/uvBjju+j+Ww+3xBvk9vGnMPEWn6nUF2StfDaZNfvRDNDegQnP+3BcoklvJQuLXl8L0/X8c5anLKI6mc90w8Cywan1/M9uJeWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Dkg9TbK9mCeI3j+PFtg1Uvnzu7Rf8CuHEHYLH4f6IoQ=; b=aMyWQ0RvB4soVBNZTyjg+kcOAAhLVXsckrlYVMIOuzyJ0vIEL4YTdN4N0VgNiwvJzRogerepdjEKtRIuk8nA088Rg/pd6lhrgzuI4OtXyYlQTXTs8YLn4oTiMdiML+i6ZfmDXbywkzxzwlvDFE4YZl+jNWdFuHfRH9MvVkY+87djZZKEtrK7jCt5P+2RCF3jdUKtVZHp9qS1wIGU/r9IB6qwWghmtwPpTy9KQu/f3Di2AxTjb3wqZZbCUajSnRS2QcieNzJzfg6B+igC7L6qfOb4RWYV6oi6jja05Kg/mkO8a2oGJgDpsivj8/zkK7y/jnSIX9mmFmz76SoRD2sHcA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Dkg9TbK9mCeI3j+PFtg1Uvnzu7Rf8CuHEHYLH4f6IoQ=; b=TXQ2Ey+n7vdJgdgSYfjEUDOOcpsHS0uxpnuVV7SnOLry8JcT0lF2j66b5Htd19r3AfNlCYJ+3Prf5RrmyDExOSEHhKAKdgz1pYT4MuMx+KU1DqdJrZARwGIF2nDbNrSi8h4bophwMheYfvb2mYWBvUv9E0maIe3vsWa+nCXpduU= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from VI1PR04MB5807.eurprd04.prod.outlook.com (2603:10a6:803:ec::21) by VE1PR04MB6621.eurprd04.prod.outlook.com (2603:10a6:803:124::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.27; Fri, 9 Apr 2021 14:24:52 +0000 Received: from VI1PR04MB5807.eurprd04.prod.outlook.com ([fe80::1c19:2fd2:7521:31d5]) by VI1PR04MB5807.eurprd04.prod.outlook.com ([fe80::1c19:2fd2:7521:31d5%7]) with mapi id 15.20.3999.032; Fri, 9 Apr 2021 14:24:52 +0000 From: Camelia Groza To: u-boot@lists.denx.de, priyanka.jain@nxp.com, wd@denx.de, Shengzhou.Liu@nxp.com, Zhiqiang.Hou@nxp.com Cc: madalin.bucur@oss.nxp.com, Camelia Groza Subject: [PATCH 03/11] board: freescale: t208xrdb: fdt fixups under DM_ETH Date: Fri, 9 Apr 2021 17:23:09 +0300 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [83.217.231.2] X-ClientProxiedBy: AM0PR02CA0016.eurprd02.prod.outlook.com (2603:10a6:208:3e::29) To VI1PR04MB5807.eurprd04.prod.outlook.com (2603:10a6:803:ec::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from lsv15136.swis.ro-buh01.nxp.com (83.217.231.2) by AM0PR02CA0016.eurprd02.prod.outlook.com (2603:10a6:208:3e::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Fri, 9 Apr 2021 14:24:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 11b5a606-1e6a-4f21-cb5f-08d8fb633d69 X-MS-TrafficTypeDiagnostic: VE1PR04MB6621: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H2GsUS0yV3JGzAx6+52uPsbfWfsDB/YfeVOAPWu5oEwp3svr6dka3qZKbQ5R/riL7kDuFm1mazKOhDe0AZ8XOUcV9dt3S6XvAKjrY7Q3I7nLrGRxKjmdzPtc2raQGuFnLPxFGGattsKJm3ghJYck39dkr6wdJhUIXL2MyEmem2MOKMNoeNs5mnoK9rv5/6v77dAFeoU4TOfu/ozf5CJ3z9Se3Bta2J/rlkxg1e8WIcH2u03+uzgTOEYdEayLAuivoIiTDeIZVBDs8rhRwYz78Rt9BwEBWkbhuxDEdxQyyVF4f1pE8WLfKfHi1jfLcsXjemCW3r1JxCEKRCurOi5pPxoEy9O8qMYggfryMiC5kymkuwRVi4D4TSjyEt7pUqrUcDGrOy/tOBiUsgweccgm13lxc7QyIo7BWv/P2TJR9mBeuVj8ftayQYBQ1Jv0dCekwWuLwfmSYBe6UCmVeCSik7b/yDIQ13ClDHtgYReyofDgCUoST2nh3XERJ+1TEL/oYafyL7Ogt6Gy0pGfsETtvpY3rNDtps6IPhkOJydLlBDEz2JjtaAL16tbeRtJZAVlfH53qdlasLLN4dTvm4aI9SNQZKI3p4Ovc5cAh9mtObJYaJXScCbFIt/bA/ekeOx9d1U6fskt0JsgLHbXJ+nIYdOF14Ft8nHHLJBZ8wZ+Y1wSkyi0LGI3NiQvqJgLPjyM X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5807.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(366004)(136003)(346002)(39850400004)(396003)(6486002)(478600001)(2906002)(4326008)(38350700001)(83380400001)(66946007)(66476007)(66556008)(86362001)(6666004)(38100700001)(3450700001)(2616005)(186003)(8676002)(52116002)(8936002)(44832011)(16526019)(6506007)(5660300002)(6512007)(956004)(26005)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: +E6Vbvjbmjz5yATtiEBeph3afHJ/KPW1zZxaUvj5wSOEa+xZ8XGLs/cQ/Zv+hw+xM6jYx/QrqVLl72otpMV3JjTBwl9Yi37ekTZo437107D0Inbbew9keDnO3jC56Di5Y10gH42mhplZOHhxVcy+Uu+OYNLQL86DoT0PvdZVLOkSJKSy/LzcxBq2r4/iEMYncyWt7uLoSYeyQGNtaAarobYpStuh+uqLDG/vHXoqJ6WX7Ke4FZbHYsf1r44hFAzThm6JpdflrycK4rL4tRn4h1pbc07nYc6HSx/az41T4MykmlY0ZJQmfmnqlLg1+GwPBpLN+tCmJpphtzf3AaNfTeq9faSWxPH+riEUK7Yx88GD7myZ8ZXl8Ds2NhxzFIMeklef+jdZrpn5mT6fvgoYsV323NhHAXGzxbWCY3upTbqUSILiJNDwPQAsD7ipE9EDsEuCxE0/fIGeADjQD097HlG/5U7HPSICpScPhJMs2CdA33N4LcdFPLbBe4dEMrzUujg+MzhFFhknH6AmPcLWzGjJ4SNTy3+rOgO36+ywN930h6BBzP9MVuFLOfSRueSbL5UykLaDDPGD/GuEfqNSEDkVjrLGhYzQ95BBPxevxHRcoXNOszf2lBqLrMGgD6aEXi//og3Rs5Ut+kiwIANNJctAVH+JmyVQPbXgFTLQ3NCY7RDnQQPBCd3mFkhL7R99tTWaQ4HY2RJANgqHGWCtsFrwbKSpZyxJqxTpxZRp9kxRVvaSOfj1UCFhhyqfU3wSdWdnDEVFpCQD+9ykcIKkFdXQyb4O9umqk68Q6if+rGZ6dR6mwzrVFkkvmkvCV7IljUYLgj4lyuLcBltK29ykbmFbA+8dE+dU38NJJ5JQOmUACKb9bOAbFrk2Zh/jdGzKzbopAHS0lCdz4TEFO0YJSqoKSAlofR7NbScUrO1bDQ5yLquZcs36i2S+XGq5tWJ7PyJM/XtkPNs4EIBOHqH0znJpCMYZkzeun1NYwXYJBztS9UK759QVTI3N1oyit4pH+9DZAsRVVsKqBj7jzOlfZl3DN3E+sqVLdPawALClxkmhRBTpfJrvaV7KS2goDiidS/4rGuK+fXVZwCgNcXGQYpMsPf6cgdY8hfXm8C9yQRc9+g/9IqUEa9SDdRQ15yC9DpwkrScU2yuHbfLeAykI9CFhPEguXveSaRlO4QVyqPzPflB4kvmYVgWqjrk2fSRfcjPMnHDgwcyP9UeqwYnaB2HuNF5gqbfOEZdsKI8CcjX9kez3FA4QpRT4w2GQUkGwWiPCCeBGQ4Ec+artzac+uolCtk8dIsfDZGcZkH7pB03dz2a3zOcSKeq2YJTcIHNi X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11b5a606-1e6a-4f21-cb5f-08d8fb633d69 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5807.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2021 14:24:52.5231 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PL+ym+7du3+AvAK09lxEPA9k3i6M5s/ip/dhnl48lp2wMtY8geyOJSZnfhzm40+wlPQPsMktNMEBwkQhiuNcUg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6621 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: camelia.groza@oss.nxp.com Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean From: Camelia Groza Disable the FMan mEMAC 5 and 6 nodes from the fdt since they are not available under the supported RCW. Also disable the associated "fsl,dpa-ethernet" nodes that reference them. This is a simplified version of the fdt_fixup_fman_ethernet call for use under DM_ETH. Signed-off-by: Camelia Groza --- board/freescale/t208xrdb/eth_t208xrdb.c | 35 +++++++++++++++++++++++++ board/freescale/t208xrdb/t208xrdb.c | 3 +++ board/freescale/t208xrdb/t208xrdb.h | 2 ++ 3 files changed, 40 insertions(+) diff --git a/board/freescale/t208xrdb/eth_t208xrdb.c b/board/freescale/t208xrdb/eth_t208xrdb.c index e77f3f7146f7..b0ff4b1f375a 100644 --- a/board/freescale/t208xrdb/eth_t208xrdb.c +++ b/board/freescale/t208xrdb/eth_t208xrdb.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. + * Copyright 2021 NXP * * Shengzhou Liu */ @@ -104,6 +105,40 @@ int board_eth_init(struct bd_info *bis) return pci_eth_init(bis); } +/* Disable the MAC5 and MAC6 "fsl,fman-memac" nodes and the two + * "fsl,dpa-ethernet" nodes that reference them. + */ +void fdt_fixup_board_fman_ethernet(void *fdt) +{ + int mac_off, eth_off, i; + char mac_path[2][42] = { + "/soc@ffe000000/fman@400000/ethernet@e8000", + "/soc@ffe000000/fman@400000/ethernet@ea000", + }; + u32 eth_ph; + + for (i = 0; i < 2; i++) { + /* Disable the MAC node */ + mac_off = fdt_path_offset(fdt, mac_path[i]); + if (mac_off < 0) + continue; + fdt_status_disabled(fdt, mac_off); + + /* Disable the fsl,dpa-ethernet node that points to the MAC. + * The fsl,fman-mac property refers to the MAC's phandle. + */ + eth_ph = fdt_get_phandle(fdt, mac_off); + if (eth_ph <= 0) + continue; + + eth_off = fdt_node_offset_by_prop_value(fdt, -1, "fsl,fman-mac", + ð_ph, + sizeof(eth_ph)); + if (eth_off >= 0) + fdt_status_disabled(fdt, eth_off); + } +} + void fdt_fixup_board_enet(void *fdt) { return; diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c index a18459841c62..7ccb205c6473 100644 --- a/board/freescale/t208xrdb/t208xrdb.c +++ b/board/freescale/t208xrdb/t208xrdb.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2009-2013 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -137,6 +138,8 @@ int ft_board_setup(void *blob, struct bd_info *bd) #ifdef CONFIG_SYS_DPAA_FMAN #ifndef CONFIG_DM_ETH fdt_fixup_fman_ethernet(blob); +#else + fdt_fixup_board_fman_ethernet(blob); #endif fdt_fixup_board_enet(blob); #endif diff --git a/board/freescale/t208xrdb/t208xrdb.h b/board/freescale/t208xrdb/t208xrdb.h index 22a496fb8cf2..cd0a9f44da79 100644 --- a/board/freescale/t208xrdb/t208xrdb.h +++ b/board/freescale/t208xrdb/t208xrdb.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2014 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #ifndef __CORENET_DS_H__ @@ -8,5 +9,6 @@ void fdt_fixup_board_enet(void *blob); void pci_of_setup(void *blob, struct bd_info *bd); +void fdt_fixup_board_fman_ethernet(void *blob); #endif