From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Subject: [PATCH v9 2/6] pwm: sun4i: Prefer "mod" clock to unnamed Date: Sun, 24 Nov 2019 18:29:04 +0100 Message-ID: <20191124172908.10804-3-peron.clem@gmail.com> References: <20191124172908.10804-1-peron.clem@gmail.com> Reply-To: peron.clem-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Return-path: Sender: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org In-Reply-To: <20191124172908.10804-1-peron.clem-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , To: Thierry Reding , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Maxime Ripard , Chen-Yu Tsai , Philipp Zabel Cc: linux-pwm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= List-Id: linux-pwm@vger.kernel.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. Reviewed-by: Uwe Kleine-K=C3=B6nig Signed-off-by: Cl=C3=A9ment P=C3=A9ron --- 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 487899d4cc3f..80026167044b 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 *pde= v) if (IS_ERR(pwm->base)) return PTR_ERR(pwm->base); =20 - pwm->clk =3D 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 =3D devm_clk_get_optional(&pdev->dev, "mod"); + if (IS_ERR(pwm->clk)) { + if (PTR_ERR(pwm->rst) !=3D -EPROBE_DEFER) + dev_err(&pdev->dev, "get mod clock failed %pe\n", + pwm->clk); return PTR_ERR(pwm->clk); + } + + if (!pwm->clk) { + pwm->clk =3D devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(pwm->clk)) { + if (PTR_ERR(pwm->rst) !=3D -EPROBE_DEFER) + dev_err(&pdev->dev, "get unnamed clock failed %pe\n", + pwm->clk); + return PTR_ERR(pwm->clk); + } + } =20 pwm->rst =3D devm_reset_control_get_optional_shared(&pdev->dev, NULL); if (IS_ERR(pwm->rst)) { --=20 2.20.1 --=20 You received this message because you are subscribed to the Google Groups "= linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an e= mail to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org To view this discussion on the web, visit https://groups.google.com/d/msgid= /linux-sunxi/20191124172908.10804-3-peron.clem%40gmail.com. From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.6 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 5B29EC432C0 for ; Sun, 24 Nov 2019 17:30:39 +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 0FE5D207FD for ; Sun, 24 Nov 2019 17:30:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="s7zj2u+a"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JxvIqrQs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0FE5D207FD 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+infradead-linux-arm-kernel=archiver.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=V4C12M1m7Ahf4ap1yDIxpNKDGtqR3nZM7RZ7ctpslAg=; b=s7zj2u+akWK37W 1+pdebldHYwqCTxqVom3qQwMiq3Ug01Qx65ddNAOdfW/7EAwRcQhkZHuUGZcMfdEdhGrO8X+jxFsG A0sm21r0ZWj5cKgGVHJVEwRhfkt4fOZrnVbJ9zcOezgWnogt+jqnaxKB5L7SqFllgePIWYrXYRKNe RlU25mgr3NS1DS1wi3ttHEs3ryrQt/qMWoLMhXOeki83UfX65XdRBSvPhPOkvvYvYe4fx9Paa9jCk qqqoqOTWGxVhZYer22/vZA9qv9csJDKki6XBgTH8IFyddcTUjLd+iQ2p8e3HGTtuTKyaezLqlN1eT t1vLlEUwPQE1aGJ+9zXQ==; 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 1iYviV-0006EF-QY; Sun, 24 Nov 2019 17:30:35 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iYvi1-0004kV-GG for linux-arm-kernel@lists.infradead.org; Sun, 24 Nov 2019 17:30:06 +0000 Received: by mail-wm1-x344.google.com with SMTP id b11so12697201wmb.5 for ; Sun, 24 Nov 2019 09:30:05 -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=11OJgFf0c1fRpm2QKhR90dd74bTjmn3YLFrj0+iDgME=; b=JxvIqrQsR3EH7tVEg3Mt/EsgCifsBPlln+APafYJtr99HPNoUtYqSCBEkFbeyc9wZt X97dKcORrbfwyvlS4808HTu/f031TGUSxsGrbitSrqk1xKGMHlywKBKZjQTAo53+SSAr 4AnJtK1d3ENQerbwCjewLj2UDU+9fSHMniqXxpjJg2ME6TKq8N16wqEcqnfezw7o/p4/ DxvPqwiqHS+fBB8vUsFpSNCTw3DtE5KrZHz+joqDk/1VFhevOT5XuKXdu4ZtQmz/T+UV HXDVHStVlHpDndteZ1icmtJyGiWFwS6B/BkRpBVS6XGJdijuTXb/LXqN4EW615naEmB9 wtZA== 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=11OJgFf0c1fRpm2QKhR90dd74bTjmn3YLFrj0+iDgME=; b=jdJI+QedslmbxUcR/wOnzWTfHC9MiPPCkfXgmdAOKJwKs5bPoc3D924KBUQzbu9n5m FHP1bDnx0c0NrxchWdEUbCvABi7Tu2iMZkEXm3HiGrvTklk+T5Qerrj7Iuvf3zExaeWm V8MJukzo/8EXtkHH6Zg8WrJN3aNq4shYJSHq8x1pKE5L7iFVybFBh9dG5l7R4PCIa+3K krzrpynrzdRZRzYpsl6CZvMqCST3pb7/rpuRfoutg0Xsl5wSsgK4HxpywltLOG+EdQQC YsMSklq++wvNsUlK5WpVUvfDGWo7GSnorjUWRKwWMVSn3QNCHhFwe2lTl6U9FBlKJwXz Pmbw== X-Gm-Message-State: APjAAAXFpMu4N/PKF1NpXsHes+uqz4myLO6YCaLva+TbCnomVcUVtvB4 uMCe7EBE97WfaxoHQjZpeBY= X-Google-Smtp-Source: APXvYqxCILgcleo6Lk2jlnRahagfAhZ8VPpjVIezqiUklQ+tzkHAg3+u75onarnPMn0IhMj0G1Nqkg== X-Received: by 2002:a7b:cd86:: with SMTP id y6mr12934898wmj.30.1574616603668; Sun, 24 Nov 2019 09:30:03 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:1f1:d0f0::4e2b:d7ca]) by smtp.gmail.com with ESMTPSA id n13sm5537275wmi.25.2019.11.24.09.30.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Nov 2019 09:30:03 -0800 (PST) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Thierry Reding , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Maxime Ripard , Chen-Yu Tsai , Philipp Zabel Subject: [PATCH v9 2/6] pwm: sun4i: Prefer "mod" clock to unnamed Date: Sun, 24 Nov 2019 18:29:04 +0100 Message-Id: <20191124172908.10804-3-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191124172908.10804-1-peron.clem@gmail.com> References: <20191124172908.10804-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-20191124_093005_560289_586D2920 X-CRM114-Status: GOOD ( 15.98 ) 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, linux-sunxi@googlegroups.com, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org TmV3IGRldmljZSB0cmVlIGJpbmRpbmdzIGNhbGxlZCB0aGUgc291cmNlIGNsb2NrIG9mIHRoZSBt b2R1bGUKIm1vZCIgd2hlbiBzZXZlcmFsIGNsb2NrcyBhcmUgZGVmaW5lZC4KClRyeSB0byBnZXQg YSBjbG9jayBjYWxsZWQgIm1vZCIgaWYgbm90aGluZyBpcyBmb3VuZCB0cnkgdG8gZ2V0CmFuIHVu bmFtZWQgY2xvY2suCgpSZXZpZXdlZC1ieTogVXdlIEtsZWluZS1Lw7ZuaWcgPHUua2xlaW5lLWtv ZW5pZ0BwZW5ndXRyb25peC5kZT4KU2lnbmVkLW9mZi1ieTogQ2zDqW1lbnQgUMOpcm9uIDxwZXJv bi5jbGVtQGdtYWlsLmNvbT4KLS0tCiBkcml2ZXJzL3B3bS9wd20tc3VuNGkuYyB8IDI5ICsrKysr KysrKysrKysrKysrKysrKysrKysrKy0tCiAxIGZpbGUgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygr KSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3B3bS9wd20tc3VuNGkuYyBi L2RyaXZlcnMvcHdtL3B3bS1zdW40aS5jCmluZGV4IDQ4Nzg5OWQ0Y2MzZi4uODAwMjYxNjcwNDRi IDEwMDY0NAotLS0gYS9kcml2ZXJzL3B3bS9wd20tc3VuNGkuYworKysgYi9kcml2ZXJzL3B3bS9w d20tc3VuNGkuYwpAQCAtMzYyLDkgKzM2MiwzNCBAQCBzdGF0aWMgaW50IHN1bjRpX3B3bV9wcm9i ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCWlmIChJU19FUlIocHdtLT5iYXNlKSkK IAkJcmV0dXJuIFBUUl9FUlIocHdtLT5iYXNlKTsKIAotCXB3bS0+Y2xrID0gZGV2bV9jbGtfZ2V0 KCZwZGV2LT5kZXYsIE5VTEwpOwotCWlmIChJU19FUlIocHdtLT5jbGspKQorCS8qCisJICogQWxs IGhhcmR3YXJlIHZhcmlhbnRzIG5lZWQgYSBzb3VyY2UgY2xvY2sgdGhhdCBpcyBkaXZpZGVkIGFu ZAorCSAqIHRoZW4gZmVlZHMgdGhlIGNvdW50ZXIgdGhhdCBkZWZpbmVzIHRoZSBvdXRwdXQgd2F2 ZSBmb3JtLiBJbiB0aGUKKwkgKiBkZXZpY2UgdHJlZSB0aGlzIGNsb2NrIGlzIGVpdGhlciB1bm5h bWVkIG9yIGNhbGxlZCAibW9kIi4KKwkgKiBTb21lIHZhcmlhbnRzIChlLmcuIEg2KSBuZWVkIGFu b3RoZXIgY2xvY2sgdG8gYWNjZXNzIHRoZQorCSAqIGhhcmR3YXJlIHJlZ2lzdGVyczsgdGhpcyBp cyBjYWxsZWQgImJ1cyIuCisJICogU28gd2UgcmVxdWVzdCAibW9kIiBmaXJzdCAoYW5kIGlnbm9y ZSB0aGUgY29ybmVyIGNhc2UgdGhhdCBhCisJICogcGFyZW50IHByb3ZpZGVzIGEgIm1vZCIgY2xv Y2sgd2hpbGUgdGhlIHJpZ2h0IG9uZSB3b3VsZCBiZSB0aGUKKwkgKiB1bm5hbWVkIG9uZSBvZiB0 aGUgUFdNIGRldmljZSkgYW5kIGlmIHRoaXMgaXMgbm90IGZvdW5kIHdlIGZhbGwKKwkgKiBiYWNr IHRvIHRoZSBmaXJzdCBjbG9jayBvZiB0aGUgUFdNLgorCSAqLworCXB3bS0+Y2xrID0gZGV2bV9j bGtfZ2V0X29wdGlvbmFsKCZwZGV2LT5kZXYsICJtb2QiKTsKKwlpZiAoSVNfRVJSKHB3bS0+Y2xr KSkgeworCQlpZiAoUFRSX0VSUihwd20tPnJzdCkgIT0gLUVQUk9CRV9ERUZFUikKKwkJCWRldl9l cnIoJnBkZXYtPmRldiwgImdldCBtb2QgY2xvY2sgZmFpbGVkICVwZVxuIiwKKwkJCQlwd20tPmNs ayk7CiAJCXJldHVybiBQVFJfRVJSKHB3bS0+Y2xrKTsKKwl9CisKKwlpZiAoIXB3bS0+Y2xrKSB7 CisJCXB3bS0+Y2xrID0gZGV2bV9jbGtfZ2V0KCZwZGV2LT5kZXYsIE5VTEwpOworCQlpZiAoSVNf RVJSKHB3bS0+Y2xrKSkgeworCQkJaWYgKFBUUl9FUlIocHdtLT5yc3QpICE9IC1FUFJPQkVfREVG RVIpCisJCQkJZGV2X2VycigmcGRldi0+ZGV2LCAiZ2V0IHVubmFtZWQgY2xvY2sgZmFpbGVkICVw ZVxuIiwKKwkJCQkJcHdtLT5jbGspOworCQkJcmV0dXJuIFBUUl9FUlIocHdtLT5jbGspOworCQl9 CisJfQogCiAJcHdtLT5yc3QgPSBkZXZtX3Jlc2V0X2NvbnRyb2xfZ2V0X29wdGlvbmFsX3NoYXJl ZCgmcGRldi0+ZGV2LCBOVUxMKTsKIAlpZiAoSVNfRVJSKHB3bS0+cnN0KSkgewotLSAKMi4yMC4x CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgt YXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQu b3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJt LWtlcm5lbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.7 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 80DCEC432C3 for ; Sun, 24 Nov 2019 17:30:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55A372075E for ; Sun, 24 Nov 2019 17:30:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JxvIqrQs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726947AbfKXRaG (ORCPT ); Sun, 24 Nov 2019 12:30:06 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:53281 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726891AbfKXRaF (ORCPT ); Sun, 24 Nov 2019 12:30:05 -0500 Received: by mail-wm1-f68.google.com with SMTP id u18so12735960wmc.3; Sun, 24 Nov 2019 09:30:04 -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=11OJgFf0c1fRpm2QKhR90dd74bTjmn3YLFrj0+iDgME=; b=JxvIqrQsR3EH7tVEg3Mt/EsgCifsBPlln+APafYJtr99HPNoUtYqSCBEkFbeyc9wZt X97dKcORrbfwyvlS4808HTu/f031TGUSxsGrbitSrqk1xKGMHlywKBKZjQTAo53+SSAr 4AnJtK1d3ENQerbwCjewLj2UDU+9fSHMniqXxpjJg2ME6TKq8N16wqEcqnfezw7o/p4/ DxvPqwiqHS+fBB8vUsFpSNCTw3DtE5KrZHz+joqDk/1VFhevOT5XuKXdu4ZtQmz/T+UV HXDVHStVlHpDndteZ1icmtJyGiWFwS6B/BkRpBVS6XGJdijuTXb/LXqN4EW615naEmB9 wtZA== 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=11OJgFf0c1fRpm2QKhR90dd74bTjmn3YLFrj0+iDgME=; b=Q54EoOJ1oIy7KFov4TNBihWZVQICzig0wt8ZxpcBLR9WyNuIFssXKDdlaSu8OfWYIN yi8hE7y+k+6F65aNRvB4BpEeJSpVCHbFMyEejgdxatI/EW1+KBlUAi4YuQ8/tYiDgScr 56+p6bP8/O8TVMnoHh4pGViZsEw4jb1HUKq3wlENSAeJhKHz1iwRWpAWdJ2eLHJtzFag DvHjovJ4X8kgstnBvvo1i0TZNsUUtOlgw0CRky520c08j7FAcmNxcVfjdybQVzjraYy+ Ybf4Cnb7EHe4Iy3bDK50RVL1tq/3amiRdWBs4qoBIO5bOoSI1pzvatqa2IX0hkETJsea M6Qg== X-Gm-Message-State: APjAAAVDS6kcpwuPZVHapT4aciLoRsO81GHhWZV3MjSF7N/Acv2487mN G07/eC571vjn0nmU7z/DTkc= X-Google-Smtp-Source: APXvYqxCILgcleo6Lk2jlnRahagfAhZ8VPpjVIezqiUklQ+tzkHAg3+u75onarnPMn0IhMj0G1Nqkg== X-Received: by 2002:a7b:cd86:: with SMTP id y6mr12934898wmj.30.1574616603668; Sun, 24 Nov 2019 09:30:03 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:1f1:d0f0::4e2b:d7ca]) by smtp.gmail.com with ESMTPSA id n13sm5537275wmi.25.2019.11.24.09.30.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Nov 2019 09:30:03 -0800 (PST) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Thierry Reding , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Maxime Ripard , Chen-Yu Tsai , Philipp Zabel Cc: linux-pwm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Subject: [PATCH v9 2/6] pwm: sun4i: Prefer "mod" clock to unnamed Date: Sun, 24 Nov 2019 18:29:04 +0100 Message-Id: <20191124172908.10804-3-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191124172908.10804-1-peron.clem@gmail.com> References: <20191124172908.10804-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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. Reviewed-by: Uwe Kleine-König Signed-off-by: Clément Péron --- 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 487899d4cc3f..80026167044b 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)) { -- 2.20.1