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 0A9E5C38142 for ; Tue, 31 Jan 2023 08:49:02 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 085EE85A11; Tue, 31 Jan 2023 09:48:36 +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="OafgcySX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1BCF685A06; Tue, 31 Jan 2023 09:44:39 +0100 (CET) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2064.outbound.protection.outlook.com [40.107.20.64]) (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 173F485A01 for ; Tue, 31 Jan 2023 09:43:29 +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=WU8xBBkOkkdwSRaM7x/0YMgMEl28dmhYfN0kFvGKOT7bV6W2K/1gy0trBlolwo8I4WVk6y9+zRTLc03GtyKBCI+RXUJ8fZZsCCxUycNubcADBHiZ0BdzViyqxDrXTnDNIFiYKpadN4Tu/RMp9SIMLfNcSD0P+6PVtzlATZsuYYE03DIl9EKKlSM8H2VaUDjs3/X9SgUychl8nhVmpLMVNz7pDRp/ovHKtMe7JQjZOa1+bDE0Geobq357wlcdo6G7PHFZYrpkBKj3k+Qe5FJ0DTZGAdX3htVd3RECn1QoCtT+7GfV52ptXjPUMyVUjg4q7O4ujZCb5VV4CawKiTrnGA== 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=XLgx/pkguEFc3hoJa445d+p+ARn5gmQkD0qtJqzI5Ts=; b=JH1tk4ItIGBd2Kz2jP+bkxvbnOOuIFCdXzT0rgOf3ov2prImL5OOXl9YwTUZ606GFdjFCpNEFuX28hQewOrMXpN+fo69i8PqA+wcAltwqwshBbYpb2FVfjLvl7sVyteEe7ThBHcugLRA8vcvsle9CXaQ+ARcUPEAcBGDzOY7ppUud7PhiE0k0I0XV4DVzfmYqduRfpnjB1lqYWcaKR8E0wGzzSHdi+9XOPpTOdgzgFuggh2Km8MInZkckCqlQvzFq33NtE1NEKtCqwTZ4z6w3h3A0ZysPwfJopj92bu4TNuY3QP6nslxZAE/uXpFbb419XAPFQVtRRaFogh5Mk4tCw== 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=XLgx/pkguEFc3hoJa445d+p+ARn5gmQkD0qtJqzI5Ts=; b=OafgcySX5yeqhGhT/gez+oIUtWBPfxl9QkSA/teIPU8pvytAcQCwimZJDJGz3CX3BI7tD5hdu4KunRsbijWJ6mJMUGWB+FAf1LkTUbhS3XJAxlbA0qL30ruT4PzexUY9xRS7ao8uYM8bxIu0gtyrb1h0DTe0gxUFTObGk9WO6wQ= 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:27 +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:27 +0000 From: Ye Li To: sbabic@denx.de, u-boot@lists.denx.de Cc: peng.fan@nxp.com, uboot-imx@nxp.com Subject: [PATCH 14/23] imx: imx8ulp: Update clocks to meet max rate restrictions Date: Tue, 31 Jan 2023 16:42:25 +0800 Message-Id: <1675154554-88217-15-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: e6d5f528-80dc-4379-023f-08db036738a4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /DqATmonhOHNiZ0PBtI06wqMWZAZXNT5gyMvALhquNtel+VZyv+vOcVf84purHltBkqk+xaZa9IJVHU1SXigmQ8r1CGT6PvdUEFAL4QyjHqL/9vsHGOLKM78hZ7uSIlH0s1Q+cecAWEXogPNkB6jf8f90ujuCQ9s+uW/P4Tk8H2VcgZHAo+7LM7qqcBtjLGS1tA/M9GfBgQNxiTdta7N9Sej/3wWSUJvfaEYXWmTsypPWVep0y4BM25dpHIk3uLzilBva52OGEGyW39nzFdsLFDkZ2qahWxGpwOgAE8uVeaupOdSHi+A6ZDq+ZgeuzTUHVpKMd3nxI8Ewyz65E3z7x1cv/pUjS0RvK5OTyYAST0avLj+pHx4UynXhtEd76tTZ3RNnpwMDZl4hB+dYMF0iemvzqytIH82MVa9iyIwyhxF+wgWuDvPZWM6a5IfbfF3HCfCLL/trebKjUNEC92/ECykHsv2Qg1zKpTzl1ix9002ccMO+/oDL/jtYtAWp/EyTLCHJPEZnoUxupBCe3dk8NHO/hOCVMQM+qWZctejmhxlTQ60tnyVyoZgVwMG+k82R0Yl7ZVHF6QwnTACdQhhvZJ5iA+ggH/0tMGLMG44TokbOd4vjHOOf/WC+zX0K0mpsOqhdPG/Zze94Uz6U/VfgGk0bKrXWceXjZ6Nl1g/xq9AnX02xHTZEC1GmP5LlGwFZCYQ2QP51+ZpD+Gw5l8ap7rc6RtcV7BiCIFewzxU/JM= 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)(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?OQy58DzMvK2eq+bAuD/yWGub4rLD0xkDOsd0DwkiYETdDtUjDeFiu/3m0ECn?= =?us-ascii?Q?SWydIfstytxIciTmE/Cb21K48imLg5pe2HELO97ruyhw3e8nLebtIVCKoKuQ?= =?us-ascii?Q?RugJCQxAQkcSLSkn7SkjAY61lePhW+ZXetrwujjd79z09tNI+zoUe3uZQ2Fm?= =?us-ascii?Q?kGEDELBHnDhqgBWPX7sfwEhAYtzuMQtA4/zmg6KaIMH1zmR0YLcA7on1Gw+y?= =?us-ascii?Q?ABKEqITsRBADHpTwt3Cc/jRuQlAHyZYFEJY0U8ZzkQI1roqI9vhRKUWnKk1k?= =?us-ascii?Q?udtz6wQwZmJOQu9BLDDmFuSzbUnIaMXpjyt6IqRFx8DiRgRCknQcMWap4ZUh?= =?us-ascii?Q?ya7/OCMEoYQIMBbfUpxmdFKhVl0Ho8kZIh39jZVOD6ygZBtDrRHjGuF0a7Wh?= =?us-ascii?Q?+JDKHLM4ykU5bsV3lrZuBuXXgkL1gv0/QWm/iWvJFxLA2Vwwxxu03jMbdRUy?= =?us-ascii?Q?pHbcqszzbCcx7yI2Gdx+EPIfZ82bLkCkNYWap/FghV1+jypqVQndkbIhVVmu?= =?us-ascii?Q?fisLRrryvev8q/aG8vTzYeuCRZYqI52RAb3AZYvo0QSq2qON03d2pIQBzsO2?= =?us-ascii?Q?vXBTo1YKTza3quk4Wq9Bg0XwCM+Lmos++6JlZAkCR4RzAzprsvDHJyklespl?= =?us-ascii?Q?7xrFATeTHk44Oa/1GEwHUf3tJqGdpfFR+trvgh5zL4S5h2C1RDrFj+Tq9tIO?= =?us-ascii?Q?Vv1078wwDGW4pghBQ6l703Jc1KdU2iCaDOdwKboz23PB723yzKVQcY3MgGCr?= =?us-ascii?Q?LaW38DgJV69R6aM6xeHuSXwnlAeEtROYZn1BrR2cHCJB5xWJpGy832vFczew?= =?us-ascii?Q?9SuNIW09Knh3Pl7TEaHtDq9DYNQmOM8ow8RMtmjVCwsSvLecGXnMn4XaYwcG?= =?us-ascii?Q?82NVfHTBHOyLjYf1hx1CsHcAG3Q+bbaNy4ErZhw7/9M9eOIU27nOgt8V/hY0?= =?us-ascii?Q?9EoTtNOyFTnFGJK+YD3KO7sAD5DIqtsD6zXXC4JrdHGaVsIPmBNOaGp8DWEv?= =?us-ascii?Q?IQGUS2iaMCevc0n8C+RhS2OTA0Vu0GgQWs+zEKeQGbHrPRYkokeSbeHcwYCD?= =?us-ascii?Q?aSxMr8/LgIDIoAVi0krUSjVXVZHQpuzmQGOX/pAHRI7hC620Io3ELNH8U9mx?= =?us-ascii?Q?5ulaEctpa22i/WtojKlqsAtHQ6Mnwmsp533Fwa6AFD1ZwyubBWfKqtEeLWi3?= =?us-ascii?Q?RWjYvjYQvuyFM35ZAfrLnkmtB+NQM6GQ4lOh23ml7Y09/EioRn6UeBm0kPgL?= =?us-ascii?Q?5gFZ3pEH9VDG2qUERjQCmgb2HBUjVsXzafzcc3a8xxDTuwo2cnLG+yTGuvW5?= =?us-ascii?Q?2tjopEhvHeNTpmchNe8BehlboyhjoBrIluFI9t/5Obi3nP7EL/qkpnxBvbfN?= =?us-ascii?Q?Ydp5s69PJKcCi4Io/MW9kGd7LnihQMLzXMvWRqWDk5fdARCnjNDSPNxlf6rG?= =?us-ascii?Q?2w0jH9l6wB+3PhNnxi0hAr55dnwnzFvkOwKDXR6TIotQoWZVzxS51hEkwVkO?= =?us-ascii?Q?T3sZQdFW12hdTk4wImgq+Zkukx7w3qayMFx19ETK9ZPDy5HylxYA3i/4YBax?= =?us-ascii?Q?wIgxdeg4hMXLys85e+ZaQQwSi0outG1M36vfVDEv?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6d5f528-80dc-4379-023f-08db036738a4 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:27.2656 (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: K3L8rakAJ0wBCqSrA/ZVbF7YzzMhsrebqKlf/vLEYw6Th2/FvYmhzIrhgmb3ddo2 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 Update PLL3/PLL4 PFD and USDHC clocks to meet maximum frequency restrictions. Detail clock rate changes in the patch: PLL3 PFD2: 389M -> 324M PLL3 PFD3: 336M -> 389M PLL3 PFD3: DIV1 336M -> 389M (OD), 194M (ND/LD) PLL3 PFD3: DIV2 336M -> 194M (OD), 97M (ND/LD) PLL4 PFD0: 792M -> 594M PLL4 PFD2: 792M -> 316.8M NIC_AP: 96M (ND) -> 192M, 48M (LD) -> 96M NIC_LPAV: 198 (ND) -> 192M, 99M (LD) -> 96M USDHC0: PLL3 PFD3 DIV1, 389M (OD), 194M (ND/LD) USDHC1: PLL3 PFD3 DIV2, 194M (OD), 97M (ND/LD) USDHC2: PLL3 PFD3 DIV2, 194M (OD), 97M (ND/LD) Signed-off-by: Ye Li Reviewed-by: Peng Fan --- arch/arm/mach-imx/imx8ulp/cgc.c | 71 +++++++++++++++++++++------------------ arch/arm/mach-imx/imx8ulp/clock.c | 50 +++++++++++---------------- 2 files changed, 57 insertions(+), 64 deletions(-) diff --git a/arch/arm/mach-imx/imx8ulp/cgc.c b/arch/arm/mach-imx/imx8ulp/cgc.c index 104109e..d2fadb4 100644 --- a/arch/arm/mach-imx/imx8ulp/cgc.c +++ b/arch/arm/mach-imx/imx8ulp/cgc.c @@ -136,42 +136,34 @@ void cgc1_pll3_init(ulong freq) clrbits_le32(&cgc1_regs->pll3div_vco, BIT(7)); clrbits_le32(&cgc1_regs->pll3pfdcfg, 0x3F); - - if (IS_ENABLED(CONFIG_IMX8ULP_LD_MODE)) { - setbits_le32(&cgc1_regs->pll3pfdcfg, 25 << 0); - clrsetbits_le32(&cgc1_regs->nicclk, GENMASK(26, 21), 3 << 21); /* 195M */ - } else if (IS_ENABLED(CONFIG_IMX8ULP_ND_MODE)) { - setbits_le32(&cgc1_regs->pll3pfdcfg, 21 << 0); - clrsetbits_le32(&cgc1_regs->nicclk, GENMASK(26, 21), 1 << 21); /* 231M */ - } else { - setbits_le32(&cgc1_regs->pll3pfdcfg, 30 << 0); /* 324M */ - } - + setbits_le32(&cgc1_regs->pll3pfdcfg, 30 << 0); /* PFD0 324M */ clrbits_le32(&cgc1_regs->pll3pfdcfg, BIT(7)); while (!(readl(&cgc1_regs->pll3pfdcfg) & BIT(6))) ; clrbits_le32(&cgc1_regs->pll3pfdcfg, 0x3F << 8); - setbits_le32(&cgc1_regs->pll3pfdcfg, 25 << 8); + setbits_le32(&cgc1_regs->pll3pfdcfg, 25 << 8); /* PFD1 389M */ clrbits_le32(&cgc1_regs->pll3pfdcfg, BIT(15)); while (!(readl(&cgc1_regs->pll3pfdcfg) & BIT(14))) ; clrbits_le32(&cgc1_regs->pll3pfdcfg, 0x3F << 16); - setbits_le32(&cgc1_regs->pll3pfdcfg, 25 << 16); + setbits_le32(&cgc1_regs->pll3pfdcfg, 30 << 16); /* PFD2 324M */ clrbits_le32(&cgc1_regs->pll3pfdcfg, BIT(23)); while (!(readl(&cgc1_regs->pll3pfdcfg) & BIT(22))) ; clrbits_le32(&cgc1_regs->pll3pfdcfg, 0x3F << 24); - setbits_le32(&cgc1_regs->pll3pfdcfg, 29 << 24); + setbits_le32(&cgc1_regs->pll3pfdcfg, 25 << 24); /* PFD3 389M */ clrbits_le32(&cgc1_regs->pll3pfdcfg, BIT(31)); while (!(readl(&cgc1_regs->pll3pfdcfg) & BIT(30))) ; clrbits_le32(&cgc1_regs->pll3div_pfd0, 0x3f3f3f3f); - clrbits_le32(&cgc1_regs->pll3div_pfd1, 0x3f3f3f3f); - + if (IS_ENABLED(CONFIG_IMX8ULP_LD_MODE) || IS_ENABLED(CONFIG_IMX8ULP_ND_MODE)) + clrsetbits_le32(&cgc1_regs->pll3div_pfd1, 0x3f3f3f3f, 0x03010000); /* Set PFD3 DIV1 to 194M, PFD3 DIV2 to 97M */ + else + clrsetbits_le32(&cgc1_regs->pll3div_pfd1, 0x3f3f3f3f, 0x01000000); /* Set PFD3 DIV1 to 389M, PFD3 DIV2 to 194M */ clrbits_le32(&cgc1_regs->pll3div_pfd0, BIT(7)); clrbits_le32(&cgc1_regs->pll3div_pfd0, BIT(15)); clrbits_le32(&cgc1_regs->pll3div_pfd0, BIT(23)); @@ -182,6 +174,17 @@ void cgc1_pll3_init(ulong freq) clrbits_le32(&cgc1_regs->pll3div_pfd1, BIT(23)); clrbits_le32(&cgc1_regs->pll3div_pfd1, BIT(31)); + /* NIC_AP: + * OD source PLL3 PFD0, 324M + * ND source FRO192, 192M + * LD source FRO192, 96M + */ + if (IS_ENABLED(CONFIG_IMX8ULP_LD_MODE)) { + clrsetbits_le32(&cgc1_regs->nicclk, GENMASK(26, 21), 1 << 21); + } else { + clrbits_le32(&cgc1_regs->nicclk, GENMASK(26, 21)); + } + if (!IS_ENABLED(CONFIG_IMX8ULP_LD_MODE) && !IS_ENABLED(CONFIG_IMX8ULP_ND_MODE)) { /* nicclk select pll3 pfd0 */ clrsetbits_le32(&cgc1_regs->nicclk, GENMASK(29, 28), BIT(28)); @@ -222,20 +225,9 @@ void cgc2_pll4_init(bool pll4_reset) /* Enable all 4 PFDs */ setbits_le32(&cgc2_regs->pll4pfdcfg, 18 << 0); /* 528 */ - if (IS_ENABLED(CONFIG_IMX8ULP_LD_MODE)) { - setbits_le32(&cgc2_regs->pll4pfdcfg, 24 << 8); - /* 99Mhz for NIC_LPAV */ - clrsetbits_le32(&cgc2_regs->niclpavclk, GENMASK(26, 21), 3 << 21); - } else if (IS_ENABLED(CONFIG_IMX8ULP_ND_MODE)) { - setbits_le32(&cgc2_regs->pll4pfdcfg, 24 << 8); - /* 198Mhz for NIC_LPAV */ - clrsetbits_le32(&cgc2_regs->niclpavclk, GENMASK(26, 21), 1 << 21); - } else { - setbits_le32(&cgc2_regs->pll4pfdcfg, 30 << 8); /* 316.8Mhz for NIC_LPAV */ - clrbits_le32(&cgc2_regs->niclpavclk, GENMASK(26, 21)); - } - setbits_le32(&cgc2_regs->pll4pfdcfg, 12 << 16); /* 792 */ - setbits_le32(&cgc2_regs->pll4pfdcfg, 24 << 24); /* 396 */ + setbits_le32(&cgc2_regs->pll4pfdcfg, 30 << 8); /* 316.8Mhz for NIC_LPAV */ + setbits_le32(&cgc2_regs->pll4pfdcfg, 30 << 16); /* 316.8Mhz */ + setbits_le32(&cgc2_regs->pll4pfdcfg, 24 << 24); /* 396Mhz */ clrbits_le32(&cgc2_regs->pll4pfdcfg, BIT(7) | BIT(15) | BIT(23) | BIT(31)); @@ -247,9 +239,22 @@ void cgc2_pll4_init(bool pll4_reset) clrbits_le32(&cgc2_regs->pll4div_pfd0, BIT(7) | BIT(15) | BIT(23) | BIT(31)); clrbits_le32(&cgc2_regs->pll4div_pfd1, BIT(7) | BIT(15) | BIT(23) | BIT(31)); - clrsetbits_le32(&cgc2_regs->niclpavclk, GENMASK(29, 28), BIT(28)); - while (!(readl(&cgc2_regs->niclpavclk) & BIT(27))) - ; + /* NIC_LPAV: + * OD source PLL4 PFD1, 316.8M + * ND source FRO192, 192M + * LD source FRO192, 96M + */ + if (IS_ENABLED(CONFIG_IMX8ULP_LD_MODE)) { + clrsetbits_le32(&cgc2_regs->niclpavclk, GENMASK(26, 21), 1 << 21); + } else { + clrbits_le32(&cgc2_regs->niclpavclk, GENMASK(26, 21)); + } + + if (!IS_ENABLED(CONFIG_IMX8ULP_LD_MODE) && !IS_ENABLED(CONFIG_IMX8ULP_ND_MODE)) { + clrsetbits_le32(&cgc2_regs->niclpavclk, GENMASK(29, 28), BIT(28)); + while (!(readl(&cgc2_regs->niclpavclk) & BIT(27))) + ; + } } void cgc2_pll4_pfd_config(enum cgc_clk pllpfd, u32 pfd) diff --git a/arch/arm/mach-imx/imx8ulp/clock.c b/arch/arm/mach-imx/imx8ulp/clock.c index 3e88f46..36d1294 100644 --- a/arch/arm/mach-imx/imx8ulp/clock.c +++ b/arch/arm/mach-imx/imx8ulp/clock.c @@ -182,37 +182,20 @@ void clock_init_late(void) */ cgc1_pll3_init(540672000); - if (IS_ENABLED(CONFIG_IMX8ULP_LD_MODE) || IS_ENABLED(CONFIG_IMX8ULP_ND_MODE)) { - pcc_clock_enable(4, SDHC0_PCC4_SLOT, false); - pcc_clock_sel(4, SDHC0_PCC4_SLOT, PLL3_PFD2_DIV2); - pcc_clock_enable(4, SDHC0_PCC4_SLOT, true); - pcc_reset_peripheral(4, SDHC0_PCC4_SLOT, false); - - pcc_clock_enable(4, SDHC1_PCC4_SLOT, false); - pcc_clock_sel(4, SDHC1_PCC4_SLOT, PLL3_PFD2_DIV2); - pcc_clock_enable(4, SDHC1_PCC4_SLOT, true); - pcc_reset_peripheral(4, SDHC1_PCC4_SLOT, false); - - pcc_clock_enable(4, SDHC2_PCC4_SLOT, false); - pcc_clock_sel(4, SDHC2_PCC4_SLOT, PLL3_PFD2_DIV2); - pcc_clock_enable(4, SDHC2_PCC4_SLOT, true); - pcc_reset_peripheral(4, SDHC2_PCC4_SLOT, false); - } else { - pcc_clock_enable(4, SDHC0_PCC4_SLOT, false); - pcc_clock_sel(4, SDHC0_PCC4_SLOT, PLL3_PFD1_DIV2); - pcc_clock_enable(4, SDHC0_PCC4_SLOT, true); - pcc_reset_peripheral(4, SDHC0_PCC4_SLOT, false); - - pcc_clock_enable(4, SDHC1_PCC4_SLOT, false); - pcc_clock_sel(4, SDHC1_PCC4_SLOT, PLL3_PFD2_DIV1); - pcc_clock_enable(4, SDHC1_PCC4_SLOT, true); - pcc_reset_peripheral(4, SDHC1_PCC4_SLOT, false); - - pcc_clock_enable(4, SDHC2_PCC4_SLOT, false); - pcc_clock_sel(4, SDHC2_PCC4_SLOT, PLL3_PFD2_DIV1); - pcc_clock_enable(4, SDHC2_PCC4_SLOT, true); - pcc_reset_peripheral(4, SDHC2_PCC4_SLOT, false); - } + pcc_clock_enable(4, SDHC0_PCC4_SLOT, false); + pcc_clock_sel(4, SDHC0_PCC4_SLOT, PLL3_PFD3_DIV1); /* 389M for OD, 194M for LD/ND*/ + pcc_clock_enable(4, SDHC0_PCC4_SLOT, true); + pcc_reset_peripheral(4, SDHC0_PCC4_SLOT, false); + + pcc_clock_enable(4, SDHC1_PCC4_SLOT, false); + pcc_clock_sel(4, SDHC1_PCC4_SLOT, PLL3_PFD3_DIV2); /* 194M for OD, 97M for LD/ND */ + pcc_clock_enable(4, SDHC1_PCC4_SLOT, true); + pcc_reset_peripheral(4, SDHC1_PCC4_SLOT, false); + + pcc_clock_enable(4, SDHC2_PCC4_SLOT, false); + pcc_clock_sel(4, SDHC2_PCC4_SLOT, PLL3_PFD3_DIV2); /* 194M for OD, 97M for LD/ND*/ + pcc_clock_enable(4, SDHC2_PCC4_SLOT, true); + pcc_reset_peripheral(4, SDHC2_PCC4_SLOT, false); /* enable MU0_MUB clock before access the register of MU0_MUB */ pcc_clock_enable(3, MU0_B_PCC3_SLOT, true); @@ -425,6 +408,8 @@ void reset_lcdclk(void) pcc_reset_peripheral(5, DCNANO_PCC5_SLOT, true); } +/* PLL4 PFD0 max frequency */ +#define PLL4_PFD0_MAX_RATE 600000 /*khz*/ void mxs_set_lcdclk(u32 base_addr, u32 freq_in_khz) { u8 pcd, best_pcd = 0; @@ -443,6 +428,9 @@ void mxs_set_lcdclk(u32 base_addr, u32 freq_in_khz) for (div = 1; div <= 64; div++) { parent_rate = pll4_rate; parent_rate = parent_rate * 18 / pfd; + if (parent_rate > PLL4_PFD0_MAX_RATE) + continue; + parent_rate = parent_rate / div; for (pcd = 0; pcd < 8; pcd++) { -- 2.7.4