From patchwork Sun Feb 19 20:35:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9581821 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 744E5604A0 for ; Sun, 19 Feb 2017 20:36:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 644C628708 for ; Sun, 19 Feb 2017 20:36:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 587062870B; Sun, 19 Feb 2017 20:36:01 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 B3CC728708 for ; Sun, 19 Feb 2017 20:35:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751717AbdBSUf6 (ORCPT ); Sun, 19 Feb 2017 15:35:58 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35242 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751651AbdBSUf6 (ORCPT ); Sun, 19 Feb 2017 15:35:58 -0500 Received: by mail-wm0-f68.google.com with SMTP id u63so11136417wmu.2 for ; Sun, 19 Feb 2017 12:35:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=HzxKi6djqDkz9jdJSgmkRl0Ijb7iHexbadBNgbMxVrA=; b=mqXfElSQUn9efAfuJMW+mrhb7rsUGeWdcV9N7hsryfCi84r8rO6vS9ytWt7E5hIYjX yWcXJbPzr1Bwdek8pKHNks+cp3I4DNinc1oTV87jmYm4/FZzUcdR56w0wDejSZ8tGUuY X3p9gShaCb1kxs7pcH+pNSb92rX0Y8V5biJMJJZtyLgPcjg/mdk7dbIDFu4BQggjxdBS AEHtQxqeXDt9cgcK8Uf2r1Yuf0sApWK/yehy09tIvOLGVOZQ/ydmkFElKCzjGl970d/4 3yg5b7N7971p+EUdunmkIJ79uwJwOsgdq2o2XpZ7UwPWdXMlM4KWVRPLcn2w/cM5c7kO 2AMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=HzxKi6djqDkz9jdJSgmkRl0Ijb7iHexbadBNgbMxVrA=; b=M9OBLt3oWFUOBlffoRSMqQkaENZAVrg99M/LNqu1ddJi999Vahi7YU2XCMPce/t/Q8 xKtozTXkYKlnYYWDrvxND87ww8Bt5UAXqE/KDY117Q+RioJBzuUHJk9Y4kcYLFP6KjAR Rh8X0HWid5vXRiCpOpO2lbAclgJefJoGMExaCuuR3BDL5IVrISxREuqF4TNr+OOslvKb 0FGdiyEqU5TKFm2ErxRQJlF5tSTV4Bgiklei4OuJUX2ToFhMkfzztoFjXiu9x52O3Y/E I7CbK4dOFR7B7EzXeODV9Oe0QN+8vdZ2N5FC2cfnBlXj4OYdldGGG9Nwnas3WsbslqSy O3Ow== X-Gm-Message-State: AMke39lFejGzQGVuIMQIjFRa+ITH9NHdSW3tKFqHcPiZ1sXlSyvLVPWc2DwNiQspu1u0/g== X-Received: by 10.28.35.142 with SMTP id j136mr14742906wmj.11.1487536556621; Sun, 19 Feb 2017 12:35:56 -0800 (PST) Received: from ?IPv6:2003:c6:ebdc:4000:b54a:e921:753c:183c? (p200300C6EBDC4000B54AE921753C183C.dip0.t-ipconnect.de. [2003:c6:ebdc:4000:b54a:e921:753c:183c]) by smtp.googlemail.com with ESMTPSA id y97sm10709135wmh.24.2017.02.19.12.35.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Feb 2017 12:35:56 -0800 (PST) Subject: [PATCH 2/2] hwrng: meson: add clock handling to driver To: Kevin Hilman , Herbert Xu References: <00b2a4cc-686e-0cc0-43e8-552b70a1e868@gmail.com> Cc: Neil Armstrong , linux-amlogic@lists.infradead.org, linux-crypto@vger.kernel.org From: Heiner Kallweit Message-ID: Date: Sun, 19 Feb 2017 21:35:52 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <00b2a4cc-686e-0cc0-43e8-552b70a1e868@gmail.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add handling of RNG0 clock to the driver. Signed-off-by: Heiner Kallweit --- drivers/char/hw_random/meson-rng.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/char/hw_random/meson-rng.c b/drivers/char/hw_random/meson-rng.c index 119d6984..1f586e48 100644 --- a/drivers/char/hw_random/meson-rng.c +++ b/drivers/char/hw_random/meson-rng.c @@ -62,6 +62,7 @@ #include #include #include +#include #define RNG_DATA 0x00 @@ -69,6 +70,7 @@ struct meson_rng_data { void __iomem *base; struct platform_device *pdev; struct hwrng rng; + struct clk *core_clk; }; static int meson_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait) @@ -86,6 +88,7 @@ static int meson_rng_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct meson_rng_data *data; struct resource *res; + int ret; data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); if (!data) @@ -98,12 +101,33 @@ static int meson_rng_probe(struct platform_device *pdev) if (IS_ERR(data->base)) return PTR_ERR(data->base); + data->core_clk = devm_clk_get(dev, "core"); + if (IS_ERR(data->core_clk)) + return PTR_ERR(data->core_clk); + + ret = clk_prepare_enable(data->core_clk); + if (ret) + return ret; + data->rng.name = pdev->name; data->rng.read = meson_rng_read; platform_set_drvdata(pdev, data); - return devm_hwrng_register(dev, &data->rng); + ret = devm_hwrng_register(dev, &data->rng); + if (ret) + clk_disable_unprepare(data->core_clk); + + return ret; +} + +static int meson_rng_remove(struct platform_device *pdev) +{ + struct meson_rng_data *data = platform_get_drvdata(pdev); + + clk_disable_unprepare(data->core_clk); + + return 0; } static const struct of_device_id meson_rng_of_match[] = { @@ -114,6 +138,7 @@ MODULE_DEVICE_TABLE(of, meson_rng_of_match); static struct platform_driver meson_rng_driver = { .probe = meson_rng_probe, + .remove = meson_rng_remove, .driver = { .name = "meson-rng", .of_match_table = meson_rng_of_match,