From patchwork Tue Jul 17 12:38:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 945012 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="ojIvqln2"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41VKTN4qb4z9s0n for ; Tue, 17 Jul 2018 22:33:59 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E20C7C21E3A; Tue, 17 Jul 2018 12:33:44 +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=BAD_ENC_HEADER, 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 50A22C21E90; Tue, 17 Jul 2018 12:33:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8E17BC21E7D; Tue, 17 Jul 2018 12:33:28 +0000 (UTC) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40049.outbound.protection.outlook.com [40.107.4.49]) by lists.denx.de (Postfix) with ESMTPS id C846EC21E0B for ; Tue, 17 Jul 2018 12:33:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=g9RuE21ohAVhv+Nxkny49j9PZOOC1G/4Hs4qVZo3zWU=; b=ojIvqln22VofAoKB+4tXZMEi/xsXkty2lVk1Jyg1MwQsXnJK6x993sU2Y1tEhwKSCMNII2nrxCiw1epWMB4DwmKSZmq5x339FYmoVx1b6+Vy2qV53Blnn/G1LkIQUXdj/xZP/a77vyY7YwX82yVD7k9PMBheDjWG5eCQ9WR9AXk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-u7w5.ap.freescale.net.net (92.121.68.129) by AM5PR04MB2995.eurprd04.prod.outlook.com (2603:10a6:206:a::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.952.20; Tue, 17 Jul 2018 12:33:22 +0000 From: Peng Fan To: hs@denx.de Date: Tue, 17 Jul 2018 20:38:33 +0800 Message-Id: <20180717123833.28346-2-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180717123833.28346-1-peng.fan@nxp.com> References: <20180717123833.28346-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK0PR03CA0051.apcprd03.prod.outlook.com (2603:1096:203:52::15) To AM5PR04MB2995.eurprd04.prod.outlook.com (2603:10a6:206:a::27) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 860b24a2-0ecc-4b74-5cad-08d5ebe17ce8 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM5PR04MB2995; X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB2995; 3:9HiCb/vL58k0PViSUkfZTKW/Gamjdbf4uF8AUHGEqkKojHRG6hSKwU6xwjCzJUfZpClA6BKitGSf3f2GEmA4o8So9SRO0PeQ2zs/NFuONh4Swga30sU4MO4bPdcVmGTMOM1fjZw0mrqurV6zHaWjz3lqC1sIuT7ltwKvgjOgj6CjS0ZeJ1Wqa/fEj3MWCSVgMDiV9FX6zKe482XBEyYX33yYCi/c+TyuZCEpZaR8yFgNDqKJ8tfrZvEAImeZcfd5; 25:T8n4amkUcIj3GB3YXO8B+gsmErkjr5mm13nTswvcUqCBJ5U7Cm1TlUTbBKiDiOyhGfUI/hB7LXZHtU+f6eVOVV+j+9+vA2u59g1IXA4+hyMAGrtV30GO5lPKBWIPUliKECyhd3gHPlFh4EcqsmHmISD1EiI4/XeB1Dt+yXrD0VK6x9CVHX7znqK+PRvRUOAe+2dQNrO6FJ25rz4s784HKRlOYA59tjn+AYL0I6ZFr63eFrQf3zhhzgH8xX7k5vrDW8nG1K7eENoc8utjd7MbHbM/BntH9o87GRWg6JwqqPcEvUEVb+HzAsY1dQWU/QSFDWGgB7VC/L2f2rWgRiXntA==; 31:cMoCUPYFpLM+uzveqk9nXU7aWLOqoJPjl+pAMBXyP/yyCjEZ6pLq8bTiZYSot93/JAmnDLinoEqqcZ0B2yZK7XrA2OubOWsPx0eIco7pxi0eC0aenfEpdHao7C68HKFaGvQCi6PGRKKVq+OZI5iUwjP9Vl4bqLS9E9E38mAqBuj2upXsbNiC7w8uKL76Z/AuN5OG0c3n6yrDJSJZFBBiW1gZTj1s2mKCFCDaLj0gcNQ= X-MS-TrafficTypeDiagnostic: AM5PR04MB2995: X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB2995; 20:P4Hyv2IIm/+Xh0Ovab7AWTYXODFSVZHPYgwG7rnw4h6CofM9Vk5fJczoym4WOEjfj2TXHT7oR1jR1Ta6WvIE9vsEAWdOsVWASA6LwMfWJ8nvll+qR8sfBbb9E2NQAOliQ+3OgOd3ph9t9tWZfYM0aKhHOnE1y2pDTBMW6N/vZzy/j6ZHvayleJ3VHI8WncVGIaZImETAYvzc9LYPP1kmDKHh/oyaYYYeWj5I1jbz3aBSj/HbPnChhAXhL45hKHqgyyGdlquvPY54K6iLQ65Szvd05QZGrlCmFq8FA8lvAG5A0qTJDa3GJjCIvcDHQp+FFz6EwXfFdWfIlmePBD3KmAvBjV4KMLeEdJrfXShB/CY/If5rmqgko0rPh0BMJdPta09uRmg+i4ocXM+2fsdZiRrS8s45bIsjlTWWp1ZUDLI6HnavopMdummdxUv9ey9rqJ8OaFnT4UVwAGIx14cz61eyFIpNIdaozLp3KlN67flbV1Fm2X05Sde+SxXi/OqN; 4:o7F3XNnu316Ur2IIm/m/wdzR8gYNYVzhk0tdhtg4mHz8ZVV1YQuIKT2CkQAEfZXv8ElJAxCpVpBlZlAUF/nulYxjUmGGri2Ly8UIoft6yNY+DXj2y5CZu9pyloiZsjpPRjLksBAsjauuaI2EfZeLxtizEcAfupohz83eJNulUqGlK6C8eCKWsXsR0K0ZJtI5u62DC/2mzwv4To/Q9MWG0vz5faTHU6nGw4hnq0F8jKvQP7KdkdGd+sAGyivf0QWq770FfOW79k+XX/rxu9+jDM8NJ/pYHO9/asJGgQhGlFdrefKJwgSkxcWJLsVtGxsy X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231311)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:AM5PR04MB2995; BCL:0; PCL:0; RULEID:; SRVR:AM5PR04MB2995; X-Forefront-PRVS: 073631BD3D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(346002)(366004)(396003)(136003)(189003)(199004)(53936002)(97736004)(8936002)(1076002)(2906002)(36756003)(6116002)(3846002)(2361001)(81166006)(81156014)(68736007)(8676002)(7736002)(305945005)(4326008)(50226002)(48376002)(25786009)(478600001)(2351001)(86362001)(11346002)(6916009)(6666003)(52116002)(105586002)(106356001)(51416003)(44832011)(446003)(26005)(2616005)(486006)(476003)(956004)(6512007)(386003)(76176011)(186003)(16526019)(5660300001)(6506007)(50466002)(16586007)(316002)(6486002)(47776003)(66066001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR04MB2995; H:linux-u7w5.ap.freescale.net.net; 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-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR04MB2995; 23:agOPt9nkIBXHeBG9mxAmIbe5+8CYe5aMJf3STLvyr?= hr4mMxuzcI3t250wKeCPbl/yk6mFRwTHSO85x1QS2jW2eKRhRAo7w+pT2mOFZqHz3bF6zhAREqvcn7wYrUtULc+vId6lV6JeIbZ0N4vKzjNojlFeNjFzjkHuLnMQntKlLa5OSleBLEQo3Y4whLXKobTcF45OSdBMCRtakExskNYDoOAOxVmT12dC653gY9iPmvaAPAhN+tQ1TUdlOuYfdifRNxI4Sqd5U5eGEjK8AgbzTwd1bIirgWybnB1MhIpEHfEyCDBo7JpR9iY82r3ATB6RcoWproYnbThYi956HmM74am+a4jRC55aGFdFu6aj/e2VqolNqfsDFo4P59//KM/SNh59+ChOtGjvAKfQgCFyHEko0jF6cgEQWti+om6388UE+p38q7DoC6ZHqjSZI+6rQpAMvTFLR1KGwbYsLTv6ehoZDIq0sbSLtdt1Mtoy/xRaTahrpX1GTWbfpHoqjldU4/wAMWaf9FCqZqp/0gAwGy87Lfan+s7FjofVAN5uoluKBDHz+SG784P7l8YU9+3aBpxG2zS1uOdKGNhkM+Zs2OKOq1eXw5Kq+OGmmuX2tYEc7yfCYqXgYwR3vsmRHk9llFCyoyM3fIt85jnjVtnmYBTHnQq9mdJeEbFB5QEi6sdhEgLtXyA0kSLXTf5WRcs4iWUitmHmieXnL9f9uopdc6P2VLeqlN6TGJ1Zl95/90Xhgb/VK7VUG/AfJ7bAv+9da1Ynk7zGiZf7Gv9ztEKOisSEzmfc8WJILMLGABm3AbgJNxk41SelnExkXAl/FUPirJ3Qa4dkLrTG+Qao0gU/9mrPgx/mXXY7UVDRmAL67o+9cwLxE/cFzMczHk3fQ/OoiB67WtoKxn03TzbA2JRNfWcXZMTewsCzx6P4b2RGrKBCzItaFI4c/uQjR3yU5fq3MMKgpxAZLv7l9Q7m+hCBgaxrSg2+YLiIOIanw9h8Oy2SHqeY5jtcXuAnJosIgB0kuN73o2W9HbQA6MY+8rJGRcn3FG8l+jo9uVeUpkQSFvSvulfBrG3AeGSxuqEfhWvmrzZb61dSZ4jhN5/CfgHkuv8TPbVcXEYlXj5nO2pDDsLAPpeEmoPm746qqrGWJpbp20VUBYVQEYzN9O4LxUxS4DO52H+Y6fux7l9HCjz41QMERfsmXpuE5CK8EaFcVHgREsWI5lK8eFOtm/fMCsqhCzpdBBNaR2Lo6K4VafG4J4= X-Microsoft-Antispam-Message-Info: K0yGrr2rI0Y3S05oEMxh75O6Kwiqg3ELydk1fO/trT+vuBGCqkcAFGj+68vdnqzA2v25hdOWtp66dY6VXXiQc1idBbomd/MBu7dChHr+OGquk5OsWB1cmPu1aurM1pTMD9pzv2jz4zFUMT4O0fYPUO4GVaPVTiOI82bmeQo9yAURjIoQaywIjFMMP8Vkte7Cos5pi8FS5W3q1PKS5cc0/KyC3V7sEeuA1m8liAxSh1zY8Vzmonpv8MsoUsJ2bwUfyIcx2urjSpGTN4qtS9vmGDH9WCn5Uj47qs47/i0TJkDdawbIpOXtG7/IQUZwbyu6fqGTBJc2mEApUGPmpY/IDpXFxEoQJOPOdVXYQpTUUSs= X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB2995; 6:jWNp1HFVmW3z4Gvs8OEIXIqScalRjDTDmLjnOP3Hfjl5xSq81JNLdEyMsQ9zp1QbowDALJLWNupU2/AVzUENWNLbatwH/v1vDBLtcG1PQkI0GcLFVegK5gQjV4oZG6XIO4A+IEdaS/EAr4HVcDDP7zmS2ApMEAizmURJ+a8xwo8KwC9NqpcS7gHFE5JVYl+TqRIkNzpPSAM6/DWYOZ0MhoKZL3QiDoAFjPF3XKLml4lMIpYNngd6cMT8KTdRTxAkPwaiXxbLSc0WGh34spmeuUC9Q132TfsbxwHyinkNF0KPs37qTdF2Gu2zpZ/lJolFURipwiUTLafGGswee3p4qcH6UI7U16H70i/vO18KKFx5AOcJXwle1k15tWL9OCrY9ldo1yiDGDKRbiea1HkiGZhPrPrzsfz0C62TMT8c8JflHaCQYkg/cXNRbpBUaqmZXUbj5Mpuh6RZZUymipfMzw==; 5:qhpUO7Eelvr1C5Dk+SHbE8TlqKqBoDKfyFLLWFgnLdrLjBH3X1ZQV2ghOj6yFEkwc5w1Bfef2EqLxaHurgl8ndw51Kuxq+K2PxPWRLVzZ8B/YGVo/mW1fQnFrPmuRu1OhqAFfWi+qj3FAZO9j6Tcx+ukVR1Yt2go3QtwWxy1jBU=; 24:b0lXikbnBVU4xA3LUfV1XMVqr03BKS/LsJeMHs1KmlM98BNIoA4fKNww7qC9B7CnkSZ1SNd34OKSo7su6/JDteEYdIwNqtRq3BATdNvOE3s= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB2995; 7:wvZAUvODu7fYqVM42/rjKLQJNlA4Jh9lGWa2PrhTnAzK9jNYdF3IoQ/GDjAPlpSBB3wz7RsQb1VpohMWLR11byhHzoKgAdxvQuB8ODexkHLtn2Jnc7ZbS2AjuS7r2hcwM3Y6klHM0kPWjrztb32acW4jYIa2zKm34Q45WcoqsZnWYjm41Q1t+P12IYTHaXYGJj/IiM8INQFFDRaoe9IKImz453zZHYSgLBj9uZuVRTit9TZSS2GQVH97V3R1AN5+ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2018 12:33:22.2003 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 860b24a2-0ecc-4b74-5cad-08d5ebe17ce8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB2995 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 2/2] i2c: imx_lpi2c: add uclass api 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" Use uclass clk api to get per clk when CONFIG_CLK enabled. Signed-off-by: Peng Fan Reviewed-by: Anatolij Gustschin --- drivers/i2c/imx_lpi2c.c | 47 ++++++++++++++++++++++++++++++++++++++++------- include/imx_lpi2c.h | 3 +++ 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c index ff07ca34aa..6c343072fb 100644 --- a/drivers/i2c/imx_lpi2c.c +++ b/drivers/i2c/imx_lpi2c.c @@ -261,8 +261,14 @@ static int bus_i2c_write(struct udevice *bus, u32 chip, u8 *buf, int len) } +u32 __weak imx_get_i2cclk(u32 i2c_num) +{ + return 0; +} + static int bus_i2c_set_bus_speed(struct udevice *bus, int speed) { + struct imx_lpi2c_bus *i2c_bus = dev_get_priv(bus); struct imx_lpi2c_reg *regs; u32 val; u32 preescale = 0, best_pre = 0, clkhi = 0; @@ -273,9 +279,18 @@ static int bus_i2c_set_bus_speed(struct udevice *bus, int speed) int i; regs = (struct imx_lpi2c_reg *)devfdt_get_addr(bus); - clock_rate = imx_get_i2cclk(bus->seq); - if (!clock_rate) - return -EPERM; + + if (IS_ENABLED(CONFIG_CLK)) { + clock_rate = clk_get_rate(&i2c_bus->per_clk); + if (clock_rate <= 0) { + dev_err(bus, "Failed to get i2c clk: %d\n", clock_rate); + return clock_rate; + } + } else { + clock_rate = imx_get_i2cclk(bus->seq); + if (!clock_rate) + return -EPERM; + } mode = (readl(®s->mcr) & LPI2C_MCR_MEN_MASK) >> LPI2C_MCR_MEN_SHIFT; /* disable master mode */ @@ -417,6 +432,11 @@ static int imx_lpi2c_set_bus_speed(struct udevice *bus, unsigned int speed) return bus_i2c_set_bus_speed(bus, speed); } +__weak int enable_i2c_clk(unsigned char enable, unsigned int i2c_num) +{ + return 0; +} + static int imx_lpi2c_probe(struct udevice *bus) { struct imx_lpi2c_bus *i2c_bus = dev_get_priv(bus); @@ -440,10 +460,23 @@ static int imx_lpi2c_probe(struct udevice *bus) return ret; } - /* To i.MX7ULP, only i2c4-7 can be handled by A7 core */ - ret = enable_i2c_clk(1, bus->seq); - if (ret < 0) - return ret; + if (IS_ENABLED(CONFIG_CLK)) { + ret = clk_get_by_name(bus, "per", &i2c_bus->per_clk); + if (ret) { + dev_err(bus, "Failed to get per clk\n"); + return ret; + } + ret = clk_enable(&i2c_bus->per_clk); + if (ret) { + dev_err(bus, "Failed to enable per clk\n"); + return ret; + } + } else { + /* To i.MX7ULP, only i2c4-7 can be handled by A7 core */ + ret = enable_i2c_clk(1, bus->seq); + if (ret < 0) + return ret; + } ret = bus_i2c_init(bus, 100000); if (ret < 0) diff --git a/include/imx_lpi2c.h b/include/imx_lpi2c.h index 3fbb40bdd1..2700e5f876 100644 --- a/include/imx_lpi2c.h +++ b/include/imx_lpi2c.h @@ -8,6 +8,8 @@ #ifndef __IMX_LPI2C_H__ #define __IMX_LPI2C_H__ +#include + struct imx_lpi2c_bus { int index; ulong base; @@ -15,6 +17,7 @@ struct imx_lpi2c_bus { int speed; struct i2c_pads_info *pads_info; struct udevice *bus; + struct clk per_clk; }; struct imx_lpi2c_reg {