From patchwork Fri Feb 1 09:36:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beniamin Bia X-Patchwork-Id: 10792339 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7FC0C746 for ; Fri, 1 Feb 2019 09:36:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 715A931B7E for ; Fri, 1 Feb 2019 09:36:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 627C931B80; Fri, 1 Feb 2019 09:36:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E47C431B81 for ; Fri, 1 Feb 2019 09:36:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729208AbfBAJg4 (ORCPT ); Fri, 1 Feb 2019 04:36:56 -0500 Received: from mail-eopbgr680060.outbound.protection.outlook.com ([40.107.68.60]:51648 "EHLO NAM04-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727008AbfBAJg4 (ORCPT ); Fri, 1 Feb 2019 04:36:56 -0500 Received: from DM6PR03CA0060.namprd03.prod.outlook.com (2603:10b6:5:100::37) by SN6PR03MB4111.namprd03.prod.outlook.com (2603:10b6:805:be::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.20; Fri, 1 Feb 2019 09:36:50 +0000 Received: from CY1NAM02FT014.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::207) by DM6PR03CA0060.outlook.office365.com (2603:10b6:5:100::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.20 via Frontend Transport; Fri, 1 Feb 2019 09:36:50 +0000 Authentication-Results: spf=softfail (sender IP is 137.71.25.57) smtp.mailfrom=gmail.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=fail action=none header.from=gmail.com; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning gmail.com discourages use of 137.71.25.57 as permitted sender) Received: from nwd2mta2.analog.com (137.71.25.57) by CY1NAM02FT014.mail.protection.outlook.com (10.152.75.142) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.1580.10 via Frontend Transport; Fri, 1 Feb 2019 09:36:50 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x119anfI014669 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Fri, 1 Feb 2019 01:36:49 -0800 Received: from ben-Latitude-E6540.analog.com (10.50.1.129) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Fri, 1 Feb 2019 04:36:49 -0500 From: Beniamin Bia To: CC: Beniamin Bia , Beniamin Bia Subject: [PATCH 1/2] staging: iio: frequency: ad9833: Get frequency value statically Date: Fri, 1 Feb 2019 11:36:37 +0200 Message-ID: <20190201093638.26068-1-biabeniamin@gmail.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-Matching-Connectors: 131934874105745690;(2e7d0d53-e7ea-462f-80a6-08d65488a236);() X-Forefront-Antispam-Report: CIP:137.71.25.57;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(396003)(346002)(376002)(39860400002)(136003)(2980300002)(199004)(189003)(8936002)(6666004)(356004)(55446002)(26005)(77096007)(36756003)(305945005)(2906002)(7636002)(8676002)(51416003)(105596002)(87572001)(106466001)(2351001)(246002)(50466002)(48376002)(53416004)(1076003)(82202003)(47776003)(61266001)(73972006)(86362001)(83322999)(107886003)(126002)(4326008)(6916009)(486006)(73392003)(76482006)(498600001)(50226002)(2616005)(336012)(54906003)(16586007)(476003)(316002);DIR:OUT;SFP:1101;SCL:1;SRVR:SN6PR03MB4111;H:nwd2mta2.analog.com;FPR:;SPF:SoftFail;LANG:en;PTR:nwd2mail11.analog.com;A:1;MX:1; X-Microsoft-Exchange-Diagnostics: 1;CY1NAM02FT014;1:4MJlSDwUDeIBx1ulU6fNW6kq/9/ESx5IOvdlnYIgU5u6bXw5wfA6XkAonPsc0zI7Eo44ig3nv6tA5wss1YlzSuWqnHzwfiKVevxthqcDqiBCJNv0/1mPrRPGTumC5DpHbjbLYYeblb1INPMoliZtSULuZ8sRr3n/ZJClfT+Kv2Y= X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a4600dfe-cc40-498d-6e6a-08d68828cafe X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(5600110)(711020)(4605077)(2017052603328);SRVR:SN6PR03MB4111; X-Microsoft-Exchange-Diagnostics: 1;SN6PR03MB4111;3:6/0hguVRG5fNUSqsEC8ZJQrn8BqRKCp0ryVCr2Qd3nst/w7aPl5P+WpLBl0P1fEMJFxkfde5GVjCPxDZuQZBIT90HrT8x6joxxTCivKpEso+bd2eEvqfewN0eyTxtomjkkxmRvPr3cwcBnTbD1biokcgTPgfU9WUjaCqKbBDF6mLAdc9ATJHKJFPvvnRQqt2gxjxSAId5quu9xryPSzbGwvGjEsBu1ZC+sNlvHqeGfc5oEQPvLbpVTIBU0chw140Qhx3P6dND5dY+G7EAuBuGXkk8OnVh3Xky4qZh64zxeqqma3UmeF/T9rxa/QbeXzPKpw1rQw/Q2DPQx8sNSneXsQ7P58Jz369EisKQsfNSqJDZw5vAMTPkkoM4GqihEi6;25:hCtWLIqyC/d6+fhQW9bIownlZGH8YwYxVXlXSeqTLmQBQ+zurLs8xZXN3hOxHIeDdw81lnJqUhDzWilrn4z2Y5C40coNOH/3JWarojYYSVLPBH/P2jfKNOoSFWArZ7iSgi5mQs3N6qcYyGVJjLsHPgh0LMZxYp75udMPx9PVsAV7vbSJMhGhTgaLTuvAGEPz9O/3JkI3+n1hsMIHjlaPLc0w78A1PQJdajKnDriCPbOfkHp7wS0qLPBavKj6swnvXlhwRbKsqKMeDme71ph2G4qyZf+UPFFiCNN3u1mrqVTSxdtmTtk/vf/l1LCJnXnDxcUSSwhRiGDIRDJ3IjesHQ== X-MS-TrafficTypeDiagnostic: SN6PR03MB4111: X-Microsoft-Exchange-Diagnostics: 1;SN6PR03MB4111;31:Yctm6o5FWkE5PB1ivgU1bAkfCdjqLCgyGU8Vvqe9teCcLtIMIM/VNU/wr3VxyU3s5l94291cLH5l9JpudN6hv4P7BAAgkT7/UuSyesvqHhzMVfq+rM96RIjqHHTldHytR34L82/pWl0Im2U0gNgyTLocWNRwhCmZqKgRHheCQq3ZAyVTDyEcRI7KmSrY+a5iKaegpOgHKjTXPVN1zoXgVDosY/LwcOFKtx6vswi2a00=;4:tfNmZmTjXJjKsqzwhwmP0u4yuOIjT3b9zQIOE4KkmG1whh2MhLbkzvliMIfHdQQ5Tggzpj7DIOQfHa5rWN8OLVGkbJxk81WPUM0nrVsIlWuZvm+SY4enBg5I4Nju6QcncPP5KEXrh2TsOaL2J1vsEAxaW/LZM+nmSZkkzFB/jJqUDW6KDKoOMlewb8EhkrdDOe6dfsruFuJmVxPoDQM6HbFT79rxrOOZl+TQdhgzTuWoJhiIxYf+cjhkpmcgDspA9yWeAlQ4o+W9htr//gVL0nYII0SrHl8SQ4mJ4y7N3w3o8+gHANN9Ctye1vK2Jz0l X-Microsoft-Antispam-PRVS: X-Forefront-PRVS: 09352FD734 X-Microsoft-Exchange-Diagnostics: 1;SN6PR03MB4111;23:0CCBMgI1iTikTrWxTmCew6p/RdpZSdkymo9NYg1wN5iMlc9UODJALiHRqIlhVAd8wgE5zeLM0bNPOzxGbAfbnQwDd5cdubf7TeMg+MrP9+Vse970ADChTZrxzNtJa0fLVzTUwtmL1WbZREaYU9YGZ6ByDB9u1Nj4GA61mwY7JTtZwaFl74DhuHAJ/bZfrPtvWx66bWjga3inLKU8J7jDgaL8PJ+6p1GTLp3W/aZayyjs1rYJBui3QlslCV8sL2L7mYzcbTUMnmKRsg4HqGu6BsbFKtOb+y/8q5DUhaB5k+QPHIDVlOTk1LWvPznOnInSQYvD/MgVRa6IMBWlYe8+7dvKssSAO7wAYnE7su8MuNozjvZt+Ehp1PlyfFoOPv8GGuaca04E0GxbsGK2dlZPuBnbJ0a2wXfM/1pBOfOcB/RM0/MAY6EmWHaCRS9beGGG4q21Xg8CNkt6yWhj9wcHV4VctftkSVxInnh/WNB6s5TH5g43HlyyNG2E5/wuSZ1Dgo+twdhDKt3YlYz9hxLZ689MBob+EqAOi9ssot5V5nN2U6E4d6sbi5gTiL2q47MQB4y+juet6Kg0xUzRyVTD04R1iPojSj/3vvGc9yn8nblw99Fx30WNWt6DohbMQ0rV+WBt4dbBvp6xSxr52kWhXZAUrDlaPsEaC74Wkggs6bcC6wOYlLA9+pLpi6R1KnD8g3xCmfGgoTJhp5o0Gx0iWylYRUD5QH5ai75qd11vAxypuNG3IADB1PUaNOfQEq5b/UyHK1nMDLQzwf9XW7azofAypH2zHSrCqxKK90OsSuD5t+aWsQKzyQCiZ+ICq8c+IzKZA2KJ/iflrRxR0waXcsYRj/ykSHlr4SxxI5WKEF/k3hjo7k/E87blVeK0CV7B+upIPyF8OTLYk+9SGY28yei3tGHLf8ORpia3FkSDayC2QckgR6DEPnf6wU37ynHFeOSOCk4iXKoozLCoKbC+QiZv7jSOXYjvgLZrjDqomsdUD2/VIpU/ea+YpLPtdN2y+REVkINCofhjpTvCktOsB3I2mmLe0qvy1/WkXhrBaaxCvyBcS02QNrRvAzHZFgP58jLV6OCLH3SiAbAtgWN3/zAhZWQAgSCfAXznicTQxyI= X-Microsoft-Antispam-Message-Info: DX8noRxJlUSuNFC7iRqMsYNHWfSLMOMq+nkZ1BtiYsuQMr7n7zDX2rwFUNpQDXe7la8sLvLVs4kaD8V6fCO/T191TrdBqUWqEtQE/nsUNqHlKXPkDdOq1+N7cauxW0RqCizoOAHfMs6guKrojoV8c+eT94sBF3lVagRgB66SWiYpaFZQzKodQGfX8ImaAid6j9N5WX1bNHdMTISg4eHlH7oxCsRi2PeSLz/shJi/CZTzwcFA3ktkQr5AL7BWfHBDeI9mQQDyoaD48iyCksURMHxAnq29mchIfhh+rsUC0UUfy6AurXEK1grnXWIaeT6J+wgPbTs3Sm2gLktGvYwGvMFoB0kNd2J3MEDKlwhs2nMgUK/78OMxS6+M7bA6T8qlHz5tx+ZZz+99c43aQlrgx2olYG3Mbwq6kdCz19aqZCc= X-Microsoft-Exchange-Diagnostics: 1;SN6PR03MB4111;6:zUw07VJVMhXZsWF4lm162INKLe7PsmlPOzQCecs5zAHxc1+v2MJzt8H/EZ2/P0n9ssgxRxiJe3pQhJsyACg5jgPcVgOchkvK94YHchwvkCBIPvHjhwiKCQPzSe6kw7uKjvrwzccpE2S8PcXlLVhFmVm9d1jBMQYAca6TZScBW5oIeD4VGnRedI7Im1TwSpe7vCKBZinU++uF4dLgEr4DiSEIWqxkYP7Yf4/LUAehEdMJG/PWbJjqgsLFIitO5O8Xu6ZcG4jgMZDG5ZlDZ7cPK/5C52mkekSQcsMOjrDTR7fCM6xdTEOX7WybDTr17wYyQNavrUkg+UPA6AnsjS4JYw9GnTwj0HEYD7gAMRkZQ+P8XQj+p+n9s3GA9HurCSUJ6tqHyyJdm1dJQ3aOQS5rbCDCZarhwM/mGAZNuXBsBGrltswsIYP2pjaJmMKrzWcSW59DTjX+2BHniZrZdRvkDQ==;5:OOSGOgmIPEHd7Tmcz8p+Uvk/KH+f8u9+Cn9Gf2lvl71U2/WnHulkLLFtaf2lEI3sr3yvkMaxnFQxHPUO8pqRSOVT3tofq73IDMFyAR4boeMr1C2h1oxO8ng/aOFHHyBPeV/An7UYNriPZffIW/Zwp2eR36pZCZ+AQAyKnYl49Dlly4o1NegYCHO+5I0EaEULnaQJUMJ5jZTThZ2ar7GI9w==;7:dr5icpPNKqoCD6/GPwUzSoHut89NbIRybwO16gdoOnj9vsR1gYrJ84Z+b0EUIDn/oc3aChOxGXx+zITFtygMmOB5ul6yVJ6SSsyYUDvv3i/qKMuky5kmQWgHg+PfbtZYCGPxEpx4/TLimf5Zkh2D7g== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2019 09:36:50.2372 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a4600dfe-cc40-498d-6e6a-08d68828cafe X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[137.71.25.57];Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR03MB4111 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The value of frequency is taken from ad9834.c instead of platform data Signed-off-by: Beniamin Bia --- drivers/staging/iio/frequency/ad9834.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/staging/iio/frequency/ad9834.c b/drivers/staging/iio/frequency/ad9834.c index 995acdd7c942..d92d4bf71261 100644 --- a/drivers/staging/iio/frequency/ad9834.c +++ b/drivers/staging/iio/frequency/ad9834.c @@ -99,6 +99,16 @@ enum ad9834_supported_device_ids { ID_AD9838, }; +static struct ad9834_platform_data default_config = { + .mclk = 25000000, + .freq0 = 1000000, + .freq1 = 5000000, + .phase0 = 512, + .phase1 = 1024, + .en_div2 = false, + .en_signbit_msb_out = false, +}; + static unsigned int ad9834_calc_freqreg(unsigned long mclk, unsigned long fout) { unsigned long long freqreg = (u64)fout * (u64)BIT(AD9834_FREQ_BITS); @@ -391,16 +401,13 @@ static const struct iio_info ad9833_info = { static int ad9834_probe(struct spi_device *spi) { - struct ad9834_platform_data *pdata = dev_get_platdata(&spi->dev); + struct ad9834_platform_data *pdata; struct ad9834_state *st; struct iio_dev *indio_dev; struct regulator *reg; int ret; - if (!pdata) { - dev_dbg(&spi->dev, "no platform data?\n"); - return -ENODEV; - } + pdata = &default_config; reg = devm_regulator_get(&spi->dev, "avdd"); if (IS_ERR(reg)) From patchwork Fri Feb 1 09:36:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beniamin Bia X-Patchwork-Id: 10792341 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D90A9746 for ; Fri, 1 Feb 2019 09:37:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7FEB3192B for ; Fri, 1 Feb 2019 09:37:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB12531B80; Fri, 1 Feb 2019 09:37:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 342863192B for ; Fri, 1 Feb 2019 09:37:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729325AbfBAJg7 (ORCPT ); Fri, 1 Feb 2019 04:36:59 -0500 Received: from mail-eopbgr750042.outbound.protection.outlook.com ([40.107.75.42]:57642 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727008AbfBAJg7 (ORCPT ); Fri, 1 Feb 2019 04:36:59 -0500 Received: from BN6PR03CA0014.namprd03.prod.outlook.com (2603:10b6:404:23::24) by DM6PR03MB4106.namprd03.prod.outlook.com (2603:10b6:5:5a::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Fri, 1 Feb 2019 09:36:56 +0000 Received: from CY1NAM02FT007.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::208) by BN6PR03CA0014.outlook.office365.com (2603:10b6:404:23::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17 via Frontend Transport; Fri, 1 Feb 2019 09:36:56 +0000 Authentication-Results: spf=softfail (sender IP is 137.71.25.57) smtp.mailfrom=gmail.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=fail action=none header.from=gmail.com; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning gmail.com discourages use of 137.71.25.57 as permitted sender) Received: from nwd2mta2.analog.com (137.71.25.57) by CY1NAM02FT007.mail.protection.outlook.com (10.152.75.5) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.1580.10 via Frontend Transport; Fri, 1 Feb 2019 09:36:55 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x119asGW014707 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Fri, 1 Feb 2019 01:36:54 -0800 Received: from ben-Latitude-E6540.analog.com (10.50.1.129) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Fri, 1 Feb 2019 04:36:53 -0500 From: Beniamin Bia To: CC: Beniamin Bia , Beniamin Bia Subject: [PATCH 2/2] staging: iio: frequency: ad9833: Load clock using clock framework Date: Fri, 1 Feb 2019 11:36:38 +0200 Message-ID: <20190201093638.26068-2-biabeniamin@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190201093638.26068-1-biabeniamin@gmail.com> References: <20190201093638.26068-1-biabeniamin@gmail.com> MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-Matching-Connectors: 131934874155052413;(2e7d0d53-e7ea-462f-80a6-08d65488a236);() X-Forefront-Antispam-Report: CIP:137.71.25.57;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(2980300002)(189003)(199004)(246002)(476003)(107886003)(82202003)(26005)(51416003)(36756003)(73972006)(86362001)(2616005)(83322999)(126002)(54906003)(6916009)(316002)(77096007)(356004)(73392003)(11346002)(14444005)(336012)(6666004)(486006)(16586007)(446003)(76176011)(53416004)(2351001)(305945005)(61266001)(106466001)(87572001)(48376002)(105596002)(1076003)(50466002)(7636002)(8676002)(50226002)(47776003)(55446002)(498600001)(4326008)(76482006)(2906002)(8936002);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR03MB4106;H:nwd2mta2.analog.com;FPR:;SPF:SoftFail;LANG:en;PTR:nwd2mail11.analog.com;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;CY1NAM02FT007;1:UC6ZRbkU2uHg51Y07zNHlmraoamtn0Lis7DFO7kWiduVb3fNZFzn2bwFYLSzFv72UxdaOtj+lAiTG9u2zXtO/7goqn9dfHHXeaZ9VQN9/FKX543Lw9sApJOzaY6CggF03melH1scsWrk3mUF+O4ezJiMXPm2yyGxepL6kLIgqqY= X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 71c4bb42-3c2b-41c2-cad8-08d68828cdee X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(5600110)(711020)(4605077)(2017052603328);SRVR:DM6PR03MB4106; X-Microsoft-Exchange-Diagnostics: 1;DM6PR03MB4106;3:0xxtDfCxmAbdB5dvMESKd4cNaEsUQl52KEkWMadCN2fzOMYKgOLYGudpKjxMYgXME2NTLgdjBBaPS6IfAoH1zPiBf1dKLlWxXEDWK0aAUU1inftf5uQrbrUl8HI34kGvcduLmk+7M7rd9QiQJXWHQ4YQ/2OQ8kwCt1ZCmLR9I/KJQU08KEdiK6GJHcwgRZR8Ffj+kdVQNa5XAWrldwGS4/Af85TNfm9ZI3yI1JadJMaTIny7lYjhntJNL/0WoB5fjHiUVmtrxwn9Teb4fG0WmyjutEKnWqkCFI4wic3mjv/ddUHok8Uh89/OW5fJkCO1R4MPIanJqM6LKlJllnS4PwODg3clrmDG6RSB0oBXRaari+wzj5MYgtiDlmDu3e8a;25:L0QfWu6QBuPEuDU1YpcRDJvPcIpH6XlKuSkZ2JJYOXY6gcZxTnDw3Vyu/tfsvYwxwRtkYiXEHdWjY2xpecsIv11aR26qK4M0lPhGN9ULqIZBzIxNXotTzImD10uoLQwOvZ+hhCbmdKFw1FCWhHh4cEBjl5DeyE4rWKAFw2mVB07POWEvgr7JJznlwKKlx0vaj/WeNTcztYn6Q1bg6YW/DJf3U+l5lXEnI4CrCr/+FCgVR0+dLh54VYJKOA5DSydAwRtzsmPKmNEY8707ME8FweJ7EdHkBbqf4Nvvl14doW9X2F6upZo3lPF0LUmQt869bRIguGmTrYJyiIiHj/C0kA== X-MS-TrafficTypeDiagnostic: DM6PR03MB4106: X-Microsoft-Exchange-Diagnostics: 1;DM6PR03MB4106;31:8qZXGETuLTHcMszGV1We/f6xUpstpnEy/3oUNLhDT4LU35TarFWpkI4lMSfrJ7SUEFYWb7bx093sAVv3HRgAi1U570yTnPgbrNEdGCeVwizDjv4hGmIPA1jOa4elMvHM9z+5JEknjSAVR4GSquj3DUdAGQ5CvEJSgsgSCMhvZcYGkjEgx8a56PcQZYmJKNwHhxYb1byLv52+OJwPjBp9DO9k6Nqcl+hfvHixykTQv1c=;4:oEdx3E4ww+EV/skwVX5LetsZ+epf71Z/Fep3WzL8TtJbGwdUKJIJoIA+Z9BtK37mBhm6BWO9ervweKcixl/l9MWzBf9Zz2IRVP1esdTNMUGywZOBqzuDFEIHL6qU5sIRDhY1Qoy0unonnFoSTADkxQJrknH954yHYv02Y5n7AE4+lFjIlRL0YdfoDLI4XNYINSoA1b0ET+dB0k6vpeCtUInuE78UZjCBV0Kp03jZQGcj0v28/OuZ1UzbSCecDjJN4/TEBJUphlgl79azA/Joc71rXEujiQQxN3IIzXNwFmLOdlcHOxuX6B6Ns81B5Dsu X-Microsoft-Antispam-PRVS: X-Forefront-PRVS: 09352FD734 X-Microsoft-Exchange-Diagnostics: 1;DM6PR03MB4106;23:GeNiZHMFhNjRe0lJMh609FwmBQIDsZ1HM+gYnhRuc0PIXKwtzFHonuOtYVnXxXnPEim8An1aocY7iajhk9rygRsfFBEP6+oZXRCgfSZwCWRwrN6YrDw5GbS8+XNj1jAGkWYk3tqAKWVHn4ZRJ7vqOZJUtXWlRKAoFAjz24wKbp+eLBrQIkh8IlY9B4H1lQKml737MAGSwXtmgozd+1mY9ezx9Fl2aQ7sGhgFVfpp4KTxRHfYwYMoqsCt/+l0WfAkXh5bCE/5fQGzX2L/s/C14hM8do2yO4RQ9qvsh9tfsC4SP2/3QV/ctwrki0y8KEIdj1HcjerYGAzQJDPB4FjXzNwdBO4M2D6SdrzJXdzNXMUepE1IHJNTUnItVxEdHLc0clkktgLb6BK9CPpzf/WtMc6LmRXiz37/47pgbpy05zgCWEV0zWG8KIptNPE1MjxwjPlAzVD2TcwsMEpMtoqF4Olq3L1K8xnjs7YhHDRBPSB4vxk0nw1RVdJp5d4egWNFMsarDobSwmFr7i4HQ4M5OfJp19XA5RkvyAbKfBA35gzKpdfwzgDbEnatOqe2jD9M3T+nwK1swu9ueBTM9p0RE4OODroaruXqYKHKJgfNqL3nr+mwbnQdWFRLoJs6z4X/wFZwDlskaepzlYHExzSpz3B6l4vHWym2z5SuxZuBBHfScqkDDkBUrQ292VQyl01QOhP89vCo6MlegnixWyXYIn4QKmjrX9Yu2KgB9+Clr2AimyYqZMekgiudLutdiKTCqSTvaspZiGmGfyXpca6j9cL/ausi8tzzY7rvvdsbZ8dvR+YN4nCICo1unfG++IXqr7Oxe01k7a6vFTaSWhkX/8VekaB6g9T1KlkDG+H391W5o9FBSHC/QTg15u0kf6K5avO6CL6KVtHH3naUwoySpZEVKVVfq7egLPhIYcleXs89R2UeOkyx06TrXu+SbX6c7dp90GlkupFveSs8EkF2wQVaiyfJGGLTPc4EvLgYTle1IGpmIs2+vwML7PYwN50M+eMJgM+VJN1f+7LTzEMGTQ36QtzOru37UlmJRo4WAjvMJtzGYcEQbh8hfcau24Nxxri+FLusnLFr7N7u5GaHjwUcesxw5XGeys+yNceOfKyYzerqX1zGpN5QLDxjQjJSFUbt0hUhKwv+YezoPPhnZPZg+HSDTIx/SbSu4yuhuZg= X-Microsoft-Antispam-Message-Info: Sl+M59GWof5SDc+yoeM7j59WI1+4XZ7CnvQnv5MVC2MV7gvY3v4C1jZrsVQHWY1gKUoUjydVvvywhn8DWk60GsgK6SAQT66neZa9tD9DBPYhu/eV5rUPKKRlVI2QlqdsaDWKKin9tW282GjFpIK3vrBJlNg2YMb7jqbPHyuB0prbI3W7vB5cxQfnPc6+e708TBIm35j91rC0VbPKxpwl9NLgGgkFNzqMaWaYZvpFXDerInnsoHts6nuZT5Qjd8Op0rgn5H3E90PPJ31CJeyxr/pxfYplm/62gpTqNIJaTvAOgSBIapowHqbW4bXupnpgMddnXmD4YzuMhNKk6u5b0jp70lz4+SG1hPtGCJyFQSDX30xbI4RD6/Cbo3T7OSqiuop7zYA8KKkJuRnPRX3xEIkQXf9M4lqfU8hC/+LDIHs= X-Microsoft-Exchange-Diagnostics: 1;DM6PR03MB4106;6:d0yzSg95rnVaBYzOe4ALyIPnoeTIvzIum8u7qoHYtLG4Rs9q3aH6y1rDqJ5/Z/owrZNva0ZGXQYZU4vpp6fUSeozDULKbtyJEuk6Q3444NT2DBy+wivBHFe3RWMQSX6Xj/e5OeEwwn1EkGt0MoLynDjETBVs6J88Wwh48vSSq0veQniTuc6ZEjrVU+QlpwalZ33yYVbybx7+nb0VskKKUpDprDMj7qKK5Ijh7QhsNEVI9JZLBXwxr5LJH8E8tArhZpivnVmdhn2IAmgEijleOYm/WdNGTwFf9UJKL/YyRUN3PFhsSVCYvzSKow/gl4bmVUgAiVLev5N9nk+tttV9hTlhXjHYfdDLxfylUzcOihY20jP59wMWvhzzxYv8TqAtUP4zHtheVuQgeUOkMkanPukTDZ2RqArT+B7rBTj0SvinA3pCm9IE1e2tZeSZR1on8Gup4xPd6+jTGe1lQzYcmw==;5:LTUH+PjQWPIv3OU33RohSM3YRppcxA0+qD4CclYY/IqqlmvLv4zXIn2fd+KdItbGrDRQbn5ouOH24DcKAvrP/7ZsiBMl99R65JYTYFhakuO2wtLHVvCVciKp5z+1cRyG1xHovAr8vRbi/sCj+/JyTzHbqJ5tI+osNKyjI8kx3YPD42FnCT5QeTsh6Fwehxa1GqMHOKx8NknAcL/EmcfSaw==;7:WGVtko1gmlNpSrIk3drKNK1+QMreiMV83400LdZMFQc01f7Rh8w5x7OK42MKVnKjpNIdqvqQ3jtIhyGb4TA9tmcypb/m9WmYbfNOq8CwjrryOxVgpuc9bY0cPB7TAX6O58W0E7XaYXejgPkS8jUiIw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2019 09:36:55.1648 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 71c4bb42-3c2b-41c2-cad8-08d68828cdee X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[137.71.25.57];Helo=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR03MB4106 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The clock frequency is loaded from device-tree using clock framework instead of old platform data structure. The change allow configuration of the device via device-trees and better initialization sequence. This is part of broader effort to add device-tree support to this driver and take it out from staging. Signed-off-by: Beniamin Bia --- drivers/staging/iio/frequency/ad9834.c | 24 +++++++++++++++++++----- drivers/staging/iio/frequency/ad9834.h | 2 -- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/staging/iio/frequency/ad9834.c b/drivers/staging/iio/frequency/ad9834.c index d92d4bf71261..3b25065c1a72 100644 --- a/drivers/staging/iio/frequency/ad9834.c +++ b/drivers/staging/iio/frequency/ad9834.c @@ -6,6 +6,7 @@ * Licensed under the GPL-2. */ +#include #include #include #include @@ -71,7 +72,7 @@ struct ad9834_state { struct spi_device *spi; struct regulator *reg; - unsigned int mclk; + struct clk *mclk; unsigned short control; unsigned short devid; struct spi_transfer xfer; @@ -100,7 +101,6 @@ enum ad9834_supported_device_ids { }; static struct ad9834_platform_data default_config = { - .mclk = 25000000, .freq0 = 1000000, .freq1 = 5000000, .phase0 = 512, @@ -120,12 +120,15 @@ static unsigned int ad9834_calc_freqreg(unsigned long mclk, unsigned long fout) static int ad9834_write_frequency(struct ad9834_state *st, unsigned long addr, unsigned long fout) { + unsigned long clk_freq; unsigned long regval; - if (fout > (st->mclk / 2)) + clk_freq = clk_get_rate(st->mclk); + + if (fout > (clk_freq / 2)) return -EINVAL; - regval = ad9834_calc_freqreg(st->mclk, fout); + regval = ad9834_calc_freqreg(clk_freq, fout); st->freq_data[0] = cpu_to_be16(addr | (regval & RES_MASK(AD9834_FREQ_BITS / 2))); @@ -405,6 +408,7 @@ static int ad9834_probe(struct spi_device *spi) struct ad9834_state *st; struct iio_dev *indio_dev; struct regulator *reg; + struct clk *clk; int ret; pdata = &default_config; @@ -419,6 +423,14 @@ static int ad9834_probe(struct spi_device *spi) return ret; } + clk = devm_clk_get(&spi->dev, NULL); + + ret = clk_prepare_enable(clk); + if (ret) { + dev_err(&spi->dev, "Failed to enable master clock\n"); + return ret; + } + indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st)); if (!indio_dev) { ret = -ENOMEM; @@ -427,7 +439,7 @@ static int ad9834_probe(struct spi_device *spi) spi_set_drvdata(spi, indio_dev); st = iio_priv(indio_dev); mutex_init(&st->lock); - st->mclk = pdata->mclk; + st->mclk = clk; st->spi = spi; st->devid = spi_get_device_id(spi)->driver_data; st->reg = reg; @@ -501,6 +513,7 @@ static int ad9834_probe(struct spi_device *spi) error_disable_reg: regulator_disable(reg); + clk_disable_unprepare(st->mclk); return ret; } @@ -512,6 +525,7 @@ static int ad9834_remove(struct spi_device *spi) iio_device_unregister(indio_dev); regulator_disable(st->reg); + clk_disable_unprepare(st->mclk); return 0; } diff --git a/drivers/staging/iio/frequency/ad9834.h b/drivers/staging/iio/frequency/ad9834.h index ae620f38eb49..16562dc10812 100644 --- a/drivers/staging/iio/frequency/ad9834.h +++ b/drivers/staging/iio/frequency/ad9834.h @@ -14,7 +14,6 @@ /** * struct ad9834_platform_data - platform specific information - * @mclk: master clock in Hz * @freq0: power up freq0 tuning word in Hz * @freq1: power up freq1 tuning word in Hz * @phase0: power up phase0 value [0..4095] correlates with 0..2PI @@ -27,7 +26,6 @@ */ struct ad9834_platform_data { - unsigned int mclk; unsigned int freq0; unsigned int freq1; unsigned short phase0;