From patchwork Thu Aug 8 01:43:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1143765 X-Patchwork-Delegate: hs@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="CllLVS3R"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 463rkP20hZz9sN4 for ; Thu, 8 Aug 2019 11:43:41 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id ED0C4C21E30; Thu, 8 Aug 2019 01:43:37 +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=RCVD_IN_MSPIKE_H2, 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 33B74C21DDC; Thu, 8 Aug 2019 01:43:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4F06FC21DDC; Thu, 8 Aug 2019 01:43:34 +0000 (UTC) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10084.outbound.protection.outlook.com [40.107.1.84]) by lists.denx.de (Postfix) with ESMTPS id 2424EC21C6A for ; Thu, 8 Aug 2019 01:43:32 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DuskLA28Rcl1jDpxStp9ygSFZOG4hYz7RU53xw74u9/Ar5SluUs3kHbIixD5B8n2HDWgENnHUhY+C0RgsvY/C0tWj5nk9P1uFm413vodHQSgb83Xc6KlxgU5k9bZB6qWylyWHDGZ8bu2PllijveY6toNIITzk4FfciO9SmK0eNpfUNQjlDsXLyBCKZeCi5rDUjL7pC1CwwQb5BjyIKgXvpzo18/6O7RV3OTHhEvf900D9GFPyTSdZIjiVrPK/6sp7Ys60zYRy5sWsxyB1TwOR0qr+SpdW+BI+W46mdwLHHmh4p6pgz46anVHpDHTW0Xrp2+7QhrcNoLyLqkBHM+0mg== 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=LC39AoegVKJHsv7BrbeRmw3T5BF9lbajOoCvzO0ql/U=; b=TvGEZ4JswPo8MdBiJqyKsysbLfdiOErV+W/+YgNoArKjeCiAK0WACUppPSQGzvR9MEZmnn5TDE4D9MBi2HfY2rfwOdB2vJCwyYQpMgZllH9cDmwr7gYd7jg4Im1ocm3VVhNlu+z4jIYNHwnIknzLldMD4skFZ5K2vP3P6Gv/c8aTlZQs0O8ctcg1pwdeTc2dN+Bkf492Oht410RegR+ej55SI9YOUTyAzI8uvTKawW7dkTml1ej1y+qdyr+5g8ZlOGb4KY5XRpcvrbPELA2NyOrYcUKbq9WulEmdVwjBUhggPVP4MjWx4bm0t01vEysDDTwXxPtDhPrliOCAVl276Q== 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=LC39AoegVKJHsv7BrbeRmw3T5BF9lbajOoCvzO0ql/U=; b=CllLVS3RcBn4y5jrizOYI7xTcoT7iPdunorfZlG+FcDCBStDaKq2UxL809aG4Fl47ZbavPCz6Pc9nr4Xrmfpi3if6p9qiMKiU16mRrud4d9hDBvd0Gyn8bcqekpPL0vFfyTp0u217GmigEx9Y8p+rhu7w+5Q42VJaJ18k2ElHns= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB6481.eurprd04.prod.outlook.com (20.179.254.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2136.16; Thu, 8 Aug 2019 01:43:30 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5d98:e1f4:aa72:16b4]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5d98:e1f4:aa72:16b4%4]) with mapi id 15.20.2115.017; Thu, 8 Aug 2019 01:43:30 +0000 From: Peng Fan To: "frieder.schrempf@kontron.de" , "sbabic@denx.de" , "festevam@gmail.com" , "hs@denx.de" , "agust@denx.de" , "lukma@denx.de" Thread-Topic: [PATCH v2] i2c: mxc: add CONFIG_CLK support Thread-Index: AQHVTYquiEyJSv7d70avP/vuVaCy+Q== Date: Thu, 8 Aug 2019 01:43:30 +0000 Message-ID: <20190808015908.348-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: HK0PR03CA0070.apcprd03.prod.outlook.com (2603:1096:203:52::34) 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: 77892b6d-39a2-4424-1e08-08d71ba1d0ea 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:AM0PR04MB6481; x-ms-traffictypediagnostic: AM0PR04MB6481: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1186; x-forefront-prvs: 012349AD1C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(366004)(396003)(346002)(376002)(136003)(189003)(199004)(81166006)(4326008)(5660300002)(25786009)(14454004)(8936002)(6506007)(386003)(81156014)(6116002)(3846002)(66946007)(99286004)(1076003)(50226002)(36756003)(66476007)(316002)(110136005)(8676002)(66446008)(64756008)(66556008)(54906003)(305945005)(2906002)(478600001)(66066001)(7736002)(52116002)(6512007)(53936002)(2201001)(44832011)(71190400001)(71200400001)(476003)(2616005)(6436002)(486006)(86362001)(102836004)(256004)(26005)(2501003)(186003)(6486002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB6481; 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: QbJP85p2U2cwpZBQnl5Ljq3uRLW0F77rSM0TZgEr7EvLZCtTJwsZ5WQfwUvUPAVXRWKpM/xP/f8yeUbMEQNbXP8o41Cweq2uGxOMcj5mPLeglkVHY9gDLZkOlu+uxVzxQeHJXmDH6MeZzih00I5r7fqOyrnPG9K4bRdKgVH7gti2279+biVvzn67kffsdgh7lUbjot/51b4jqMDadw3vmt72ov2tX/jWgd7bKHB2SYVB8Cx9KwVriVgyCMrpAMgnOmHX9PiR2NYDBaxXH+o38TFYDYCe0z0m93yTMFEttghDMV+oKK2Arz+NV67s+hPNS9Iy7nigd3ztAEpttF6T+F/Lzo+mGot8aNmQxC76vbcu4oIhyrO2wfuFtHYtsR0zq1dWo1EM2ubYz1//ekFDOM5B/41QvHrmswBrl8vu3Bc= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77892b6d-39a2-4424-1e08-08d71ba1d0ea X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Aug 2019 01:43:30.6862 (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: AM0PR04MB6481 Cc: "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH v2] i2c: mxc: add CONFIG_CLK support 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" When CONFIG_CLK enabled, use CLK UCLASS for clk related settings. Signed-off-by: Peng Fan Reviewed-by: Frieder Schrempf Tested-by: Frieder Schrempf --- V2: use clk_get_rate when getting i2c per clk rate with CLK UCLASS arch/arm/include/asm/mach-imx/mxc_i2c.h | 6 ++++++ drivers/i2c/mxc_i2c.c | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/arch/arm/include/asm/mach-imx/mxc_i2c.h b/arch/arm/include/asm/mach-imx/mxc_i2c.h index 8e1ea9af19..81fd981444 100644 --- a/arch/arm/include/asm/mach-imx/mxc_i2c.h +++ b/arch/arm/include/asm/mach-imx/mxc_i2c.h @@ -6,6 +6,9 @@ #define __ASM_ARCH_MXC_MXC_I2C_H__ #include #include +#if CONFIG_IS_ENABLED(CLK) +#include +#endif struct i2c_pin_ctrl { iomux_v3_cfg_t i2c_mode; @@ -47,6 +50,9 @@ struct mxc_i2c_bus { ulong driver_data; int speed; struct i2c_pads_info *pads_info; +#if CONFIG_IS_ENABLED(CLK) + struct clk per_clk; +#endif #ifndef CONFIG_DM_I2C int (*idle_bus_fn)(void *p); void *idle_bus_data; diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 23119cce65..8d6b4650ff 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -149,7 +149,12 @@ static uint8_t i2c_imx_get_clk(struct mxc_i2c_bus *i2c_bus, unsigned int rate) #endif /* Divider value calculation */ +#if CONFIG_IS_ENABLED(CLK) + i2c_clk_rate = clk_get_rate(&i2c_bus->per_clk); +#else i2c_clk_rate = mxc_get_clock(MXC_I2C_CLK); +#endif + div = (i2c_clk_rate + rate - 1) / rate; if (div < i2c_clk_div[0][0]) clk_div = 0; @@ -890,9 +895,22 @@ static int mxc_i2c_probe(struct udevice *bus) i2c_bus->bus = bus; /* Enable clk */ +#if CONFIG_IS_ENABLED(CLK) + ret = clk_get_by_index(bus, 0, &i2c_bus->per_clk); + if (ret) { + printf("Failed to get i2c clk\n"); + return ret; + } + ret = clk_enable(&i2c_bus->per_clk); + if (ret) { + printf("Failed to enable i2c clk\n"); + return ret; + } +#else ret = enable_i2c_clk(1, bus->seq); if (ret < 0) return ret; +#endif /* * See Documentation/devicetree/bindings/i2c/i2c-imx.txt @@ -919,7 +937,11 @@ static int mxc_i2c_probe(struct udevice *bus) ret = i2c_idle_bus(i2c_bus); if (ret < 0) { /* Disable clk */ +#if CONFIG_IS_ENABLED(CLK) + clk_disable(&i2c_bus->per_clk); +#else enable_i2c_clk(0, bus->seq); +#endif return ret; }