From patchwork Tue Nov 19 17:53:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 11252519 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7B9AF14DB for ; Tue, 19 Nov 2019 17:54:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 115EC21823 for ; Tue, 19 Nov 2019 17:54:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="HeKr6lAI"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HrqbTpU4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 115EC21823 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WQP4fFIgN4uB7QacUanUNXwudfQyb8VquiBfRbxL9Vo=; b=HeKr6lAIbPT0te 1ML2M6BXquj6lwHc/ImOoDfR/ebGD8LZJnNNB6y1k3z8d58u1KysZI7L2BX5BCoWfegRB/u4tAKE3 Us/IIkUKcc5T3oIAlQPjZQ5K7HDwKftvZE/xOI5CE2Jlj5h4niddZRN3QAqojWtaF6ABfDDAUuGlb ehsje5qHZZG/pjWOgJ7MPh2PmHwuL1XxbyGPL3HGrA4aN6RkFepCntW8D6gWh64cA4X4+h+sOOiXt vLzSF/Kqya8kc2tS7FEfrMyt0UTZHQc7I29IHrVEs/SiaHaQTrVfMvq0XAaZq8TF5cpyiDNsmgMnt 9RsaZR/zjqByEHSpR8kQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iX7i1-0008N9-Vb; Tue, 19 Nov 2019 17:54:37 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iX7gu-0007HS-8F for linux-arm-kernel@lists.infradead.org; Tue, 19 Nov 2019 17:53:30 +0000 Received: by mail-wm1-x341.google.com with SMTP id 8so4810509wmo.0 for ; Tue, 19 Nov 2019 09:53:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+uPwPfx0oQerpYTv3rMNbZ1we4qpdrwsuG2bGFowiTE=; b=HrqbTpU48LtXXGhuT1jSoBXlW4dQYaVuKNPJ6cUTawNnHjXEbsNb2n+BtrFaIT0nxg jO0U2HrzGfy4kyXtUC/suSyd8YuQ1lB28fbgBv/rNCKapu5Q0EmVKEVIeNLjdTj+1lOB UfcojpSGvn4mY8QWbvlzHdDWCtJPBuPB9aRRGscQUs79XtKLnDCvPNkkJ19xsPlJBdRB y76yrpvQEmgaIa9po8DcKV70OOJk2lfCDp6KoT6W+wAsBJRwe9Etn5OH4Eik9P+qn+dh ib0klC/9sl7FbGu3gDtebUHe43V/2zVto6ZKc3hNx/Np+vi+obLmAZ4D+qav/uAGE0tb utQA== 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=+uPwPfx0oQerpYTv3rMNbZ1we4qpdrwsuG2bGFowiTE=; b=ghl5dCWopLYP9kQw+EqRLpmZsgemiCjfOEdQpSeTJjMRaBx1mwBQFXokOrgAgyxmpa AbK/wlupu42k2P9ThPh41lIjup94+EUgJIvS0wsbTpVqkxykbY6Y8i9YkPU9/pDhR/zj aWbvRVBNiqoaLSL2RzANEAcHESsE8lQJSy9lv1bL+FOHnqgW/y+Ut1zCvTrhuwVaS1hl wjHR74+lMGNxFYYPdRfh8H5qQ4f9WKSeW7OReFmt4DAfFQZ9sLELVe1ROIDRJIOXYDr8 6JAsHeKdqlAFGamXIvHEmlz0HYzb/Ua1p7iX/S36thUEcMfALkM8F9z/eieMedpolfYr /C1A== X-Gm-Message-State: APjAAAV17gFO5/2qdtyZxUZRGd3LXSZtYKhYC0wsACrDR97OeRT1/yKT 6y26tGZN/ObBw95ITNcosq8= X-Google-Smtp-Source: APXvYqxoIbx/qLj+H9mdcAmhEdkBaM+WWALtgFxviLoGVxHH9Lkd0YrjTBQkL8yEBwpAShppBEu69w== X-Received: by 2002:a7b:c392:: with SMTP id s18mr6609135wmj.61.1574186006521; Tue, 19 Nov 2019 09:53:26 -0800 (PST) Received: from clement-Latitude-7490.outsight.local (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id l13sm3772618wmh.12.2019.11.19.09.53.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2019 09:53:26 -0800 (PST) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: Thierry Reding , =?utf-8?q?Uwe_Kleine-K=C3=B6n?= =?utf-8?q?ig?= , Rob Herring , Mark Rutland , Maxime Ripard , Chen-Yu Tsai , Philipp Zabel Subject: [PATCH v7 3/8] pwm: sun4i: Prefer "mod" clock to unnamed Date: Tue, 19 Nov 2019 18:53:14 +0100 Message-Id: <20191119175319.16561-4-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191119175319.16561-1-peron.clem@gmail.com> References: <20191119175319.16561-1-peron.clem@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191119_095328_292993_4EED6D4E X-CRM114-Status: GOOD ( 16.76 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:341 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (peron.clem[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pwm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, =?utf-8?b?Q2w=?= =?utf-8?b?w6ltZW50IFDDqXJvbg==?= , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org New device tree bindings called the source clock of the module "mod" when several clocks are defined. Try to get a clock called "mod" if nothing is found try to get an unnamed clock. Signed-off-by: Clément Péron Reviewed-by: Uwe Kleine-König --- drivers/pwm/pwm-sun4i.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/drivers/pwm/pwm-sun4i.c b/drivers/pwm/pwm-sun4i.c index c17935805690..6d97fef4ed43 100644 --- a/drivers/pwm/pwm-sun4i.c +++ b/drivers/pwm/pwm-sun4i.c @@ -362,9 +362,34 @@ static int sun4i_pwm_probe(struct platform_device *pdev) if (IS_ERR(pwm->base)) return PTR_ERR(pwm->base); - pwm->clk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(pwm->clk)) + /* + * All hardware variants need a source clock that is divided and + * then feeds the counter that defines the output wave form. In the + * device tree this clock is either unnamed or called "mod". + * Some variants (e.g. H6) need another clock to access the + * hardware registers; this is called "bus". + * So we request "mod" first (and ignore the corner case that a + * parent provides a "mod" clock while the right one would be the + * unnamed one of the PWM device) and if this is not found we fall + * back to the first clock of the PWM. + */ + pwm->clk = devm_clk_get_optional(&pdev->dev, "mod"); + if (IS_ERR(pwm->clk)) { + if (PTR_ERR(pwm->rst) != -EPROBE_DEFER) + dev_err(&pdev->dev, "get mod clock failed %pe\n", + pwm->clk); return PTR_ERR(pwm->clk); + } + + if (!pwm->clk) { + pwm->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(pwm->clk)) { + if (PTR_ERR(pwm->rst) != -EPROBE_DEFER) + dev_err(&pdev->dev, "get unnamed clock failed %pe\n", + pwm->clk); + return PTR_ERR(pwm->clk); + } + } pwm->rst = devm_reset_control_get_optional_shared(&pdev->dev, NULL); if (IS_ERR(pwm->rst)) {