From patchwork Thu Mar 4 22:12:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 12116985 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2750C433E0 for ; Thu, 4 Mar 2021 22:13:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 727AE64FF4 for ; Thu, 4 Mar 2021 22:13:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231687AbhCDWMz (ORCPT ); Thu, 4 Mar 2021 17:12:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230449AbhCDWMy (ORCPT ); Thu, 4 Mar 2021 17:12:54 -0500 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3B3CC061763 for ; Thu, 4 Mar 2021 14:12:52 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id e19so1596406ejt.3 for ; Thu, 04 Mar 2021 14:12:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IxSjyHvfhJ/CRzXpd7kM65mxSitdSKejDB4yVJ8QdLI=; b=SGDVknug8AsUYWYZSGdHKwErk1ohZtG+21USh8vDWbvcM6aFt8ZKYPoHP34FY7/Or4 RqoAtJe0dwn1Bch/dFzWvOCOo/dEqgcOjFOFMzAB0e2Vh5Kw37/tNktSN79n3iIUqm/j jWI2HYdntIV9Dpa68IH6OENLdI+eeMvCb2PM0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IxSjyHvfhJ/CRzXpd7kM65mxSitdSKejDB4yVJ8QdLI=; b=DlKC2qq+kUpYla1xUi3ANWNIyF0UJztXJ1/Gj9DdzYxSMOMoBybQAfDp7H7v29PlTA v1aJT0+hq0Zp53NpmLOeuXk/A9su+9Jw1WXbul1d+PXy8+PdhvO1gDdhOxjHQtjaepnx KuRWr34gXhcqKxSY7dq9b7zvM6opLzKhI/nDGlKtbrEerkzIzACySk91fyoNUi47tpq+ 5l3rR5rSLuJ00yLlrkcNot3wLZsRTBPletlWXYcRIoEe7kM1hKhiiFrAkeMwuwwhLAfR van1Y3T0vq86CU6plk8yUsquGLuIYu1SOlGb4Wd8P3MC3VZEzGbNlBWSV0b9ZLP6Ic/8 UVlQ== X-Gm-Message-State: AOAM531NFsAQqL1tori+9Fnd6n+4kozR1/Fppei9x3+vuBoFZvwHsgqP Yr4A1vP7Fl2ri7hpl6X6kfs7Dw== X-Google-Smtp-Source: ABdhPJwVN0AcFGjBUTQ8VzGydpnWSzRyWvOOXLUP2ekeX/od+/cEZvBhl2UzMVMC2N0PmxVQKV+mMg== X-Received: by 2002:a17:906:3acc:: with SMTP id z12mr6648419ejd.494.1614895971264; Thu, 04 Mar 2021 14:12:51 -0800 (PST) Received: from prevas-ravi.prevas.se ([80.208.71.141]) by smtp.gmail.com with ESMTPSA id q22sm362099ejy.5.2021.03.04.14.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 14:12:50 -0800 (PST) From: Rasmus Villemoes To: Arnd Bergmann , Guenter Roeck , Stephen Boyd Cc: Rob Herring , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-watchdog@vger.kernel.org, Rasmus Villemoes Subject: [PATCH v2 1/3] clk: add devm_clk_prepare_enable() helper Date: Thu, 4 Mar 2021 23:12:45 +0100 Message-Id: <20210304221247.488173-2-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210304221247.488173-1-linux@rasmusvillemoes.dk> References: <20210226141411.2517368-1-linux@rasmusvillemoes.dk> <20210304221247.488173-1-linux@rasmusvillemoes.dk> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org Add a managed wrapper for clk_prepare_enable(). Signed-off-by: Rasmus Villemoes --- .../driver-api/driver-model/devres.rst | 1 + drivers/clk/clk-devres.c | 29 +++++++++++++++++++ include/linux/clk.h | 13 +++++++++ 3 files changed, 43 insertions(+) diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst index cd8b6e657b94..8ee2557f9ad7 100644 --- a/Documentation/driver-api/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst @@ -253,6 +253,7 @@ CLOCK devm_clk_hw_register() devm_of_clk_add_hw_provider() devm_clk_hw_register_clkdev() + devm_clk_prepare_enable() DMA dmaenginem_async_device_register() diff --git a/drivers/clk/clk-devres.c b/drivers/clk/clk-devres.c index be160764911b..d5bfa8cd7347 100644 --- a/drivers/clk/clk-devres.c +++ b/drivers/clk/clk-devres.c @@ -156,3 +156,32 @@ struct clk *devm_get_clk_from_child(struct device *dev, return clk; } EXPORT_SYMBOL(devm_get_clk_from_child); + +static void devm_clk_disable_unprepare(struct device *dev, void *res) +{ + clk_disable_unprepare(*(struct clk **)res); +} + +int devm_clk_prepare_enable(struct device *dev, struct clk *clk) +{ + struct clk **ptr; + int ret; + + if (!clk) + return 0; + + ptr = devres_alloc(devm_clk_disable_unprepare, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return -ENOMEM; + + ret = clk_prepare_enable(clk); + if (!ret) { + *ptr = clk; + devres_add(dev, ptr); + } else { + devres_free(ptr); + } + + return ret; +} +EXPORT_SYMBOL(devm_clk_prepare_enable); diff --git a/include/linux/clk.h b/include/linux/clk.h index 266e8de3cb51..04d135520480 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -485,6 +485,19 @@ struct clk *devm_clk_get_optional(struct device *dev, const char *id); */ struct clk *devm_get_clk_from_child(struct device *dev, struct device_node *np, const char *con_id); +/** + * devm_clk_prepare_enable - prepare and enable a clock source + * @dev: device for clock "consumer" + * @clk: clock source + * + * This function calls clk_prepare_enable() on @clk, and ensures the + * clock will automatically be disabled and unprepared when the device + * is unbound from the bus. + * + * Must not be called from within atomic context. + */ +int devm_clk_prepare_enable(struct device *dev, struct clk *clk); + /** * clk_rate_exclusive_get - get exclusivity over the rate control of a * producer From patchwork Thu Mar 4 22:12:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 12116983 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6CA7C43381 for ; Thu, 4 Mar 2021 22:12:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8E1AB64FF1 for ; Thu, 4 Mar 2021 22:12:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231313AbhCDWMy (ORCPT ); Thu, 4 Mar 2021 17:12:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230124AbhCDWMx (ORCPT ); Thu, 4 Mar 2021 17:12:53 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CC29C061756 for ; Thu, 4 Mar 2021 14:12:53 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id b13so27855234edx.1 for ; Thu, 04 Mar 2021 14:12:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v/pPDOAIiRjR7lEs29siBxnpMbhMpFCg4qL6RvapyuQ=; b=ZvgjxCFdW+xEIJQRTSrZL9RG99WKcuzdTurrplaWC8+EC8MZwlMwU+OBT9Nm8QNzO5 NdOoYpYInzinJHNu6McP1uHtYkzgOrhNUi32Us+kUjDel5XCS1sga1lOsHnl9S6lAqYl N+2auUjyYr0kuUMvKyhGGBAlXCZ08f4U1dgJY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v/pPDOAIiRjR7lEs29siBxnpMbhMpFCg4qL6RvapyuQ=; b=Adx1H1SSPD9BPrePI6HNbR5wi0LwK3aLzOLxQmqoTGsoouXkiH/P4M4VhCSyDVGiKA VJz7ClxKfQegJvEx7j20ImVQ+YTBYUrxqPZYL0jRQ0QnB7DyQbYKCWzmeS3I3cad95bs tGuG36OwyIVA4JD0XNY5mMVxl6C37ZfIOi51vbgwvYlHqTLnrdViGX37nA/gStavY/ip mLQISpeWMPPj2iLD3XHsN94JpRq6FD5pwHQYivtEqymOTXGdzyaZHR2O8BEpvi9xGbXV /5gvD6BXf93BtyujuOniM6uc/OK8OyPxNYW1Kh2IH0jjC90mKk0sys7af8t/SYDNuB/1 31vg== X-Gm-Message-State: AOAM530vO0rdzlSdjt5ViPnam3kRh495GHFn2d2VzSI0Wbm5LcY/EH4f QaBJbttuR8GRPVn8GlY0XHnmOA== X-Google-Smtp-Source: ABdhPJy3H4qGxTqJAT6Dy3t671giI6caxeE5c2SF84vG2D259IJR/Gin3MwbgSzzwbdGCsregOluwQ== X-Received: by 2002:aa7:c889:: with SMTP id p9mr6615207eds.82.1614895972167; Thu, 04 Mar 2021 14:12:52 -0800 (PST) Received: from prevas-ravi.prevas.se ([80.208.71.141]) by smtp.gmail.com with ESMTPSA id q22sm362099ejy.5.2021.03.04.14.12.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 14:12:51 -0800 (PST) From: Rasmus Villemoes To: Arnd Bergmann , Guenter Roeck , Stephen Boyd Cc: Rob Herring , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-watchdog@vger.kernel.org, Rasmus Villemoes , Arnd Bergmann Subject: [PATCH v2 2/3] dt-bindings: watchdog: add optional "delay" clock to gpio-wdt binding Date: Thu, 4 Mar 2021 23:12:46 +0100 Message-Id: <20210304221247.488173-3-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210304221247.488173-1-linux@rasmusvillemoes.dk> References: <20210226141411.2517368-1-linux@rasmusvillemoes.dk> <20210304221247.488173-1-linux@rasmusvillemoes.dk> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org [DO NOT MERGE - see cover letter] We have a board where the reset output from the ADM706S is split in two: directly routed to an interrupt, and also to start a ripple counter, which 64 ms later than pulls the SOC's reset pin. That ripple counter only works if the RTC's 32kHz output is enabled, and since linux by default disables unused clocks, that effectively renders the watchdog useless. So add an optional "delay" clock binding. Suggested-by: Arnd Bergmann Signed-off-by: Rasmus Villemoes --- Documentation/devicetree/bindings/watchdog/gpio-wdt.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/watchdog/gpio-wdt.txt b/Documentation/devicetree/bindings/watchdog/gpio-wdt.txt index 198794963786..527be6b30451 100644 --- a/Documentation/devicetree/bindings/watchdog/gpio-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/gpio-wdt.txt @@ -17,6 +17,10 @@ Optional Properties: - always-running: If the watchdog timer cannot be disabled, add this flag to have the driver keep toggling the signal without a client. It will only cease to toggle the signal when the device is open and the timeout elapsed. +- clock-names: May contain the entry "delay" if the board has logic + that delays the reset signal from the watchdog and which requires an + external signal to function. +- clocks: Phandles corresponding to the clock-names. Example: watchdog: watchdog { @@ -25,4 +29,6 @@ Example: gpios = <&gpio3 9 GPIO_ACTIVE_LOW>; hw_algo = "toggle"; hw_margin_ms = <1600>; + clock-names = "delay"; + clocks = <&rtc 1>; }; From patchwork Thu Mar 4 22:12:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 12116987 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E627EC433E6 for ; Thu, 4 Mar 2021 22:13:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B34A865000 for ; Thu, 4 Mar 2021 22:13:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231187AbhCDWMz (ORCPT ); Thu, 4 Mar 2021 17:12:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231453AbhCDWMy (ORCPT ); Thu, 4 Mar 2021 17:12:54 -0500 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2530EC061764 for ; Thu, 4 Mar 2021 14:12:54 -0800 (PST) Received: by mail-ed1-x535.google.com with SMTP id m9so8491157edd.5 for ; Thu, 04 Mar 2021 14:12:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UCo3mKQIbcpollGcJ9PYHtksoboB7Ro207jOYrCfzdo=; b=g1Zn6sewFIleBOXnOHM71n+XqDprG9IKVcU3vrwC/LmP7RiEYZWioiuOo6u8eay8rp 1efpcjma6Y7hUyfQyOqliLwpMX7YVcRtMkHFwd4IttHF9G22LrA/mMggvqUZaqDgqmU1 133cDV7S24kpbxsZu8wG18e2IJ81VwzKnsak4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UCo3mKQIbcpollGcJ9PYHtksoboB7Ro207jOYrCfzdo=; b=fFXssmaxyX/F3WAOJUH2kv/y2yENR7wLRgA/TtWVh/buRQF9UY0CF1djzPzjBr1nsF ZgXH+/bM2864pYN/4vHQ2MEBQ3bYsshUR7ZT8Ml9Sx9YQqAjgTzF8APPW13ZUqhXpKyQ esIxj0Pnwset7V2SaOagQ+XwlMTYkNKG6oUV4/3Wlk7Ubu7NrSggeesPBVg9UKEUFGC3 HZh/s9sCKNcOazUCVTEnce+kh42GKQmigEK7mKO18DilLioN4ElZW5i+GSwXc68qtKjO vEVz+6TokO/Tk9Sy4FzoiLKeECz/l6IjS+Jf4yOlWy7m8es1YLBisSrETr7VF47Gk4Hv /yEw== X-Gm-Message-State: AOAM5301lwtxZ7Fw4lCcmsHNIDEslLGG3qz85eck/25rKDRDiVV//hUC /USKDnzozJaZkeWjaB/2PTt/ow== X-Google-Smtp-Source: ABdhPJzme5MAAWpf/zramDLF/Q+YNk0uNjfX+zRiBm3mY5cw1s0ZQPbrq+hYw2HTPbmIl+2U4okoLg== X-Received: by 2002:aa7:cd8c:: with SMTP id x12mr6809476edv.355.1614895972903; Thu, 04 Mar 2021 14:12:52 -0800 (PST) Received: from prevas-ravi.prevas.se ([80.208.71.141]) by smtp.gmail.com with ESMTPSA id q22sm362099ejy.5.2021.03.04.14.12.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 14:12:52 -0800 (PST) From: Rasmus Villemoes To: Arnd Bergmann , Guenter Roeck , Stephen Boyd Cc: Rob Herring , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-watchdog@vger.kernel.org, Rasmus Villemoes Subject: [PATCH v2 3/3] watchdog: gpio_wdt: implement support for optional "delay" clock Date: Thu, 4 Mar 2021 23:12:47 +0100 Message-Id: <20210304221247.488173-4-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210304221247.488173-1-linux@rasmusvillemoes.dk> References: <20210226141411.2517368-1-linux@rasmusvillemoes.dk> <20210304221247.488173-1-linux@rasmusvillemoes.dk> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org [DO NOT MERGE - see cover letter] We have a board where the reset output from the ADM706S is split in two: directly routed to an interrupt, and also to start a ripple counter, which 64 ms later than pulls the SOC's reset pin. That ripple counter only works if the RTC's 32kHz output is enabled, and since linux by default disables unused clocks, that effectively renders the watchdog useless. Add driver support for an optional "delay" clock, as documented in the preceding patch. Signed-off-by: Rasmus Villemoes --- drivers/watchdog/gpio_wdt.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c index 0923201ce874..f812c39bc1e8 100644 --- a/drivers/watchdog/gpio_wdt.c +++ b/drivers/watchdog/gpio_wdt.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include @@ -111,6 +112,7 @@ static int gpio_wdt_probe(struct platform_device *pdev) enum gpiod_flags gflags; unsigned int hw_margin; const char *algo; + struct clk *clk; int ret; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); @@ -164,6 +166,13 @@ static int gpio_wdt_probe(struct platform_device *pdev) if (priv->always_running) gpio_wdt_start(&priv->wdd); + clk = devm_clk_get_optional(dev, "delay"); + if (IS_ERR(clk)) + return PTR_ERR(clk); + ret = devm_clk_prepare_enable(dev, clk); + if (ret) + return ret; + return devm_watchdog_register_device(dev, &priv->wdd); }