Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 61FD4C38142 for ; Tue, 31 Jan 2023 08:50:23 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 41B2D85A2C; Tue, 31 Jan 2023 09:50:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=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=nxp.com header.i=@nxp.com header.b="r6VxqGXF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E962885A11; Tue, 31 Jan 2023 09:44:50 +0100 (CET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2061b.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::61b]) (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 A57BD85A25 for ; Tue, 31 Jan 2023 09:43:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ye.li@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MX9mk02n+vrNBXrYEnGp0xAquydTToA62gBi1+i2v5IjsTguP0ffD040lx9OKOjvt4ZTOCtwVSMz287TioKIwwXmnGFTQk2zEy9DiaqBCSMAfkmuxFOdpkCmpeLWc77UpHD/vr5psy0kAbCvdpUyT0+qEi2b2dzh6AaLht3/yZWXRGFnf2ox35C63RIOMcd2Lh/hJ+kirfQmtBuDLLWGtziwvJPs5qTUhZBJXnvFAe0JWJBhAp84h9JgyWx/5qd4QBZJ0TU8bASDaAO7MhGDQZCT3CbJo072mxh9muFQ8GTAS4BUWEdXswHqdoTssztCr8h5+CmYasDzGQXIpgZdPw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QGhjjdjzGxtykF50od1qudlIcWxGIKpEJPpcWVBflWA=; b=RLyjcYf9W11xHmmwBZVnBU8vrExIexcM2/uUhZ8FQrA8kj08Ap5A6++16zhkOQZiXxwn/l4nkPy+mcFqNpgIb418jX+4+nwdXZZR+uKBG+dN0zQaz52/gnIfImWE24cSJyUVd7mB2Fh7I+egXwfX0y5XGZRiuHjaD9HLgEHsthq6EEPuzk/QPUdhHwB5q2HPNHRw8iBg/dwVtpzhYppRTKw17sUnRy0N+Ih8LB+due6bmmh+eSgphU6KlwSpB+RL5XRKsVeR0Kj3IFfV7r6+7b/t7mvQpISWwYd0SLzGeAdc/idGcgGAt/+61tlCiLVJTHHpc+F8ZG7lnGPMtCtyYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QGhjjdjzGxtykF50od1qudlIcWxGIKpEJPpcWVBflWA=; b=r6VxqGXFOx42QtRG8qpTs+yp7NDUxQedPlPzE1fgImunbkTjURJQQLtNJAEOKvzDxAkSP7uci2WV8OCWmP3lF+YK9P81K/w2L1IPFLInIrO9UnlwK8XaM9Pbv4XrMVJEcpr/+tTL9sWtn6zL934JasJEdBCro7hJ1R4hHwj4H5g= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB5302.eurprd04.prod.outlook.com (2603:10a6:20b:7::20) by GV1PR04MB9086.eurprd04.prod.outlook.com (2603:10a6:150:21::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.28; Tue, 31 Jan 2023 08:43:37 +0000 Received: from AM6PR04MB5302.eurprd04.prod.outlook.com ([fe80::1582:1a4a:3dda:50c6]) by AM6PR04MB5302.eurprd04.prod.outlook.com ([fe80::1582:1a4a:3dda:50c6%5]) with mapi id 15.20.6043.038; Tue, 31 Jan 2023 08:43:37 +0000 From: Ye Li To: sbabic@denx.de, u-boot@lists.denx.de Cc: peng.fan@nxp.com, uboot-imx@nxp.com Subject: [PATCH 18/23] ddr: imx: Update the ddr init flow on imx8ulp Date: Tue, 31 Jan 2023 16:42:29 +0800 Message-Id: <1675154554-88217-19-git-send-email-ye.li@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1675154554-88217-1-git-send-email-ye.li@nxp.com> References: <1675154554-88217-1-git-send-email-ye.li@nxp.com> Content-Type: text/plain X-ClientProxiedBy: SG2PR02CA0065.apcprd02.prod.outlook.com (2603:1096:4:54::29) To AM6PR04MB5302.eurprd04.prod.outlook.com (2603:10a6:20b:7::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB5302:EE_|GV1PR04MB9086:EE_ X-MS-Office365-Filtering-Correlation-Id: 8f47219e-cab6-409b-5347-08db03673e84 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jgYnKO5rVIP/7OVPTfFczCT1LZFIxD/QKr802Wu0oew7IgQeBOs1q0r6GwZVAcECXdQzAgIbO0OsWqDcamWqv3pLo0D04gxOrz/+CoERvNA9uN4udckIeOS2CqaeonBBPMgzmkq8Mr10hZRAgBirLBtxy2ifqwWbq4rSWKjkY+/ZKAesktPZChPJuzGf4Bb3UIxYgwxta6YqYPLUv8ifxrfvUzvK10iVXDu1LQIMAQhiKfq89+tkKZs4FTfSms9gPexRxpO042UoJU9oeGQ7CtCUAKASkIWa/FvY3NM167ONjPJPg600jUzuMTteg0KE7Aa99NfI5l/HkdVMTUoJgzPxVI1s3IKDs3C+nAeE+0KO/ihuWqwOu/KM66A2GHbUx3QlmboFBrq8YvALCvt+x2oHHh033yDvOrQgItf/N2zEbW5J7r7j63D3yy2C7LooXGRgJXZmefaJUUs5raGCCoWc8A5Role2v7XRPgH8ohhGQujx2HKg2c/Qi//gP3xeq4xrpWKQ53a61CznGKLfQUj7fVE/ehqCYjvoo+rgliQ0ZHpCBNTlKvTrqsglFceU+k5+zRCIRSkXNbNBdPn0MGdTATDPppE2Noqypbm27EmIlUq2LM0wjPZJBFUui5lK9XbsTNmanK5t7+VnY9lwwIg1IKH5RU7R18OB/WTXCmoZ+n278A40gJGxd8qhuR/uP8fFLJOkHA2FqxF8BkcbqCiy8I3c365ug1Dr+16enu0= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB5302.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(136003)(376002)(39860400002)(366004)(346002)(396003)(451199018)(38100700002)(38350700002)(41300700001)(26005)(186003)(6506007)(6512007)(6666004)(83380400001)(86362001)(66476007)(2616005)(66556008)(66946007)(4326008)(8676002)(52116002)(478600001)(6486002)(316002)(36756003)(15650500001)(44832011)(2906002)(8936002)(5660300002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VKvZhIxu44tfyO4rgtSdT9L5cgDoai+zW62ohvet21Fdh+Fa2MU2Cs+gZ47N?= =?us-ascii?Q?W5aj+hBJohSJwI9XAT6VyXhpfuQHEXzvFALmrmAuQureWjld96CY1Kilwb9E?= =?us-ascii?Q?e8s7IuV+Id5NvOrZdP4NVx0DWFjLI9N0CjMGu9icQtLYYhSOaY9wPaZ54swJ?= =?us-ascii?Q?JbxPrcEhe2XzfCbckcvs2E4YkLXMqF5hxf2E8PVOwvtpXB0M/TNfdSAbZaBM?= =?us-ascii?Q?S0AwiXXcyS0ucMwcWljP+somBISwRTIzWBU91QGV1Bxvbd7/0QI97C3cixkr?= =?us-ascii?Q?Rx0UOqxhxzYcNVUlhvB/UK7mAHurUI5+f0lzrcZQ10ZykVfpa1QLsFW824u8?= =?us-ascii?Q?0xyjQR2hzVBk1f77TUfgH1lu7C12SZCjNEk1jn+ghHbYosjTqfsnf10J/AGx?= =?us-ascii?Q?5SgK/WBZpwMiNbyLgE0eYBBbhEVjrQD2u1C4lJakLUWvKuSe4YvEIL1j6R0e?= =?us-ascii?Q?KqrNPOCeYi1VLc51NrFbOsxkSYIOizuW0DVZSYeghgIaRnyTL2CJMrvnjTIy?= =?us-ascii?Q?uu3PNHg+Q7feWhrqOimOyqwqZDvgLsf8ASRG56ANoOmtSBU+wOpzW9+gOjMI?= =?us-ascii?Q?WlGvHaTCLXo9rJGXCDCmkBAi42YDy++0JrnQ+LzDxvnF2tVC9nrDtt/IXwRg?= =?us-ascii?Q?/HxpJfN2oRVCDE6EqshROR2YdWA/P3sILj/XYTTUpzFn+rf4qmoqUBTTzxSS?= =?us-ascii?Q?tfs9GxM5rrYUCVF824R1OQP7MnoPbhBxWiR8ppJBLsbN/e85M8EeHvLgrnS7?= =?us-ascii?Q?NBmNoHzyc1VcMcs4fVMALZtzkRIKKtVNS9uFus+mUqrRaijRIb9lHiOrv+ee?= =?us-ascii?Q?tlNtmj9FN06J4sf0yskIKpBpogE30MYZrDL7/5O8i3VUWsJcPIJlaYnPquWr?= =?us-ascii?Q?yQeUrby2P7r7qz9hasTKR4akH9i4wFaCAIJ316DT/ujX240wlsuinGb8xL/P?= =?us-ascii?Q?o29l+lCtfGQ2IF5Lwvl0IWQ7N4gxPbEnJS7OGcdJ3vgPaeISCeq1Lm2pJCgo?= =?us-ascii?Q?laQ1jKy1my75KA0Kqr8OW/JwDyu6rZEYHyuGGVFP7rEwfMqclAf1uqO3HSOU?= =?us-ascii?Q?nX9UsYuMEQcqYfp5LPfApwItBbw5X+F03D/aW13dEZQ7QgcbFjB4aMRhUNvu?= =?us-ascii?Q?+XPjHMnIiTt3Kn9RjnTAxDN/ZpFuIMy4qU8txAmUmoxc9zRzSZYxy3gPDLoi?= =?us-ascii?Q?jhBMATsjbaap5K/1wv0BSLV9kz882yWO6Kfk6zMZdgZ2RNrGojoAMA5WWnDW?= =?us-ascii?Q?hcm3pqsRzhKuzbS1cfizcpvKoqJ3o3Fcgv/8MO9SgCOtg8diX6Iwq/PfglvX?= =?us-ascii?Q?qWWp5TerL6efHOZd4RmaD6/ZjeRGYEgxxzkR/ctSD2NkSk9bm1dFU0BFSSYF?= =?us-ascii?Q?isYsCpiLTX6MDjKQjZmx5f2Tp6Alx7e7bKRinbO4s7GNBNzVEeyCcY3q6fgL?= =?us-ascii?Q?yQ4ps/nNeQuf7qnzFeXlbF1L6AOc48pQytDxFQTB6xgi0zQlhaUYi5cduQFA?= =?us-ascii?Q?E0GE7Ihlw1XNOTsNx0+kyxq1iCLkhSHZq1QYUDIWOt8LtDO+W7G/y2blVTQn?= =?us-ascii?Q?YFmTesoLUFDt4JOlEJJAB+w7dOtgGciPMVwbw53Y?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f47219e-cab6-409b-5347-08db03673e84 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5302.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2023 08:43:37.0775 (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: WNB6Le9fni/tO4QfjMo5ZGmd3cA15ZZ6S0CKpLGIqhdUdCUQVmOfxEYz/P65JbME X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9086 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Jacky Bai Update the ddr init flow to support LPDDR3 and PLL bypass mode. Signed-off-by: Jacky Bai Reviewed-by: Ye Li --- drivers/ddr/imx/imx8ulp/ddr_init.c | 55 +++++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/drivers/ddr/imx/imx8ulp/ddr_init.c b/drivers/ddr/imx/imx8ulp/ddr_init.c index a5a9fd8..c362a2d 100644 --- a/drivers/ddr/imx/imx8ulp/ddr_init.c +++ b/drivers/ddr/imx/imx8ulp/ddr_init.c @@ -31,6 +31,7 @@ #define DENALI_CTL_25 (DDR_CTL_BASE_ADDR + 4 * 25) #define DENALI_PHY_1624 (DDR_PHY_BASE_ADDR + 4 * 1624) +#define DENALI_PHY_1625 (DDR_PHY_BASE_ADDR + 4 * 1625) #define DENALI_PHY_1537 (DDR_PHY_BASE_ADDR + 4 * 1537) #define PHY_FREQ_SEL_MULTICAST_EN(X) ((X) << 8) #define PHY_FREQ_SEL_INDEX(X) ((X) << 16) @@ -82,25 +83,39 @@ int ddr_calibration(unsigned int fsp_table[3]) u32 int_status_init, phy_freq_req, phy_freq_type; u32 lock_0, lock_1, lock_2; u32 freq_chg_pt, freq_chg_cnt; + u32 is_lpddr4 = 0; if (IS_ENABLED(CONFIG_IMX8ULP_DRAM_PHY_PLL_BYPASS)) { ddr_enable_pll_bypass(); freq_chg_cnt = 0; freq_chg_pt = 0; } else { - reg_val = readl(DENALI_CTL_250); - if (((reg_val >> 16) & 0x3) == 1) - freq_chg_cnt = 2; - else - freq_chg_cnt = 3; - - reg_val = readl(DENALI_PI_12); - if (reg_val == 0x3) { - freq_chg_pt = 1; - } else if (reg_val == 0x7) { - freq_chg_pt = 2; + reg_val = (readl(DENALI_CTL_00)>>8)&0xf; + if(reg_val == 0x7) { + /* LPDDR3 type */ + set_ddr_clk(fsp_table[1] >> 1); + freq_chg_cnt = 0; + freq_chg_pt = 0; + } else if(reg_val == 0xb) { + /* LPDDR4/4x type */ + is_lpddr4 = 1; + reg_val = readl(DENALI_CTL_250); + if (((reg_val >> 16) & 0x3) == 1) + freq_chg_cnt = 2; + else + freq_chg_cnt = 3; + + reg_val = readl(DENALI_PI_12); + if(reg_val == 0x3) + freq_chg_pt = 1; + else if(reg_val == 0x7) + freq_chg_pt = 2; + else { + printf("frequency map(0x%x) is wrong, please check!\r\n", reg_val); + return -1; + } } else { - printf("frequency map(0x%x) is wrong, please check!\r\n", reg_val); + printf("Incorrect DDR type configured!\r\n"); return -1; } } @@ -179,6 +194,22 @@ int ddr_calibration(unsigned int fsp_table[3]) } debug("De-Skew PLL is locked and ready\n"); + + /* Change LPDDR4 FREQ1 to bypass mode if it is lower than 200MHz */ + if(is_lpddr4 && fsp_table[1] < 400) { + /* Set FREQ1 to bypass mode */ + reg_val = PHY_FREQ_SEL_MULTICAST_EN(0) | PHY_FREQ_SEL_INDEX(0); + writel(reg_val, DENALI_PHY_1537); + + /* PHY_PLL_BYPASS=0x1 (DENALI_PHY_1624) */ + reg_val =readl(DENALI_PHY_1624) | 0x1; + writel(reg_val, DENALI_PHY_1624); + + /* DENALI_PHY_1625: bypass mode in PHY PLL */ + reg_val =readl(DENALI_PHY_1625) & ~0xf; + writel(reg_val, DENALI_PHY_1625); + } + return 0; } -- 2.7.4