Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1814553ybn; Thu, 26 Sep 2019 02:37:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqx/1owEXA7ZAzHeauE/KsxkA3BWPATPBDCKQv6tZJz6fpoMvUXUluv+3PviLOdQs07ag+HI X-Received: by 2002:a17:906:52d1:: with SMTP id w17mr2281930ejn.58.1569490645313; Thu, 26 Sep 2019 02:37:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569490645; cv=none; d=google.com; s=arc-20160816; b=LQI/EWNVDytToJeHccD6JmMScyyjOd/ijLpYztZozsQ7waIhGj4Tm94nCObKTc0M0/ MO1mM+iFEibNCdl6STr1Vb39J1MpHLILb9vKknNXqP3/YKf5hlMirLU5QE1n8t39sp4n SekhZmUjnHfTJfpbQVZURCyw9bIKx1uUA8UAalUJUmWb1CY1wSKqWZpVdQMtIcysh/l4 CPjGNgpwIOuwZ8H6mruwqkQitVB2dxzRlD6C7i293t/zI0OLXJ3gSUns/F3544GGQg24 Hcl77baWosfjJOb/tFWL4uJeDHG/QigP+6PfzTbw5jt79EAwJz3CfKZCiLmASS62FjP/ a/hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=z2fkb/IC10YlwiFzyUPLQAsl9y9C+ayKGwfJ+P3zdmk=; b=mqnRUCCGSg15+qX8K0eloUlU8eqgf06vCi3mNxaGSGqojxXG/7a/f0xla18h51Yehl HF3eTbyXjeU/ScZSCTPHJzJWa8F223XZlNCCkUCcdItIxukVQmeKbYgZ/M1fzNNGpmVi WwABCFCteB3zdxyMUVkUsxQqUJvxkGTz4uPvTS+uyoAl4Gjqtkw5M2bc7sBBlPht+2bw V40kN5IE2NUupnQ6BFsrZqdE7+x635SANvK/9sjPcX9jnqt1UqxVcBvpL7OC3f/WncDJ VSfBfo1ZL9tQIhsQ5izTqiU/8A6D4IVmZ6S18uJq92iHB8pTjzIEAFHE3AN14qU+KSRC E9QQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x4si688101ejf.264.2019.09.26.02.37.02; Thu, 26 Sep 2019 02:37:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407593AbfIYOdH (ORCPT + 99 others); Wed, 25 Sep 2019 10:33:07 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:18738 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726124AbfIYOdH (ORCPT ); Wed, 25 Sep 2019 10:33:07 -0400 X-UUID: 4bee9ee8a3e54d29aaa2c0a491d49f1c-20190925 X-UUID: 4bee9ee8a3e54d29aaa2c0a491d49f1c-20190925 Received: from mtkexhb02.mediatek.inc [(172.21.101.103)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 61364839; Wed, 25 Sep 2019 22:33:02 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs08n2.mediatek.inc (172.21.101.56) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 25 Sep 2019 22:33:00 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 25 Sep 2019 22:33:00 +0800 From: Sam Shih To: Rob Herring , Mark Rutland , Matthias Brugger , Thierry Reding CC: Ryder Lee , John Crispin , , , , , Sam Shih Subject: [PATCH v10 01/12] pwm: mediatek: add a property "num-pwms" Date: Wed, 25 Sep 2019 22:32:26 +0800 Message-ID: <1569421957-20765-2-git-send-email-sam.shih@mediatek.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1569421957-20765-1-git-send-email-sam.shih@mediatek.com> References: <1569421957-20765-1-git-send-email-sam.shih@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-TM-SNTS-SMTP: 3D52695687DF3C185C06E0655DFEB67D3175B7DC05C5106F518F784E6BB2D66D2000:8 X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ryder Lee This adds a property "num-pwms" to avoid having an endless list of compatibles with no differences for the same driver. Signed-off-by: Ryder Lee Signed-off-by: Sam Shih Reviewed-by: Uwe Kleine-König --- Changes since v6: Add a Reviewed-by tag Changes since v5: Check num-pwms value is no more than MTK_CLK_MAX - 2 (MAIN + TOP) Changes since v4: Follow reviewer's comments: Move the changes of droping the check for of_device_get_match_data returning non-NULL to next patch --- drivers/pwm/pwm-mediatek.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/drivers/pwm/pwm-mediatek.c b/drivers/pwm/pwm-mediatek.c index eb6674ce995f..e214f4f57107 100644 --- a/drivers/pwm/pwm-mediatek.c +++ b/drivers/pwm/pwm-mediatek.c @@ -55,7 +55,7 @@ static const char * const mtk_pwm_clk_name[MTK_CLK_MAX] = { }; struct mtk_pwm_platform_data { - unsigned int num_pwms; + unsigned int fallback_npwms; bool pwm45_fixup; bool has_clks; }; @@ -227,9 +227,10 @@ static const struct pwm_ops mtk_pwm_ops = { static int mtk_pwm_probe(struct platform_device *pdev) { const struct mtk_pwm_platform_data *data; + struct device_node *np = pdev->dev.of_node; struct mtk_pwm_chip *pc; struct resource *res; - unsigned int i; + unsigned int i, npwms; int ret; pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL); @@ -246,7 +247,26 @@ static int mtk_pwm_probe(struct platform_device *pdev) if (IS_ERR(pc->regs)) return PTR_ERR(pc->regs); - for (i = 0; i < data->num_pwms + 2 && pc->soc->has_clks; i++) { + ret = of_property_read_u32(np, "num-pwms", &npwms); + if (ret < 0) { + /* It's deprecated, we should specify num_pwms via DT now. */ + if (pc->soc->fallback_npwms) { + npwms = pc->soc->fallback_npwms; + dev_warn(&pdev->dev, "DT is outdated, please update it\n"); + } else { + dev_err(&pdev->dev, "failed to get number of PWMs\n"); + return ret; + } + } + + /* MAIN + TOP + NPWM < MTK_CLK_MAX */ + if ((npwms + 2) > MTK_CLK_MAX) { + dev_warn(&pdev->dev, "number of PWMs is larger than %d\n", + MTK_CLK_MAX - 2); + npwms = MTK_CLK_MAX - 2; + } + + for (i = 0; i < npwms + 2 && pc->soc->has_clks; i++) { pc->clks[i] = devm_clk_get(&pdev->dev, mtk_pwm_clk_name[i]); if (IS_ERR(pc->clks[i])) { dev_err(&pdev->dev, "clock: %s fail: %ld\n", @@ -260,7 +280,7 @@ static int mtk_pwm_probe(struct platform_device *pdev) pc->chip.dev = &pdev->dev; pc->chip.ops = &mtk_pwm_ops; pc->chip.base = -1; - pc->chip.npwm = data->num_pwms; + pc->chip.npwm = npwms; ret = pwmchip_add(&pc->chip); if (ret < 0) { @@ -279,25 +299,25 @@ static int mtk_pwm_remove(struct platform_device *pdev) } static const struct mtk_pwm_platform_data mt2712_pwm_data = { - .num_pwms = 8, + .fallback_npwms = 8, .pwm45_fixup = false, .has_clks = true, }; static const struct mtk_pwm_platform_data mt7622_pwm_data = { - .num_pwms = 6, + .fallback_npwms = 6, .pwm45_fixup = false, .has_clks = true, }; static const struct mtk_pwm_platform_data mt7623_pwm_data = { - .num_pwms = 5, + .fallback_npwms = 5, .pwm45_fixup = true, .has_clks = true, }; static const struct mtk_pwm_platform_data mt7628_pwm_data = { - .num_pwms = 4, + .fallback_npwms = 4, .pwm45_fixup = true, .has_clks = false, }; -- 2.17.1