From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E222FC47094 for ; Thu, 10 Jun 2021 12:40:42 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E169D61359 for ; Thu, 10 Jun 2021 12:40:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E169D61359 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7810282F2D; Thu, 10 Jun 2021 14:40:26 +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="DBFdtYvK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9310182F1A; Thu, 10 Jun 2021 14:40:19 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on060c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::60c]) (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 C2B2382F26 for ; Thu, 10 Jun 2021 14:40:10 +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=awp0oZiACYJW9rrdCToe8P/qGPFQCE0F/PQPHeEnnIEuJncJ2p3bybzWjcrwz0MYoX9VHZb5yNlRZbnFLyyFvFTSHpVLT0mP1GXInYj/mRTpAh9v7NBcI8PQc+QRbap8sZ+xKNaZqB9fnY08ZWA6N82S3dr8PFDt4WU5d2HWyGb95HC+eOy+EpJxZWS/atX3by6wMkubfPGpR3mgoBMOKckIHHh0Nzoi7LlKG24vRszDK1r9/BcZJYoQDfChLPypIEwFAvR8HQRDFh5T7qOZmeyCTG2fXg30Mv8vBdPtaHxaySJgfnQJj8rL1l2xyfD9ebOGtKv6MkosIQTrqa/4fw== 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=r2DXFO7Sp94pL9y3+IkJ7nMmmk9lwEC3qvnNw9Bvmmo=; b=FZmg9Q9JjZw3XG9pcSvyB9u2DGyOoY6E8QY5q728u0F0BeVe+PUVdn1tzm2gjqVOOGNktxEEojWZ2ixuHvAz0Bv3UgEnVgNBpsQykVBbMBuaebw1+VvlmmCi37gESbaiTqbfyebiZSI/LdOEyNLUSA+GPdQlWKEOKKEdYH0DrYqFc7TCg6dHwGzoN5DLQpNExaxZJG30QYL9tCmOKzSTWX7tSbQIJwP/xUzqSGW8uwsXGMHdz8vV6IsxduVC4DCkr9DPJH/2fXxDegs2VPjfHh0e9kIK7QaOLE6lSk0e/1zevQ1vJVCUngI7TlbjVp6aouPfLCIrkivW79jVWz7qHQ== 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=r2DXFO7Sp94pL9y3+IkJ7nMmmk9lwEC3qvnNw9Bvmmo=; b=DBFdtYvKhYjKmlZMSCwDfN8XnUqQHj/SYdzUecQjvYfB5EY7ZzV8LFq+C7HHRO7ffPFku2pbR8IekKqO8MwCHRKCt+7RLz+4h3S9KAAFcgOQ9wYLLTQ6hV1SyNKJFAKw8k0mU+iz4Y7h2UhjsL0ZoYn7Vd+NhJIjLQFNdzdi7fY= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from VI1PR04MB5807.eurprd04.prod.outlook.com (2603:10a6:803:ec::21) by VI1PR04MB5312.eurprd04.prod.outlook.com (2603:10a6:803:54::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.21; Thu, 10 Jun 2021 12:40:07 +0000 Received: from VI1PR04MB5807.eurprd04.prod.outlook.com ([fe80::295f:2f6e:3c48:f69f]) by VI1PR04MB5807.eurprd04.prod.outlook.com ([fe80::295f:2f6e:3c48:f69f%4]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 12:40:07 +0000 From: Camelia Groza To: wd@denx.de, Shengzhou.Liu@nxp.com, priyanka.jain@nxp.com, Zhiqiang.Hou@nxp.com, u-boot@lists.denx.de Cc: Camelia Groza Subject: [PATCH 2/4] board: freescale: t208xrdb: add rev D support for the non-DM_ETH mode Date: Thu, 10 Jun 2021 15:39:37 +0300 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Content-Type: text/plain; charset="us-ascii" X-Originating-IP: [83.217.231.2] X-ClientProxiedBy: AM0PR04CA0026.eurprd04.prod.outlook.com (2603:10a6:208:122::39) 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 AM0PR04CA0026.eurprd04.prod.outlook.com (2603:10a6:208:122::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 12:40:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 31cb5a69-8fdb-4304-653d-08d92c0ce08f X-MS-TrafficTypeDiagnostic: VI1PR04MB5312: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4qwzAazeee+tzCgsPzRMwA9NeSbZ1wLhxDTpMirRCUM+bZsF7vHjT1T69svahOAUb2BUb1xapXyDCXC9r/GdlXPfs0RRc2YF74fsSAT6XN/XJ2Wfq8yfoEhXjc5HUGY7ZAqXkzICaaEk+TcwHhO/aKqMQaOVwzXiBp2T+8NO2ukz2gKl0oExn7AM0Uo1ooxLGFng+Wlnf+fs6S06EUM/AnxPuGcRbd4NQ6nMrmRaYCIO/cebb0SN4TLWvKembqTEisKcU9qGqtbB1V3X+c4YcUZlOv8O14XxrS4K1nvczfX0OLZQ1blgTmrKnfWnaaQomnlL9ye9w1jXqghq8eEpP/4rP0aQl7m7KgVbilYkKCPzHT+RxJKQTM8d+EYevzbDGe+QLaygeiJHF/zR3yzJ+EGRC5NFFf0KhHefNnIYr3gD6tmrMeWOOs7oAQXuOLUeK9/15GmqU5XlL0ZAZLQ5gYAZ1WfXwY2iHrK8n77DRnALRPYNJFjSzQo/rLrHW64w6qsETtHivx3nKath3uz8Pjb2P0P16Ny7as6ZjMdXven3YEGDAM0MmEwss8yq5uJCe0TvTqYcekZdnKeWjSl7rsQ25RJNyKDv3kYDWPUaUIg7NIt82bWhTJI4GGcRgXzkdB12X6q4lhXa80a9ebgDqDkYaXJQjPYJeqpnhYV2HEE= 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)(396003)(136003)(346002)(366004)(39860400002)(376002)(44832011)(66476007)(66946007)(38350700002)(8676002)(316002)(66556008)(6506007)(5660300002)(26005)(86362001)(16526019)(186003)(6486002)(478600001)(36756003)(83380400001)(4326008)(9686003)(6666004)(19627235002)(2906002)(38100700002)(3450700001)(52116002)(7696005)(956004)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?hrf4knB9OfR4KlpNy8uGG4xonC6SH4FnBHAa/erybozpvtRLzkynS+ZUNv2b?= =?us-ascii?Q?tQQGz2PIYoS3zPse9pJDHEErVjdaMf/fwRAFawsAnRZt5q4nSLTzfl5l785O?= =?us-ascii?Q?mpnuoUxVOVbY4tGaMgleM/F3SCqTCnJk4oI+twNAiFOkU87MwparJIYwmo+A?= =?us-ascii?Q?GoXKbBQXGiZwb4g7op3ilam9lHlmubpYdE7y2yDIVQB4BQ4EG4EBcNTqr258?= =?us-ascii?Q?Bbw6UMaC3ZZygqvkJZ0k0CbNB4eSQV5Y7UNVjhcqu4TIsqDWlgXx0mHFpx5C?= =?us-ascii?Q?O/kSz6zE+Lo4uqypZ98x24u3y1A2eL6yJ1o1vTjybzcLods0DJM6PpfjLwK+?= =?us-ascii?Q?eZw/K+xSJJupPP+TCgDA9hEzmls1sXIutzuqLoHHYHCjh4UwkOahWSWkEhys?= =?us-ascii?Q?AROzJRo9ErqZSQ1MI47NUg9jRDvnQ5WW7VDlt42Q/chuEJ52hDoawyN4130D?= =?us-ascii?Q?lwu8YhThOKGXOBHZJH1FLy53x9/aJYQIAE8RATA/wcut7PK83jyRSs1P4gb5?= =?us-ascii?Q?N3H+ow39ayU7yNqFYyUvP4lYJpSPPpF9Kjz31cGCCb3AMSiJd3HodGtdaSzd?= =?us-ascii?Q?vFK5SeRtLHjVx4W/QWkRjUjm2AtuB5ENwBDGRamEmeLGgw2Gxs2zp1o7VnOz?= =?us-ascii?Q?WAvoVe2ad8RSRgZssngYfjaJoQ2ZC4XVvJZEdYFQMw/a63DKxXGm/r0A1d2x?= =?us-ascii?Q?DSsVE+/Mp6RTlAMveAXoEJSsfrFNNHPBiHIRXGKLBtsGC6CStFLhVuF3PI3S?= =?us-ascii?Q?PPMLriZj+4X5T0neRktyv+AWVgl1iOWakWpzLwY6ZBFAfQ1+WfQ1UrYKCdGz?= =?us-ascii?Q?0BanKENlN4BoW33sIbE0ZG4oAVO7anCiH3R+t6hKhBZA4ftaKfmyk5xIddjZ?= =?us-ascii?Q?MhEee+YZaWjNz1EZ9fsivPy5tbc4Hj5jvO3jZgc1Hq7IQhcLhUnOPzampJfD?= =?us-ascii?Q?82jnMZVPW8xtR8bvMwI/LmJsA5zpnDpE5WQPmUNkXDi3wnqo+Y/RMxqUTsMO?= =?us-ascii?Q?bNQeMakqDYoGfZDfolZDcVL2Zwq51xTaZIxzc0E7lkRyvUvpf5Vp9pObPKGW?= =?us-ascii?Q?2neiOZ2sHdEgbUJbkZGff81fBjBJJONvfagccoeA5Umwqe4u7D+gMVN22ZXg?= =?us-ascii?Q?nNyFtem0hnr2BrVsWJNeMXtVK7S1wTjIibUuU3T5mqqsrRTQ5BIqw2D7OK9J?= =?us-ascii?Q?Du7FUIgnD983cSGTMS9gAcCmjhVmJSlKsBMEaVLhbwc+Zg06UBJkdbkm6e+n?= =?us-ascii?Q?qnLB0f676KU6a2WMJX/O9LpzHvjNcyaITLtHWuv9u5Aqh5AFY9z6UcEM0nZ5?= =?us-ascii?Q?P/tcf7/y+M0b6KzvJFOoMX8i?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 31cb5a69-8fdb-4304-653d-08d92c0ce08f X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5807.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 12:40:07.0088 (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: NwWa4nhaGVN3HK7ht4f/MFcBO4T9U2Av0XlBApECfcVmeJR3gnIwXIeNoD0tQKx6EiHPuocoB9OeH0rNNoV/5g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5312 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 The T2080RDB boards revisions D and up have updated 10G Aquantia PHYs connected to MAC1 and MAC2. The second Aquantia PHY is located at a different address on the MDIO bus compared to rev C. Account for these changes when initializing the board in the legacy non-DM_ETH mode. Signed-off-by: Camelia Groza --- board/freescale/t208xrdb/eth_t208xrdb.c | 16 ++++++++++++++-- include/configs/T208xRDB.h | 8 +++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/board/freescale/t208xrdb/eth_t208xrdb.c b/board/freescale/t208xrdb/eth_t208xrdb.c index b0ff4b1f375a..d0329a87d281 100644 --- a/board/freescale/t208xrdb/eth_t208xrdb.c +++ b/board/freescale/t208xrdb/eth_t208xrdb.c @@ -26,6 +26,8 @@ #include #include +extern u8 get_hw_revision(void); + int board_eth_init(struct bd_info *bis) { #if defined(CONFIG_FMAN_ENET) @@ -34,6 +36,7 @@ int board_eth_init(struct bd_info *bis) struct memac_mdio_info tgec_mdio_info; struct mii_dev *dev; ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); + int aq_phy_id_1, aq_phy_id_2; u32 srds_s1; srds_s1 = in_be32(&gur->rcwsr[4]) & @@ -59,13 +62,22 @@ int board_eth_init(struct bd_info *bis) fm_info_set_phy_address(FM1_DTSEC3, RGMII_PHY1_ADDR); fm_info_set_phy_address(FM1_DTSEC4, RGMII_PHY2_ADDR); + /* The AQR PHY addresses differ between board revisions */ + if (get_hw_revision() == 'C') { + aq_phy_id_1 = FM1_10GEC3_PHY_ADDR; + aq_phy_id_2 = FM1_10GEC4_PHY_ADDR; + } else { + aq_phy_id_1 = AQR113C_PHY_ADDR1; + aq_phy_id_2 = AQR113C_PHY_ADDR2; + } + switch (srds_s1) { case 0x66: case 0x6b: fm_info_set_phy_address(FM1_10GEC1, CORTINA_PHY_ADDR1); fm_info_set_phy_address(FM1_10GEC2, CORTINA_PHY_ADDR2); - fm_info_set_phy_address(FM1_10GEC3, FM1_10GEC3_PHY_ADDR); - fm_info_set_phy_address(FM1_10GEC4, FM1_10GEC4_PHY_ADDR); + fm_info_set_phy_address(FM1_10GEC3, aq_phy_id_1); + fm_info_set_phy_address(FM1_10GEC4, aq_phy_id_2); break; default: printf("SerDes1 protocol 0x%x is not supported on T208xRDB\n", diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index e467ef453d2f..871f7db34501 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2014 Freescale Semiconductor, Inc. - * Copyright 2020 NXP + * Copyright 2020-2021 NXP */ /* @@ -537,8 +537,10 @@ unsigned long get_board_ddr_clk(void); #define RGMII_PHY2_ADDR 0x02 #define CORTINA_PHY_ADDR1 0x0c /* Cortina CS4315 */ #define CORTINA_PHY_ADDR2 0x0d -#define FM1_10GEC3_PHY_ADDR 0x00 /* Aquantia AQ1202 10G Base-T */ -#define FM1_10GEC4_PHY_ADDR 0x01 +#define FM1_10GEC3_PHY_ADDR 0x00 /* Aquantia AQ1202 10G Base-T used */ +#define FM1_10GEC4_PHY_ADDR 0x01 /* by board revision C */ +#define AQR113C_PHY_ADDR1 0x00 /* Aquantia AQR113C 10G Base-T used */ +#define AQR113C_PHY_ADDR2 0x08 /* by board revisions D and up. */ #endif #ifdef CONFIG_FMAN_ENET -- 2.17.1