Message ID | 20190722013941.30857-10-peng.fan@nxp.com |
---|---|
State | Accepted |
Commit | eb6d2e5920fa518fc924025e1e7987cd0dde73ad |
Delegated to: | Stefano Babic |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="szdI2uH9"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45sQ756lXNz9sBF for <incoming@patchwork.ozlabs.org>; Mon, 22 Jul 2019 12:10:24 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id CA552C2202C; Mon, 22 Jul 2019 02:10:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 7DEABC21E3E; Mon, 22 Jul 2019 01:27:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2C99EC21D8A; Mon, 22 Jul 2019 01:27:01 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70081.outbound.protection.outlook.com [40.107.7.81]) by lists.denx.de (Postfix) with ESMTPS id A42E1C21D8A for <u-boot@lists.denx.de>; Mon, 22 Jul 2019 01:25:01 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UASe8yioNS7LCxZGCMLfNTvIGisgw2ywdUYpE2klmVN+D/Yn4N/mbWcFyo/gfTTIQ02S39ATMJPu0HwlEOsP3tPqbaboVIn8coPucWSQkieOdhgO9/dI8cWOwQ9gMAGmJ3NhfT2vIETRfqGDohYr+OcWFMtGjGx9GZ7009ZOf3wEaZSmjHq3QRgdS0NJw3l69xXPtOy2Rti01d0QpiZ1Nd9iWKh2PYkBcKWbH0/sKdgeTo6U9IkzacwZ8RS8dK7y+dPBY1+c2Hgxxsil+vAnPDT7YsiFpcT4Jo4QOSfZp4PjyJFTbZjCgKmGvTDZlgp7NTh9aLdN+xJHI5/Ggb1yPQ== 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=Qww5MXtAkHDqCm0IAGBneFAiknhHr5DUGUMJ4i49rQk=; b=kkYNq3yPcj0v4uvrezom46uPwq4b1m8NHlmjkNlpzL48axIndUdKCy6BbeG+YrGUrjirN/5mD4hppkIYYr6nAkNnQVbujEISi9DcCSQ2sNm2FZuyjZpkyWbax20cIKyVl5BNpf4rKAIax3Gk81F6O573TCeKGbmn1UC+wPhQZ3bsYJIOQq5wIPANzfa9CwkGdrlrJFQmlEqKK+t4zu4AEwgj0u/v8n2NsxiMWsbuVQoZzci7cZKrKyfnPwvcoUA4DpUAKfBJJ1/tqN8vVK6o8gYDX2lXOZS+bF0A/oCSsgeGfEzFdBdr8ZzTDnLHwZ+74HatSpV6xLdIWrRXRnIlhg== 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=Qww5MXtAkHDqCm0IAGBneFAiknhHr5DUGUMJ4i49rQk=; b=szdI2uH9alKrWBK8+xyJ8ZQwFDWrJDkufsfShUtrg3wGPOqRTQLb95KKjiFRtuSG9Bkve0+py44Jrp6DA2tghSCSCHIGeujACvaD7V/wbFBqMV+cm68tzvEpJuJo6InFZcoF0wn+l8rxHfSE28jBMt49Dx4sGOtIgK4tyX/kAHw= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB5458.eurprd04.prod.outlook.com (20.178.112.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.16; Mon, 22 Jul 2019 01:25:00 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::2023:c0e5:8a63:2e47]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::2023:c0e5:8a63:2e47%5]) with mapi id 15.20.2094.011; Mon, 22 Jul 2019 01:25:00 +0000 From: Peng Fan <peng.fan@nxp.com> To: "sbabic@denx.de" <sbabic@denx.de>, "festevam@gmail.com" <festevam@gmail.com> Thread-Topic: [PATCH RESEND 10/14] i.MX7ULP: Fix SPLL/APLL clock rate calculation issue Thread-Index: AQHVQCxHewTAQnCmmU+BTS44cAkueA== Date: Mon, 22 Jul 2019 01:25:00 +0000 Message-ID: <20190722013941.30857-10-peng.fan@nxp.com> References: <20190722013941.30857-1-peng.fan@nxp.com> In-Reply-To: <20190722013941.30857-1-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.16.4 x-clientproxiedby: HK2PR0302CA0018.apcprd03.prod.outlook.com (2603:1096:202::28) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.71] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: db9b35aa-f08c-4452-a6ba-08d70e436a31 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:AM0PR04MB5458; x-ms-traffictypediagnostic: AM0PR04MB5458: x-microsoft-antispam-prvs: <AM0PR04MB5458C0DC0A9E939D17BE1DAF88C40@AM0PR04MB5458.eurprd04.prod.outlook.com> x-ms-oob-tlc-oobclassifiers: OLM:6790; x-forefront-prvs: 01068D0A20 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(366004)(376002)(396003)(39860400002)(136003)(189003)(199004)(25786009)(5660300002)(81166006)(66446008)(66946007)(81156014)(66476007)(66556008)(64756008)(50226002)(256004)(14454004)(4744005)(86362001)(54906003)(99286004)(110136005)(2501003)(4326008)(1076003)(2906002)(8936002)(316002)(36756003)(6506007)(53936002)(68736007)(3846002)(6116002)(478600001)(71200400001)(71190400001)(52116002)(26005)(186003)(386003)(76176011)(102836004)(476003)(2616005)(11346002)(446003)(7736002)(305945005)(6436002)(8676002)(44832011)(66066001)(486006)(6512007)(6486002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5458; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 5vV8Ep2VkOAi2x5QRHZe/G3MBH3dWmThyS/B9NYN0Ks7p9YxhbPU9kWzdV5Xz0IvP4OCMceRkH569qkHS44t0G02P1TSjcdWwtfWujSJMLAYSCalZkBG7uXwEDKHZVYxUQ0uJ9+LdhBkASHoxOO/1kblG2YDncZLDgMQKxhfSuew9F3eFBT4/jhMqT6Yjy6NDOV64SDnxEYowyH4l55f7dYPdxGoGqgG6SIb5gzVt8/J+nkCnyatRBIEAO3x0WkmtAl0l/XywSSktV49erENUSGHoth9Cs880koHWIdcQJPEgPxjloJ0lf0dSqq6TYQ/nXlp+sSZUWxltvuZe/VEKTepYi9rZ3Ag4e7ERsIBcUOP9BOc6Ifdp4CcYSuM2B8ENOYeAHFc+LjnLVtM2Z2wJzr2FOxmLzNZrXxFZMQUwDI= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: db9b35aa-f08c-4452-a6ba-08d70e436a31 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jul 2019 01:25:00.7108 (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: peng.fan@nxp.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5458 Cc: "u-boot@lists.denx.de" <u-boot@lists.denx.de>, dl-uboot-imx <uboot-imx@nxp.com> Subject: [U-Boot] [PATCH RESEND 10/14] i.MX7ULP: Fix SPLL/APLL clock rate calculation issue X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://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>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
Series |
[U-Boot,RESEND,01/14] imx: i.MX7ULP: add get_boot_device
|
expand
|
diff --git a/arch/arm/mach-imx/mx7ulp/scg.c b/arch/arm/mach-imx/mx7ulp/scg.c index 85d726fe30..a28a2bc81b 100644 --- a/arch/arm/mach-imx/mx7ulp/scg.c +++ b/arch/arm/mach-imx/mx7ulp/scg.c @@ -503,7 +503,10 @@ u32 decode_pll(enum pll_clocks pll) infreq = infreq / pre_div; - return infreq * mult + infreq * num / denom; + if (denom) + return infreq * mult + infreq * num / denom; + else + return infreq * mult; case PLL_A7_APLL: reg = readl(&scg1_regs->apllcsr); @@ -532,7 +535,10 @@ u32 decode_pll(enum pll_clocks pll) infreq = infreq / pre_div; - return infreq * mult + infreq * num / denom; + if (denom) + return infreq * mult + infreq * num / denom; + else + return infreq * mult; case PLL_USB: reg = readl(&scg1_regs->upllcsr);