From patchwork Mon Jul 22 01:25:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1134646 X-Patchwork-Delegate: sbabic@denx.de Return-Path: 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=) 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="DKzO9eCl"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45sQYn2536z9s00 for ; Mon, 22 Jul 2019 12:30:05 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EBB4DC22084; Mon, 22 Jul 2019 02:30:03 +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 A7CC2C21E74; Mon, 22 Jul 2019 01:27:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BD81EC21E63; Mon, 22 Jul 2019 01:27:07 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70057.outbound.protection.outlook.com [40.107.7.57]) by lists.denx.de (Postfix) with ESMTPS id 727E6C21DA6 for ; Mon, 22 Jul 2019 01:25:11 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AlDy06ui5tRFTicHpftqsxhm6eNtIKEi6C6jU1HEY1R5Dz8Z39J1FQBstfzJ0pfxvIhFx26DoZUsQ1h0a9afCedLflt2w4m4m5YGwETZnUzY5HPy+IOlwReqIV2kSK+7Dy8sLhN1Rfivo3/jaOYakRueyX6glL/8gEHnsbyQjAV33x2X6Gz5YE2cltP03LjMWoJJp7CGo11kw1/csXUl43JzPoGwN1Obfj/fhtG0vgO1lIm2LnMiTFeN1LSJGQEzasXKVOIErRZTbwYruDlZUdsjHcvC6dpSF+e7/3KEEGHF9tqpoaf/7Wmm3EY+NW1YBfnZ3KM4e5We3SdR/pH0bg== 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=mUjLVytQbPA4kembVmWuYPRruf/KpU65D1lOn3rgi+4=; b=jvxV2G0mC7KP2z8UnlrQ3mxPrvxBuC+vwRgu6yMgTxqrjijPYcP8eseeQJp1EkXMhUq7WOMu22QCb1nDr8DnazvWEsEhEHCEKphT2P7RMl2rXYPcl7rgSq8mxNDaOFl3dVVQETldPDc1UcH5+kXMgcuNS007lEMPGumZ1qR9thg1k3qz02nk1+UIyh9OXabePFQnPmdP4po52A7GRZhmd2DMzrmqRcJ+AWKVjGvdRNCMCZubTKSx0vKW0LmEUS67Mxlm45CBMDnkAHO/aSXYL7josQrZMxVJFoJ0DRELnO5SKpb6wjH6vRgpBB/Zn4COzc6zl5Akv7VyusAARbernA== 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=mUjLVytQbPA4kembVmWuYPRruf/KpU65D1lOn3rgi+4=; b=DKzO9eCl9hXeevU6UcRj2ZN3L5h2IJS+ROgOwl1gD3Ena7difvWdjaE2tH7EJvehvkIdjQZYbsb/eRLyO8KMA2iyTwlMR98x2r/MY32sha6LMWiVGfx3S8ouQdgvkl2ekwGiOWTi5olnFoBwigEDEOrLK1/FAnJZf/9y5SC5Umo= 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:10 +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:10 +0000 From: Peng Fan To: "sbabic@denx.de" , "festevam@gmail.com" Thread-Topic: [PATCH RESEND 14/14] i.MX7ULP: Change clock rate calculation for NIC1 BUS and EXT Thread-Index: AQHVQCxNPMZVPodvm0iT2L0/lBtZig== Date: Mon, 22 Jul 2019 01:25:10 +0000 Message-ID: <20190722013941.30857-14-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: 909f5a9c-088d-4d37-3372-08d70e437036 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: x-ms-oob-tlc-oobclassifiers: OLM:4714; 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)(14444005)(14454004)(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: Sh4qlpFJnw2Elk/MYphuaA08z0cU2iI0zfSUj+CBHdyUTbqTzmQ3aM1qIn5InPzqHVh7nV5um0vbPTkejTYQpSeCEPeuUImZuKhVMIBIWr/M5Btf5MCsCIU2dVidCtPc1iANyQMWokOtqJ5pHTsaXQ9IHNvv2XANVttl1/PVIOYLwYB3XuosimH9tMEFE2x/gPnLH2Ko3aTUvIbR/ySuPCLhRVEl6z+3sjpNWe5K6iKIFYq0sJC2iyDvA3adQorFfJoliIVhc0Gd21E3/MLHmGA9iy9zi3TAXzd6F1VQ3SB77gYGOHKaV242ZC7P+wBFM//Ny9EJCXWEeW6NMvIxti1PUKk1v59wayI5QqXhr4bqnVlzxYQR/aQMStPElTn8TIfABEdwiunc3PdR30JSWvVue3yXA/UMvTTrq9JPsEE= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 909f5a9c-088d-4d37-3372-08d70e437036 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jul 2019 01:25:10.5721 (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" , dl-uboot-imx Subject: [U-Boot] [PATCH RESEND 14/14] i.MX7ULP: Change clock rate calculation for NIC1 BUS and EXT X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" From: Ye Li On i.MX7ULP B0, there is change in NIC clock dividers architecture. On A0, the NIC1 BUS and EXT dividers were in a chain with NIC1 DIV, but on B0 they are parallel with NIC1 DIV. So now the dividers are independent. This patch modifies the scg_nic_get_rate function according to this change. Signed-off-by: Ye Li Acked-by: Peng Fan --- arch/arm/mach-imx/mx7ulp/scg.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/mx7ulp/scg.c b/arch/arm/mach-imx/mx7ulp/scg.c index 0d31352c77..819c90af6c 100644 --- a/arch/arm/mach-imx/mx7ulp/scg.c +++ b/arch/arm/mach-imx/mx7ulp/scg.c @@ -352,7 +352,7 @@ static u32 scg_ddr_get_rate(void) static u32 scg_nic_get_rate(enum scg_clk clk) { - u32 reg, val, rate; + u32 reg, val, rate, nic0_rate; u32 shift, mask; reg = readl(&scg1_regs->niccsr); @@ -370,6 +370,7 @@ static u32 scg_nic_get_rate(enum scg_clk clk) val = (reg & SCG_NICCSR_NIC0DIV_MASK) >> SCG_NICCSR_NIC0DIV_SHIFT; rate = rate / (val + 1); + nic0_rate = rate; clk_debug("scg_nic_get_rate NIC0 rate %u\n", rate); @@ -411,6 +412,13 @@ static u32 scg_nic_get_rate(enum scg_clk clk) return 0; } + /* + * On RevB, the nic_bus and nic_ext dividers are parallel + * not chained with nic div + */ + if (soc_rev() >= CHIP_REV_2_0) + rate = nic0_rate; + val = (reg & mask) >> shift; rate = rate / (val + 1);