From patchwork Tue Aug 6 10:09:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1142691 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="atV9tb/j"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 462r2r0znzz9sN4 for ; Tue, 6 Aug 2019 20:09:24 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id CE11AC21E02; Tue, 6 Aug 2019 10:09:17 +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 24E53C21DA6; Tue, 6 Aug 2019 10:09:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 301D0C21DA6; Tue, 6 Aug 2019 10:09:14 +0000 (UTC) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140041.outbound.protection.outlook.com [40.107.14.41]) by lists.denx.de (Postfix) with ESMTPS id 925DAC21BE5 for ; Tue, 6 Aug 2019 10:09:13 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=keUC1tx/tSPXUcooYs8D+zwn2Td8urExMiOt+nhfgRUv+05CPyuZ3M7XAi8Rov4wbabkeNozcEBF7hO5357WTd2XIQluf5Hc1YQAYMQU1OeEaGP9yFfe3BS2Qy4nrDggZsKw0uZOIA8lbmtiUKlwx2BBD0YnijLxFU50829HLqSHlDc6cdZRj6zG9ALM0JmP4qzj3UqQEnrNc/FAHMZXpDrt2ESNnIbhiwtjQhgqKhyZI9Wprq8cpTAiPToVwFmao6WL+Zy8H8JyteMePHeeRTelnHBaAEn5GgtvpJFQQMjOCnbBXRtRntyTTEI04HXco/8TFI+J2EdFKFX5RQMfNA== 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=Lh3dade7Bda2Znn3+ctO7qbpfTV033n5g7B3VfFDN0M=; b=n7vRzoGtAuh4ODJ681N9tdSSPEEAoz/JHPAFxIVR7y03eG5n9IzPOceCVKAV/4pfKFz+XcYd3pa4Thqc0P87ZMl/daPWqtqbIrm9qapXA5yiff9XfhLZaUN4tDh0VwrIWhWePf23FFYNz7q6y2yZJWx9jqK8AaLtDVsy64A+dVJi/FbKKAq661x8MPnu6G8JS+LKu9jG8sSnn8Tx3x4o0hZyX42oi+jkXURVqO/Tdd1r28Ccqgd3p7GY3xekzqC2sTc+H78CBJrgouemnBalEQYziqe3SeG4yVk+/UVn+vZ6Ce5N0rWqPvCwLarqAWzhfJvrsSJPva7CMZRY1i9a5g== 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=Lh3dade7Bda2Znn3+ctO7qbpfTV033n5g7B3VfFDN0M=; b=atV9tb/jBMSuGccfkyhZVwhY4MI8ICP9qexbmW/BczcIsSvrkgxIC4ADTSxnxkfaOmgBY93DOuHW2ALPLjsZyPze2ooEf40/gFJi/sU3HfysDBQ9IcTOu4J9a6X/eYVrvoHhs9aYkszxJTlY09EW1pagcELOruuJCi8G4DK78m0= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB6641.eurprd04.prod.outlook.com (20.179.255.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.13; Tue, 6 Aug 2019 10:09:12 +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.005; Tue, 6 Aug 2019 10:09:12 +0000 From: Peng Fan To: "sbabic@denx.de" , "festevam@gmail.com" , "hs@denx.de" , "agust@denx.de" , "lukma@denx.de" Thread-Topic: [PATCH] i2c: mxc: add CONFIG_CLK support Thread-Index: AQHVTD7+bgIMTuB3h0yZlQ5IDlxiag== Date: Tue, 6 Aug 2019 10:09:12 +0000 Message-ID: <20190806102445.9633-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: HK0PR03CA0110.apcprd03.prod.outlook.com (2603:1096:203:b0::26) 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: 6c5dd9a2-2781-45fe-665d-08d71a562141 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:AM0PR04MB6641; x-ms-traffictypediagnostic: AM0PR04MB6641: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1186; x-forefront-prvs: 0121F24F22 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(376002)(396003)(366004)(136003)(39860400002)(199004)(189003)(7736002)(6506007)(8936002)(305945005)(14454004)(64756008)(316002)(8676002)(99286004)(86362001)(256004)(25786009)(66446008)(66946007)(66476007)(66556008)(50226002)(386003)(54906003)(71190400001)(71200400001)(110136005)(44832011)(2501003)(36756003)(4326008)(81166006)(81156014)(26005)(5660300002)(186003)(102836004)(478600001)(52116002)(66066001)(6436002)(1076003)(476003)(486006)(2906002)(2201001)(6116002)(53936002)(6486002)(3846002)(2616005)(6512007)(68736007); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB6641; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: xFZemNVKyuuH2H4pND+/kB2vyFTQDL3FATzlIFF8q6Nbhh1FmayYVEYdDq5ssrUNFduxzTD3nWsFA9TzJbhEIWUiXeyW6oiBG9p6mJuWNw95dzZWw735T/DddT8ErkknyMGQrrdQ9phQzjkjjC+BWcexSBzVhEH7InuSiZK0cxdQfHsHaC1W57qafnNa1ZvKdn0kWmQbJHtmXOENdyyqdssVABsZmck/Uvjc5aReJu4d9NSssKR4Ze+zNQZeB0IFGzBKKPF9uVpA+rf1YianPUCnJ3mFcz5OXj0GzAGEsX6eWThUlUrYantM6dsOeJ8nwDS01kP0ZnRUEVOIj6JN5wVhUmf+umYNAjmHce8aOjxVCnubydv7Acg78Dlm2cZup8FHylPubKD7ACJftYtNHHmHin0ICBSsgU7fK6pxPPs= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c5dd9a2-2781-45fe-665d-08d71a562141 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Aug 2019 10:09:12.5117 (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: AM0PR04MB6641 Cc: "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH] 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: Ye Li Reviewed-by: Lukasz Majewski --- arch/arm/include/asm/mach-imx/mxc_i2c.h | 6 ++++++ drivers/i2c/mxc_i2c.c | 17 +++++++++++++++++ 2 files changed, 23 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..2e157bca58 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -890,9 +890,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 +932,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; }