From patchwork Tue Oct 25 13:29:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 10785 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1008442wru; Tue, 25 Oct 2022 06:32:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Y6OZ4DZVi8aqHr6WKbKXxhbtLFqHqTF1UVnjQCrsGK0m2pHGz6WhJIJsG6StS3alf6eJ6 X-Received: by 2002:a05:6a00:80b:b0:56c:cde:1a77 with SMTP id m11-20020a056a00080b00b0056c0cde1a77mr5661597pfk.57.1666704721088; Tue, 25 Oct 2022 06:32:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666704721; cv=none; d=google.com; s=arc-20160816; b=ukNkX5WFuIZpJytiM8ZcJx/0rWAOthm5LOqhJFyJDoZJIyHLw2ofVXYToD8yMr2mtG Ey4pp8+6aXoBQ16temp9F8U5L1yop2sHsqiOMwV7HYhKV6RWstlA/iGq+WlhcLiOtFOP an6Rd63Y3QrkmRJweiQKgwKBvsqIPhQpBApu6/hZeHfG8oWPTJ43NlyEed58vR3EU+sX TSWrhQAT+B+E9Thpj+qRTfoNGJEb+M6hUszXRHDnsl+CEz2/J+wVZUK8HiakrK8/cfQD bBS0YSd09W90jRs5jukc8s6dD+p+UU4YHc/VB5QtvQq7N0stbth4BD5ZLgg+uvSii7iY 1Yow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=t6qFQWHmKSFyBCgF8VJRGuHsK4Ei7rkne6tsfke6P0E=; b=LQeSh/pBJDVBg/MMj+kl2WiFRSEeEXsZMVhkSlhYgNg/rN1HVrW5tJpkOXWL/EQmHK fnX0fE7W0+9tpR9UXkcIFlCbfaLgVAxclX0kR2jGGNtUwyp37cQUmSe7cKT2+8ODSmNm veXJezpOt0B9EhVx31SAHWj2erNec80MPtrrbKo6/6Tc/vcNPokaGb5T0OWDTjN+H7Ys yKrU6a0tq1nSVQgeM4loHcMSjGPEs3j4SnntFkYKfDhrDT1crKSWCURDMoOoVJ+YQH5Z sstz7CsssWrjR9U0iCLKUYEKKp+Bxnj7B12Ind5/ZQo3pXpGZN3tywAKGQAQ5I7b84Xe Qazw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mailerdienst.de header.s=20200217 header.b=vU5Gta+s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 81-20020a630354000000b0041c506dde92si3172955pgd.636.2022.10.25.06.31.47; Tue, 25 Oct 2022 06:32:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@mailerdienst.de header.s=20200217 header.b=vU5Gta+s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232868AbiJYNaV (ORCPT + 99 others); Tue, 25 Oct 2022 09:30:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232825AbiJYNaM (ORCPT ); Tue, 25 Oct 2022 09:30:12 -0400 Received: from mxout4.routing.net (mxout4.routing.net [IPv6:2a03:2900:1:a::9]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB50BDEF13; Tue, 25 Oct 2022 06:30:01 -0700 (PDT) Received: from mxbox1.masterlogin.de (unknown [192.168.10.88]) by mxout4.routing.net (Postfix) with ESMTP id C1A5D1025EB; Tue, 25 Oct 2022 13:29:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailerdienst.de; s=20200217; t=1666704599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t6qFQWHmKSFyBCgF8VJRGuHsK4Ei7rkne6tsfke6P0E=; b=vU5Gta+sTAyNnclvdMa1mPapNQxHT2bo3oZfzMJg4hTzgHhgmXXkx/A88WP0oZ/uZbiJFz GzTBZY2xXdAHOyKVX69O1fg/bVrQ1/Ha+shwF39e7ofPiG4SKV1Oka99dU4fAjEuandQZR btJr89gnqgYy2O7Xmcrrb3Tg592WmNU= Received: from frank-G5.. (fttx-pool-217.61.152.57.bambit.de [217.61.152.57]) by mxbox1.masterlogin.de (Postfix) with ESMTPSA id 992A4403A9; Tue, 25 Oct 2022 13:29:58 +0000 (UTC) From: Frank Wunderlich To: linux-mediatek@lists.infradead.org Cc: Frank Wunderlich , Chaotian Jing , Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Matthias Brugger , Wenbin Mei , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sam Shih , =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= , Krzysztof Kozlowski Subject: [PATCH v5 1/6] dt-bindings: mmc: mtk-sd: Set clocks based on compatible Date: Tue, 25 Oct 2022 15:29:48 +0200 Message-Id: <20221025132953.81286-2-linux@fw-web.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221025132953.81286-1-linux@fw-web.de> References: <20221025132953.81286-1-linux@fw-web.de> MIME-Version: 1.0 X-Mail-ID: 22076d22-0fc1-48b2-8540-d60d145b0ee7 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747666569893192976?= X-GMAIL-MSGID: =?utf-8?q?1747666569893192976?= From: Nícolas F. R. A. Prado The binding was describing a single clock list for all platforms, but that's not really suitable: Most platforms using at least 2 clocks (source, hclk), some of them a third "source_cg". Mt2712 requires an extra 'bus_clk' on some of its controllers, while mt8192 requires 8 clocks. Move the clock definitions inside if blocks that match on the compatibles. I used Patch from Nícolas F. R. A. Prado and modified it to not using "not" statement. Fixes: 59a23395d8aa ("dt-bindings: mmc: Add support for MT8192 SoC") Signed-off-by: Nícolas F. R. A. Prado Signed-off-by: Frank Wunderlich Reviewed-by: Krzysztof Kozlowski Reviewed-by: AngeloGioacchino Del Regno --- v2: - add this patch v3: - add blank lines and change "not" to matchlist - reorder entries - make generic first then order alphanumeric - rewrite commit description - drop soc-specific mt8183 - constraints were also set for it above v4: - re-add mt8183 reg-minitems --- .../devicetree/bindings/mmc/mtk-sd.yaml | 123 +++++++++++++----- 1 file changed, 93 insertions(+), 30 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/mtk-sd.yaml b/Documentation/devicetree/bindings/mmc/mtk-sd.yaml index d8e1e2e9adf2..0cedeb12892d 100644 --- a/Documentation/devicetree/bindings/mmc/mtk-sd.yaml +++ b/Documentation/devicetree/bindings/mmc/mtk-sd.yaml @@ -10,9 +10,6 @@ maintainers: - Chaotian Jing - Wenbin Mei -allOf: - - $ref: mmc-controller.yaml# - properties: compatible: oneOf: @@ -48,27 +45,11 @@ properties: description: Should contain phandle for the clock feeding the MMC controller. minItems: 2 - items: - - description: source clock (required). - - description: HCLK which used for host (required). - - description: independent source clock gate (required for MT2712). - - description: bus clock used for internal register access (required for MT2712 MSDC0/3). - - description: msdc subsys clock gate (required for MT8192). - - description: peripheral bus clock gate (required for MT8192). - - description: AXI bus clock gate (required for MT8192). - - description: AHB bus clock gate (required for MT8192). + maxItems: 7 clock-names: minItems: 2 - items: - - const: source - - const: hclk - - const: source_cg - - const: bus_clk - - const: sys_cg - - const: pclk_cg - - const: axi_cg - - const: ahb_cg + maxItems: 7 interrupts: description: @@ -190,15 +171,97 @@ required: - vmmc-supply - vqmmc-supply -if: - properties: - compatible: - contains: - const: mediatek,mt8183-mmc -then: - properties: - reg: - minItems: 2 +allOf: + - $ref: mmc-controller.yaml# + - if: + properties: + compatible: + enum: + - mediatek,mt2701-mmc + - mediatek,mt6779-mmc + - mediatek,mt6795-mmc + - mediatek,mt7620-mmc + - mediatek,mt7622-mmc + - mediatek,mt7623-mmc + - mediatek,mt8135-mmc + - mediatek,mt8173-mmc + - mediatek,mt8183-mmc + - mediatek,mt8186-mmc + - mediatek,mt8188-mmc + - mediatek,mt8195-mmc + - mediatek,mt8516-mmc + then: + properties: + clocks: + minItems: 2 + items: + - description: source clock + - description: HCLK which used for host + - description: independent source clock gate + clock-names: + minItems: 2 + items: + - const: source + - const: hclk + - const: source_cg + + - if: + properties: + compatible: + contains: + const: mediatek,mt2712-mmc + then: + properties: + clocks: + minItems: 3 + items: + - description: source clock + - description: HCLK which used for host + - description: independent source clock gate + - description: bus clock used for internal register access (required for MSDC0/3). + clock-names: + minItems: 3 + items: + - const: source + - const: hclk + - const: source_cg + - const: bus_clk + + - if: + properties: + compatible: + contains: + const: mediatek,mt8183-mmc + then: + properties: + reg: + minItems: 2 + + - if: + properties: + compatible: + contains: + const: mediatek,mt8192-mmc + then: + properties: + clocks: + items: + - description: source clock + - description: HCLK which used for host + - description: independent source clock gate + - description: msdc subsys clock gate + - description: peripheral bus clock gate + - description: AXI bus clock gate + - description: AHB bus clock gate + clock-names: + items: + - const: source + - const: hclk + - const: source_cg + - const: sys_cg + - const: pclk_cg + - const: axi_cg + - const: ahb_cg unevaluatedProperties: false