From patchwork Mon Feb 25 08:14:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1047621 X-Patchwork-Delegate: uboot@andestech.com 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=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="BSfWKqsv"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="NP67UebB"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 447FGT6Rnwz9s9T for ; Mon, 25 Feb 2019 19:19:13 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 6DC6DC21CB6; Mon, 25 Feb 2019 08:19:09 +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.7 required=5.0 tests=BAD_ENC_HEADER, KHOP_BIG_TO_CC, RCVD_IN_DNSWL_LOW, 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 E46FFC21D9A; Mon, 25 Feb 2019 08:15:14 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5FF2BC21C27; Mon, 25 Feb 2019 08:15:12 +0000 (UTC) Received: from esa1.hgst.iphmx.com (esa1.hgst.iphmx.com [68.232.141.245]) by lists.denx.de (Postfix) with ESMTPS id A440FC21E12 for ; Mon, 25 Feb 2019 08:14:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1551082499; x=1582618499; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=8Te+xbiNA+zK0QJi5ipIO9G0mcetNaDQdeITbua3hQ8=; b=BSfWKqsva3DkJ/o6U6cA78+TDWnqTPCGgG+QOzAb0emasX7jq3CgGQZB tpFk7YLMQ6aSw72w3VSLUVNGYwaq+s3HIzki2picd/AoSnWiu0a9fMsc3 V7vK2Je3TQjUnmyHYuus3yUiJR3upvIlkr+Dito68othCnsIzsvHXt8y2 uCK4glF3nllCo1HuWs8tZUm/0IMlllT0iFvyIPjEgZOkV7WL9kgo3SymQ /PlQJO0TNYEUU3YzI72/JXPOlUi4oSh76MrfNJ6z57aLViWTHQS4hhs1I Cd4PBYfjdOY94QlE/jMZIGQG6qsJjW05RfEaTz2qfzxVNvc+5/sAm4RTg A==; X-IronPort-AV: E=Sophos;i="5.58,410,1544457600"; d="scan'208";a="207327808" Received: from mail-sn1nam04lp2055.outbound.protection.outlook.com (HELO NAM04-SN1-obe.outbound.protection.outlook.com) ([104.47.44.55]) by ob1.hgst.iphmx.com with ESMTP; 25 Feb 2019 16:14:56 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tm+HZU+a9bNqHruOpmtngnmBHZQZrv3JAScoz9XFWWA=; b=NP67UebB+fJixzRG9/NyV4sPbl8g7TfvrmasU6z411HDTxxFuXoDjZc3wK/QyMLRkOQUNydhs9EdQqVjDy8/Ho5VY/KLPFjYRSm4MMup/eG90I8+0+z5fCfpdLtd//lnoU81ekr/eHGaTb8fFw4cGF8+A3OO/sa02hHG0GoC2TM= Received: from MN2PR04MB6061.namprd04.prod.outlook.com (20.178.246.15) by MN2PR04MB5789.namprd04.prod.outlook.com (20.179.20.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1643.15; Mon, 25 Feb 2019 08:14:55 +0000 Received: from MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::d197:7b59:7e0d:e819]) by MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::d197:7b59:7e0d:e819%3]) with mapi id 15.20.1643.019; Mon, 25 Feb 2019 08:14:55 +0000 From: Anup Patel To: Rick Chen , Bin Meng , Joe Hershberger , Michal Simek , Michal Simek , Lukas Auer , Masahiro Yamada , Simon Glass Thread-Topic: [PATCH v10 09/15] clk: Add fixed-factor clock driver Thread-Index: AQHUzOIxkHdyizBhcEG4wh135aGzlg== Date: Mon, 25 Feb 2019 08:14:55 +0000 Message-ID: <20190225081334.23256-10-anup.patel@wdc.com> References: <20190225081334.23256-1-anup.patel@wdc.com> In-Reply-To: <20190225081334.23256-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: TYAPR01CA0069.jpnprd01.prod.outlook.com (2603:1096:404:2b::33) To MN2PR04MB6061.namprd04.prod.outlook.com (2603:10b6:208:d8::15) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [129.253.179.161] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 04df8d07-5721-412e-f0e0-08d69af95348 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600110)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:MN2PR04MB5789; x-ms-traffictypediagnostic: MN2PR04MB5789: wdcipoutbound: EOP-TRUE x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; MN2PR04MB5789; 23:BHJe6yVMThT8ya06CIZ17fc/uU6f3Zj8pfZfekL?= =?iso-8859-1?q?d1Ci609WkppWor+PimK63fKQ0?= =?iso-8859-1?q?Pa/J93gRZaTyXhz2YX8RYXgJljbEgfzbR+zx6UucF/oGxyTRNgQ?= =?iso-8859-1?q?rdeW8xJ+O3U8cJlueuHNbNqtRiJZ9zVBRiyqtSgozxdo6fGzmsO?= =?iso-8859-1?q?/ypDWsa+nfkaH8LqlJt+tb/ny9VR7QjWo3iw5H2KxDEqWwLqA4U?= =?iso-8859-1?q?E7goBIVl8YitROc10b3uwkick23qQJUQuexMVT6sTzkkNsLQJum?= =?iso-8859-1?q?ubpbNMgKxwbkRt4awn/FSPlCjR5bZFxW91v/vc/eF5adbJll6IX?= =?iso-8859-1?q?HTJUgLdIDhT9h990BI11F8DzUtpTMuwuQn/baszRR33PZN3HoJA?= =?iso-8859-1?q?iNFOeL09G75fHfnXXLdmJgrHpzUFLCO6I7SL6j3t7agc7PDQkE9?= =?iso-8859-1?q?PtPMqFz6dYk+XMhbYhqXCnM2czv0hoX38JwowcoFMNUbNAaR/Ly?= =?iso-8859-1?q?KMUdXtRcN+0wF0y04u9p0JgtIFvTcvXv+gJWrmNQQrpOiDAaZis?= =?iso-8859-1?q?EivIl+JKbCTxMtwIfsygEtZSQHIwhQ5Pm6j72LaIHwEyTREb/Iv?= =?iso-8859-1?q?nwUvHwgzl6VNJ9O038X8ua9vhZWkLNJwlcPkfEddvVWZ3XXyrfQ?= =?iso-8859-1?q?Rg9ut1nRdY629CADCEyvRicVzSd/3kVf77xQWV/pfK3c3bsCwRD?= =?iso-8859-1?q?n7/hES3o/We+JWmwgevd/xtsspCGf2L0/dkdYPY3hFEl0A/er4n?= =?iso-8859-1?q?I9PamSnErjTfHN5FtQ7XXK5aIEsnRdhow/nczHrQeX7KlXTTQ+A?= =?iso-8859-1?q?oYu1xqGJPFIUHLKtl2DYj/miDzU10wNBhFzSHUrsY2vifHYknYV?= =?iso-8859-1?q?M/ahZAUUig0qOXGkGw6ZyfXSBge7lqHh/1YdFhdgHyu0Pd4vVmq?= =?iso-8859-1?q?DLdiMWFXdZ8ozkEDgguEvcaewq3724A2cYeo3ZBW+Ig69A1+7cN?= =?iso-8859-1?q?tKN2/O+4mNWyrIizt9uwrGXr5H6UY4kghUDsAu3f2ttrYznqbVK?= =?iso-8859-1?q?KNpivhx+wsP0Vu+BrqLQtoAwtcrVF7E/fSoRQVjcBYJZw+WVx1o?= =?iso-8859-1?q?YEWAy6BXq5NzKvaFdXe7EeLBlK6CYEIHAuOr7NhXBJg+oaqBmNB?= =?iso-8859-1?q?s+8fdCIKts0rrMocHs2q9F0lbqiRC3jsa3dgmML6WDr6byW77ff?= =?iso-8859-1?q?fX1vOw5tTtmULpcAC3qHRz5epJ1F2kH40w66f/Cs90w3AwV96+D?= =?iso-8859-1?q?uzeY/l4IOGh2zoB3+sYBWqh+7BOiWLGkY9j8wYBb5AP5b2jVWSK?= =?iso-8859-1?q?fonouRUNeUdTUgBz4BTfa8oiwzut/D6eZQI0xZB0shjV9DMSsoD?= =?iso-8859-1?q?yxaMiCbQhFHEKg=3D=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 095972DF2F x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(346002)(396003)(366004)(39860400002)(136003)(189003)(199004)(66066001)(6512007)(186003)(53936002)(7736002)(305945005)(44832011)(478600001)(106356001)(26005)(486006)(2616005)(476003)(105586002)(7416002)(5660300002)(14454004)(6506007)(386003)(72206003)(8676002)(86362001)(54906003)(110136005)(81156014)(71190400001)(316002)(102836004)(6346003)(71200400001)(81166006)(1076003)(36756003)(25786009)(99286004)(97736004)(52116002)(50226002)(76176011)(2906002)(8936002)(11346002)(6486002)(6436002)(4326008)(68736007)(446003)(256004)(6116002)(3846002); DIR:OUT; SFP:1102; SCL:1; SRVR:MN2PR04MB5789; H:MN2PR04MB6061.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: A+ogval6xIiwiZb1Bxl0em12U9DaItkUR3duwzT1y6RMoTXo+m7O+KkSYOA03hVi9U3s71t68luOkryA1vOv45s7kWtGTJiLcBsnwP3iISD5hnFBtf66tA+WQg2/T3ahjgCQv68LPkdW9q8j76h3tgUe/jyozy0a/toU2HPEyN0/UfFvZBZUt7xmQIIYFCvTDDPuc5xX1WVSNdICL2eVZvpgru/yxy/YJ7CHGHNBY9oYARcJI//2BWu8nMmZe6+jFs3KxP0TxxjrxQj6sgi3cBcZC3WVV1mXPLMLIoPKt9wYaiBJDFDjKOjmLTrPK6ZVlyYFb0kMctedN51zn/u8jqe5mo2UlqdZHozdiqNkjqJXxup7mree2gPIC0S+ln0FU8zJjaoraYq2JOIzH/xkLCD0bAkNDxMmRFSIcpEvUBU= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04df8d07-5721-412e-f0e0-08d69af95348 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Feb 2019 08:14:50.9765 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB5789 Cc: Palmer Dabbelt , Alexander Graf , U-Boot Mailing List Subject: [U-Boot] [PATCH v10 09/15] clk: Add fixed-factor clock driver 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" This patch adds fixed-factor clock driver which derives clock rate by dividing (div) and multiplying (mult) fixed factors to a parent clock. Signed-off-by: Atish Patra Signed-off-by: Anup Patel Reviewed-by: Simon Glass --- arch/sandbox/dts/test.dts | 8 ++ .../clock/fixed-factor-clock.txt | 24 ++++++ drivers/clk/Makefile | 4 +- drivers/clk/clk_fixed_factor.c | 74 +++++++++++++++++++ test/dm/clk.c | 5 +- 5 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 doc/device-tree-bindings/clock/fixed-factor-clock.txt create mode 100644 drivers/clk/clk_fixed_factor.c diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 1d011ded7c..cb8d686e46 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -203,6 +203,14 @@ #clock-cells = <0>; clock-frequency = <1234>; }; + + clk_fixed_factor: clk-fixed-factor { + compatible = "fixed-factor-clock"; + #clock-cells = <0>; + clock-div = <3>; + clock-mult = <2>; + clocks = <&clk_fixed>; + }; }; clk_sandbox: clk-sbox { diff --git a/doc/device-tree-bindings/clock/fixed-factor-clock.txt b/doc/device-tree-bindings/clock/fixed-factor-clock.txt new file mode 100644 index 0000000000..1bae8527eb --- /dev/null +++ b/doc/device-tree-bindings/clock/fixed-factor-clock.txt @@ -0,0 +1,24 @@ +Binding for simple fixed factor rate clock sources. + +This binding uses the common clock binding[1]. + +[1] Documentation/devicetree/bindings/clock/clock-bindings.txt + +Required properties: +- compatible : shall be "fixed-factor-clock". +- #clock-cells : from common clock binding; shall be set to 0. +- clock-div: fixed divider. +- clock-mult: fixed multiplier. +- clocks: parent clock. + +Optional properties: +- clock-output-names : From common clock binding. + +Example: + clock { + compatible = "fixed-factor-clock"; + clocks = <&parentclk>; + #clock-cells = <0>; + clock-div = <2>; + clock-mult = <1>; + }; diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index de3d60ed05..1d9d725cae 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -4,7 +4,9 @@ # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # -obj-$(CONFIG_$(SPL_TPL_)CLK) += clk-uclass.o clk_fixed_rate.o +obj-$(CONFIG_$(SPL_TPL_)CLK) += clk-uclass.o +obj-$(CONFIG_$(SPL_TPL_)CLK) += clk_fixed_rate.o +obj-$(CONFIG_$(SPL_TPL_)CLK) += clk_fixed_factor.o obj-y += imx/ obj-y += tegra/ diff --git a/drivers/clk/clk_fixed_factor.c b/drivers/clk/clk_fixed_factor.c new file mode 100644 index 0000000000..5fa20a84db --- /dev/null +++ b/drivers/clk/clk_fixed_factor.c @@ -0,0 +1,74 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2019 Western Digital Corporation or its affiliates. + * + * Author: Anup Patel + */ + +#include +#include +#include +#include + +struct clk_fixed_factor { + struct clk parent; + unsigned int div; + unsigned int mult; +}; + +#define to_clk_fixed_factor(dev) \ + ((struct clk_fixed_factor *)dev_get_platdata(dev)) + +static ulong clk_fixed_factor_get_rate(struct clk *clk) +{ + uint64_t rate; + struct clk_fixed_factor *ff = to_clk_fixed_factor(clk->dev); + + if (clk->id != 0) + return -EINVAL; + + rate = clk_get_rate(&ff->parent); + if (IS_ERR_VALUE(rate)) + return rate; + + do_div(rate, ff->div); + + return rate * ff->mult; +} + +const struct clk_ops clk_fixed_factor_ops = { + .get_rate = clk_fixed_factor_get_rate, +}; + +static int clk_fixed_factor_ofdata_to_platdata(struct udevice *dev) +{ +#if !CONFIG_IS_ENABLED(OF_PLATDATA) + int err; + struct clk_fixed_factor *ff = to_clk_fixed_factor(dev); + + err = clk_get_by_index(dev, 0, &ff->parent); + if (err) + return err; + + ff->div = dev_read_u32_default(dev, "clock-div", 1); + ff->mult = dev_read_u32_default(dev, "clock-mult", 1); +#endif + + return 0; +} + +static const struct udevice_id clk_fixed_factor_match[] = { + { + .compatible = "fixed-factor-clock", + }, + { /* sentinel */ } +}; + +U_BOOT_DRIVER(clk_fixed_factor) = { + .name = "fixed_factor_clock", + .id = UCLASS_CLK, + .of_match = clk_fixed_factor_match, + .ofdata_to_platdata = clk_fixed_factor_ofdata_to_platdata, + .platdata_auto_alloc_size = sizeof(struct clk_fixed_factor), + .ops = &clk_fixed_factor_ops, +}; diff --git a/test/dm/clk.c b/test/dm/clk.c index 898c034e27..112d5cbbc9 100644 --- a/test/dm/clk.c +++ b/test/dm/clk.c @@ -12,12 +12,15 @@ static int dm_test_clk(struct unit_test_state *uts) { - struct udevice *dev_fixed, *dev_clk, *dev_test; + struct udevice *dev_fixed, *dev_fixed_factor, *dev_clk, *dev_test; ulong rate; ut_assertok(uclass_get_device_by_name(UCLASS_CLK, "clk-fixed", &dev_fixed)); + ut_assertok(uclass_get_device_by_name(UCLASS_CLK, "clk-fixed-factor", + &dev_fixed_factor)); + ut_assertok(uclass_get_device_by_name(UCLASS_CLK, "clk-sbox", &dev_clk)); ut_asserteq(0, sandbox_clk_query_enable(dev_clk, SANDBOX_CLK_ID_SPI));