Message ID | 20221209171621.3351220-1-robh@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp896363wrr; Fri, 9 Dec 2022 09:18:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf6dTum055UAbUnBz7/Q2kIvqnS07pxc0e2l3x8gjx4410WzR8uKWP+R7hYV+DTuY4SkMmQL X-Received: by 2002:a17:907:8c0c:b0:7c0:8e62:56d3 with SMTP id ta12-20020a1709078c0c00b007c08e6256d3mr6642106ejc.50.1670606301011; Fri, 09 Dec 2022 09:18:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670606300; cv=none; d=google.com; s=arc-20160816; b=vK5e6sT5vZUEPJuoYG0loF56jfiGH01NPrFCIjr16ARFXZ5+JU/KVpTbS9/Tk+qMxe g32TvgIa85+gN5aSkmWawONgN21ntIeiolAYUshE+PDNLK0Mtj+TIdssYw1qbyfL2pzF MH7FWPwPJQWU0hthuT7JVJ7xfuEGMOdXE3iFl+W8pxhQMOL4YTCvlzcVuuhMOTTbBAtU K9wQmXuEmCeH6HzeFdVoocKLSqaoKQi6PJaBTIM9mMmPp4Z/hQjQ5UJIWAn4LCpdTL1F sps3aAL5vOMf/CssNPC7ZqQwgKCVCJ03KMiqpklFDzy8PUswKnLgXtEvYw2+c93DdLUg xSYQ== 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 :message-id:date:subject:cc:to:from; bh=eN7a2U3mP8Yzw7PGpnN4K9XOjRgKV4cZBsjjvOGf8hc=; b=DMg7FjsMWdtJ/TeKJ/VDwpC0kuDPu2ntM+RxIBoKM2tl9UD/t/WlsP5KpQQ8KNtfoj DsW4B3O35tWka4XiZaTGZoFe3bWgP+VGGY7W/fAyRUXQIOa5xBI0LIbrbqtyk+nNxw1l AvBP/oqrYO6Ow8hoJHyG3KJn+n77e1F3nNvt8JwO5tebmsvBByV7qIBEfo0CfQVCRa25 7NCrfZeTR1SGhRGXpuzoDZPTiedpbn0n2K00jFPJFUUbWSAkO4XgeIM4OO7NTweZpbQG EHrW75fK+VixahnqaOLFoQlFd4ZTAJdpMwUpXd4rSlbwlmxBEZwuy3yXjme/8IOMAaK0 7T+w== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d12-20020a50cd4c000000b0046c77f0b6bcsi1450794edj.562.2022.12.09.09.17.57; Fri, 09 Dec 2022 09:18:20 -0800 (PST) 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; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229971AbiLIRQj (ORCPT <rfc822;sophiezhao968@gmail.com> + 99 others); Fri, 9 Dec 2022 12:16:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229952AbiLIRQe (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 9 Dec 2022 12:16:34 -0500 Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF58B45EE4; Fri, 9 Dec 2022 09:16:27 -0800 (PST) Received: by mail-oi1-f171.google.com with SMTP id k189so5094521oif.7; Fri, 09 Dec 2022 09:16:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=eN7a2U3mP8Yzw7PGpnN4K9XOjRgKV4cZBsjjvOGf8hc=; b=qby6yrnonrMtj53Z0laDgk7BPazKLYuo3rN3QkhGDltRUv+tPYOy6mcgNOEnpOzl7w EBW7PCu8UXIKzAQ7nLfHHail4uE88Snc8Tcd/CPHPOYSDKfVacV9akjVGvb/1WAB2+sd N9xaWkjoohs03p2bnnD1gTxeS5TOscuaisyvnyi+ZoUqdF8oXNF9HfpI4it2ympNZdF7 vChBjTIYNfaQSmXePB+o3K5XRO6noNDdCs0m3Sr1h1YbykDdGebvUI6ACUusjw1L8mAE mQkSVzth/OZBybUbJZsHufBVhFoKhkCZjyC/lD7OxbS0p6Bv0PIdou9WDGCoiAxU97jV Vevg== X-Gm-Message-State: ANoB5pmNvHYagB2m4xEvjEo19h0JlvoRjqLcpox2hf77VccpynJY8O12 v9UQBTzov8dy5fO+fz3tEg== X-Received: by 2002:aca:d745:0:b0:35a:d192:9a53 with SMTP id o66-20020acad745000000b0035ad1929a53mr2562546oig.41.1670606186740; Fri, 09 Dec 2022 09:16:26 -0800 (PST) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id v19-20020a056808005300b00359ad661d3csm703986oic.30.2022.12.09.09.16.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Dec 2022 09:16:26 -0800 (PST) Received: (nullmailer pid 3351352 invoked by uid 1000); Fri, 09 Dec 2022 17:16:25 -0000 From: Rob Herring <robh@kernel.org> To: Ulf Hansson <ulf.hansson@linaro.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Vincent Yang <Vincent.Yang@tw.fujitsu.com> Cc: Ard Biesheuvel <ardb@kernel.org>, Ilias Apalodimas <ilias.apalodimas@linaro.org>, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] dt-bindings: mmc: Convert Fujitsu SDHCI to DT schema Date: Fri, 9 Dec 2022 11:16:21 -0600 Message-Id: <20221209171621.3351220-1-robh@kernel.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS autolearn=no 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751757672442435234?= X-GMAIL-MSGID: =?utf-8?q?1751757672442435234?= |
Series |
dt-bindings: mmc: Convert Fujitsu SDHCI to DT schema
|
|
Commit Message
Rob Herring
Dec. 9, 2022, 5:16 p.m. UTC
Convert the Fujitsu SDHCI binding to DT schema format.
The interrupts were not documented. The driver only uses the first
interrupt, but the DT and example have 2 interrupts. The 2nd one is
unknown. "dma-coherent" was also not documented, but is used.
The "socionext,synquacer-sdhci" compatible was not documented, but it is
compatible with "fujitsu,mb86s70-sdhci-3.0.yaml" and is in use (in
u-boot Synquacer dts).
Signed-off-by: Rob Herring <robh@kernel.org>
---
.../mmc/fujitsu,mb86s70-sdhci-3.0.yaml | 67 +++++++++++++++++++
.../devicetree/bindings/mmc/sdhci-fujitsu.txt | 32 ---------
2 files changed, 67 insertions(+), 32 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml
delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt
Comments
On Fri, Dec 9, 2022 at 11:16 AM Rob Herring <robh@kernel.org> wrote: > > Convert the Fujitsu SDHCI binding to DT schema format. > > The interrupts were not documented. The driver only uses the first > interrupt, but the DT and example have 2 interrupts. The 2nd one is > unknown. "dma-coherent" was also not documented, but is used. > > The "socionext,synquacer-sdhci" compatible was not documented, but it is > compatible with "fujitsu,mb86s70-sdhci-3.0.yaml" and is in use (in > u-boot Synquacer dts). > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > .../mmc/fujitsu,mb86s70-sdhci-3.0.yaml | 67 +++++++++++++++++++ > .../devicetree/bindings/mmc/sdhci-fujitsu.txt | 32 --------- > 2 files changed, 67 insertions(+), 32 deletions(-) > create mode 100644 Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml > delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt > > diff --git a/Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml b/Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml > new file mode 100644 > index 000000000000..0218a6ce4b2f > --- /dev/null > +++ b/Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml > @@ -0,0 +1,67 @@ > +# SPDX-License-Identifier: GPL-2.0-only > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/mmc/fujitsu,mb86s70-sdhci-3.0.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Fujitsu SDHCI controller > + > +maintainers: > + - Vincent Yang <Vincent.Yang@tw.fujitsu.com> Bounces. Any other volunteers? > + > +allOf: > + - $ref: mmc-controller.yaml# > + > +properties: > + compatible: > + oneOf: > + - items: > + - const: socionext,synquacer-sdhci > + - const: fujitsu,mb86s70-sdhci-3.0 > + - const: fujitsu,mb86s70-sdhci-3.0 > + > + reg: > + maxItems: 1 > + > + clocks: > + items: > + - description: Core clock > + - description: Interface clock > + > + clock-names: > + items: > + - const: core > + - const: iface > + > + dma-coherent: true > + > + interrupts: > + maxItems: 2 > + > + fujitsu,cmd-dat-delay-select: > + type: boolean > + description: Indicating that the host requires the CMD_DAT_DELAY control > + to be enabled. > + > +required: > + - compatible > + - reg > + - clocks > + - clock-names > + - interrupts > + > +unevaluatedProperties: false > + > +examples: > + - | > + mmc@36600000 { > + compatible = "fujitsu,mb86s70-sdhci-3.0"; > + reg = <0x36600000 0x1000>; > + interrupts = <0 172 0x4>, > + <0 173 0x4>; > + bus-width = <4>; > + vqmmc-supply = <&vccq_sdhci1>; > + clocks = <&clock 2 2 0>, <&clock 2 3 0>; > + clock-names = "core", "iface"; > + }; > +... > diff --git a/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt b/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt > deleted file mode 100644 > index 3ee9263adf73..000000000000 > --- a/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt > +++ /dev/null > @@ -1,32 +0,0 @@ > -* Fujitsu SDHCI controller > - > -This file documents differences between the core properties in mmc.txt > -and the properties used by the sdhci_f_sdh30 driver. > - > -Required properties: > -- compatible: "fujitsu,mb86s70-sdhci-3.0" > -- clocks: Must contain an entry for each entry in clock-names. It is a > - list of phandles and clock-specifier pairs. > - See ../clocks/clock-bindings.txt for details. > -- clock-names: Should contain the following two entries: > - "iface" - clock used for sdhci interface > - "core" - core clock for sdhci controller > - > -Optional properties: > -- vqmmc-supply: phandle to the regulator device tree node, mentioned > - as the VCCQ/VDD_IO supply in the eMMC/SD specs. > -- fujitsu,cmd-dat-delay-select: boolean property indicating that this host > - requires the CMD_DAT_DELAY control to be enabled. > - > -Example: > - > - sdhci1: mmc@36600000 { > - compatible = "fujitsu,mb86s70-sdhci-3.0"; > - reg = <0 0x36600000 0x1000>; > - interrupts = <0 172 0x4>, > - <0 173 0x4>; > - bus-width = <4>; > - vqmmc-supply = <&vccq_sdhci1>; > - clocks = <&clock 2 2 0>, <&clock 2 3 0>; > - clock-names = "iface", "core"; > - }; > -- > 2.35.1 >
cc Jassi and Masahisa On Fri, 9 Dec 2022 at 19:42, Rob Herring <robh@kernel.org> wrote: > > On Fri, Dec 9, 2022 at 11:16 AM Rob Herring <robh@kernel.org> wrote: > > > > Convert the Fujitsu SDHCI binding to DT schema format. > > > > The interrupts were not documented. The driver only uses the first > > interrupt, but the DT and example have 2 interrupts. The 2nd one is > > unknown. "dma-coherent" was also not documented, but is used. > > > > The "socionext,synquacer-sdhci" compatible was not documented, but it is > > compatible with "fujitsu,mb86s70-sdhci-3.0.yaml" and is in use (in > > u-boot Synquacer dts). > > > > Signed-off-by: Rob Herring <robh@kernel.org> > > --- > > .../mmc/fujitsu,mb86s70-sdhci-3.0.yaml | 67 +++++++++++++++++++ > > .../devicetree/bindings/mmc/sdhci-fujitsu.txt | 32 --------- > > 2 files changed, 67 insertions(+), 32 deletions(-) > > create mode 100644 Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml > > delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt > > > > diff --git a/Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml b/Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml > > new file mode 100644 > > index 000000000000..0218a6ce4b2f > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml > > @@ -0,0 +1,67 @@ > > +# SPDX-License-Identifier: GPL-2.0-only > > +%YAML 1.2 > > +--- > > +$id: http://devicetree.org/schemas/mmc/fujitsu,mb86s70-sdhci-3.0.yaml# > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > + > > +title: Fujitsu SDHCI controller > > + > > +maintainers: > > + - Vincent Yang <Vincent.Yang@tw.fujitsu.com> > > Bounces. Any other volunteers? > > > + > > +allOf: > > + - $ref: mmc-controller.yaml# > > + > > +properties: > > + compatible: > > + oneOf: > > + - items: > > + - const: socionext,synquacer-sdhci > > + - const: fujitsu,mb86s70-sdhci-3.0 > > + - const: fujitsu,mb86s70-sdhci-3.0 > > + > > + reg: > > + maxItems: 1 > > + > > + clocks: > > + items: > > + - description: Core clock > > + - description: Interface clock > > + > > + clock-names: > > + items: > > + - const: core > > + - const: iface > > + > > + dma-coherent: true > > + > > + interrupts: > > + maxItems: 2 > > + > > + fujitsu,cmd-dat-delay-select: > > + type: boolean > > + description: Indicating that the host requires the CMD_DAT_DELAY control > > + to be enabled. > > + > > +required: > > + - compatible > > + - reg > > + - clocks > > + - clock-names > > + - interrupts > > + > > +unevaluatedProperties: false > > + > > +examples: > > + - | > > + mmc@36600000 { > > + compatible = "fujitsu,mb86s70-sdhci-3.0"; > > + reg = <0x36600000 0x1000>; > > + interrupts = <0 172 0x4>, > > + <0 173 0x4>; > > + bus-width = <4>; > > + vqmmc-supply = <&vccq_sdhci1>; > > + clocks = <&clock 2 2 0>, <&clock 2 3 0>; > > + clock-names = "core", "iface"; > > + }; > > +... > > diff --git a/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt b/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt > > deleted file mode 100644 > > index 3ee9263adf73..000000000000 > > --- a/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt > > +++ /dev/null > > @@ -1,32 +0,0 @@ > > -* Fujitsu SDHCI controller > > - > > -This file documents differences between the core properties in mmc.txt > > -and the properties used by the sdhci_f_sdh30 driver. > > - > > -Required properties: > > -- compatible: "fujitsu,mb86s70-sdhci-3.0" > > -- clocks: Must contain an entry for each entry in clock-names. It is a > > - list of phandles and clock-specifier pairs. > > - See ../clocks/clock-bindings.txt for details. > > -- clock-names: Should contain the following two entries: > > - "iface" - clock used for sdhci interface > > - "core" - core clock for sdhci controller > > - > > -Optional properties: > > -- vqmmc-supply: phandle to the regulator device tree node, mentioned > > - as the VCCQ/VDD_IO supply in the eMMC/SD specs. > > -- fujitsu,cmd-dat-delay-select: boolean property indicating that this host > > - requires the CMD_DAT_DELAY control to be enabled. > > - > > -Example: > > - > > - sdhci1: mmc@36600000 { > > - compatible = "fujitsu,mb86s70-sdhci-3.0"; > > - reg = <0 0x36600000 0x1000>; > > - interrupts = <0 172 0x4>, > > - <0 173 0x4>; > > - bus-width = <4>; > > - vqmmc-supply = <&vccq_sdhci1>; > > - clocks = <&clock 2 2 0>, <&clock 2 3 0>; > > - clock-names = "iface", "core"; > > - }; > > -- > > 2.35.1 > >
Hi Rob, On 2022/12/10 3:44, Ard Biesheuvel wrote: > cc Jassi and Masahisa > > On Fri, 9 Dec 2022 at 19:42, Rob Herring <robh@kernel.org> wrote: >> >> On Fri, Dec 9, 2022 at 11:16 AM Rob Herring <robh@kernel.org> wrote: >>> >>> Convert the Fujitsu SDHCI binding to DT schema format. >>> >>> The interrupts were not documented. The driver only uses the first >>> interrupt, but the DT and example have 2 interrupts. The 2nd one is >>> unknown. "dma-coherent" was also not documented, but is used. >>> >>> The "socionext,synquacer-sdhci" compatible was not documented, but it is >>> compatible with "fujitsu,mb86s70-sdhci-3.0.yaml" and is in use (in >>> u-boot Synquacer dts). >>> >>> Signed-off-by: Rob Herring <robh@kernel.org> >>> --- >>> .../mmc/fujitsu,mb86s70-sdhci-3.0.yaml | 67 +++++++++++++++++++ >>> .../devicetree/bindings/mmc/sdhci-fujitsu.txt | 32 --------- >>> 2 files changed, 67 insertions(+), 32 deletions(-) >>> create mode 100644 Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml >>> delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt >>> >>> diff --git a/Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml b/Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml >>> new file mode 100644 >>> index 000000000000..0218a6ce4b2f >>> --- /dev/null >>> +++ b/Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml >>> @@ -0,0 +1,67 @@ >>> +# SPDX-License-Identifier: GPL-2.0-only >>> +%YAML 1.2 >>> +--- >>> +$id: http://devicetree.org/schemas/mmc/fujitsu,mb86s70-sdhci-3.0.yaml# >>> +$schema: http://devicetree.org/meta-schemas/core.yaml# >>> + >>> +title: Fujitsu SDHCI controller >>> + >>> +maintainers: >>> + - Vincent Yang <Vincent.Yang@tw.fujitsu.com> >> >> Bounces. Any other volunteers? >> >>> + >>> +allOf: >>> + - $ref: mmc-controller.yaml# >>> + >>> +properties: >>> + compatible: >>> + oneOf: >>> + - items: >>> + - const: socionext,synquacer-sdhci >>> + - const: fujitsu,mb86s70-sdhci-3.0 >>> + - const: fujitsu,mb86s70-sdhci-3.0 >>> + >>> + reg: >>> + maxItems: 1 >>> + >>> + clocks: >>> + items: >>> + - description: Core clock >>> + - description: Interface clock >>> + >>> + clock-names: >>> + items: >>> + - const: core >>> + - const: iface >>> + >>> + dma-coherent: true >>> + >>> + interrupts: >>> + maxItems: 2 >>> + >>> + fujitsu,cmd-dat-delay-select: >>> + type: boolean >>> + description: Indicating that the host requires the CMD_DAT_DELAY control >>> + to be enabled. >>> + >>> +required: >>> + - compatible >>> + - reg >>> + - clocks >>> + - clock-names >>> + - interrupts >>> + >>> +unevaluatedProperties: false >>> + >>> +examples: >>> + - | >>> + mmc@36600000 { >>> + compatible = "fujitsu,mb86s70-sdhci-3.0"; >>> + reg = <0x36600000 0x1000>; >>> + interrupts = <0 172 0x4>, >>> + <0 173 0x4>; >>> + bus-width = <4>; >>> + vqmmc-supply = <&vccq_sdhci1>; >>> + clocks = <&clock 2 2 0>, <&clock 2 3 0>; >>> + clock-names = "core", "iface"; >>> + }; >>> +... >>> diff --git a/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt b/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt >>> deleted file mode 100644 >>> index 3ee9263adf73..000000000000 >>> --- a/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt >>> +++ /dev/null >>> @@ -1,32 +0,0 @@ >>> -* Fujitsu SDHCI controller >>> - >>> -This file documents differences between the core properties in mmc.txt >>> -and the properties used by the sdhci_f_sdh30 driver. >>> - >>> -Required properties: >>> -- compatible: "fujitsu,mb86s70-sdhci-3.0" >>> -- clocks: Must contain an entry for each entry in clock-names. It is a >>> - list of phandles and clock-specifier pairs. >>> - See ../clocks/clock-bindings.txt for details. >>> -- clock-names: Should contain the following two entries: >>> - "iface" - clock used for sdhci interface >>> - "core" - core clock for sdhci controller >>> - >>> -Optional properties: >>> -- vqmmc-supply: phandle to the regulator device tree node, mentioned >>> - as the VCCQ/VDD_IO supply in the eMMC/SD specs. >>> -- fujitsu,cmd-dat-delay-select: boolean property indicating that this host >>> - requires the CMD_DAT_DELAY control to be enabled. >>> - >>> -Example: >>> - >>> - sdhci1: mmc@36600000 { >>> - compatible = "fujitsu,mb86s70-sdhci-3.0"; >>> - reg = <0 0x36600000 0x1000>; >>> - interrupts = <0 172 0x4>, >>> - <0 173 0x4>; >>> - bus-width = <4>; >>> - vqmmc-supply = <&vccq_sdhci1>; >>> - clocks = <&clock 2 2 0>, <&clock 2 3 0>; >>> - clock-names = "iface", "core"; >>> - }; >>> -- >>> 2.35.1 >>> I converted this dt-bindings as follows. - [PATCH v2 1/6] dt-bindings: mmc: Convert sdhci-fujitsu to JSON schema https://marc.info/?l=linux-mmc&m=166815383930945 - [PATCH v2 3/6] dt-bindings: sdhci-fujitsu: Add compatible string for F_SDH30_E51 https://marc.info/?l=linux-mmc&m=166815384730959 And this series has already merged by Ulf. https://marc.info/?l=linux-mmc&m=166861511322498 Could you check it and update some diffs? Thank you, --- Best Regards Kunihiko Hayashi
Hi Rob, On 2022/12/10 3:44, Ard Biesheuvel wrote: > cc Jassi and Masahisa > > On Fri, 9 Dec 2022 at 19:42, Rob Herring <robh@kernel.org> wrote: >> >> On Fri, Dec 9, 2022 at 11:16 AM Rob Herring <robh@kernel.org> wrote: >>> >>> Convert the Fujitsu SDHCI binding to DT schema format. >>> >>> The interrupts were not documented. The driver only uses the first >>> interrupt, but the DT and example have 2 interrupts. The 2nd one is >>> unknown. "dma-coherent" was also not documented, but is used. >>> >>> The "socionext,synquacer-sdhci" compatible was not documented, but it is >>> compatible with "fujitsu,mb86s70-sdhci-3.0.yaml" and is in use (in >>> u-boot Synquacer dts). >>> >>> Signed-off-by: Rob Herring <robh@kernel.org> >>> --- >>> .../mmc/fujitsu,mb86s70-sdhci-3.0.yaml | 67 +++++++++++++++++++ >>> .../devicetree/bindings/mmc/sdhci-fujitsu.txt | 32 --------- >>> 2 files changed, 67 insertions(+), 32 deletions(-) >>> create mode 100644 Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml >>> delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt >>> >>> diff --git a/Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml b/Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml >>> new file mode 100644 >>> index 000000000000..0218a6ce4b2f >>> --- /dev/null >>> +++ b/Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml >>> @@ -0,0 +1,67 @@ >>> +# SPDX-License-Identifier: GPL-2.0-only >>> +%YAML 1.2 >>> +--- >>> +$id: http://devicetree.org/schemas/mmc/fujitsu,mb86s70-sdhci-3.0.yaml# >>> +$schema: http://devicetree.org/meta-schemas/core.yaml# >>> + >>> +title: Fujitsu SDHCI controller >>> + >>> +maintainers: >>> + - Vincent Yang <Vincent.Yang@tw.fujitsu.com> >> >> Bounces. Any other volunteers? >> >>> + >>> +allOf: >>> + - $ref: mmc-controller.yaml# >>> + >>> +properties: >>> + compatible: >>> + oneOf: >>> + - items: >>> + - const: socionext,synquacer-sdhci >>> + - const: fujitsu,mb86s70-sdhci-3.0 >>> + - const: fujitsu,mb86s70-sdhci-3.0 >>> + >>> + reg: >>> + maxItems: 1 >>> + >>> + clocks: >>> + items: >>> + - description: Core clock >>> + - description: Interface clock >>> + >>> + clock-names: >>> + items: >>> + - const: core >>> + - const: iface >>> + >>> + dma-coherent: true >>> + >>> + interrupts: >>> + maxItems: 2 >>> + >>> + fujitsu,cmd-dat-delay-select: >>> + type: boolean >>> + description: Indicating that the host requires the CMD_DAT_DELAY control >>> + to be enabled. >>> + >>> +required: >>> + - compatible >>> + - reg >>> + - clocks >>> + - clock-names >>> + - interrupts >>> + >>> +unevaluatedProperties: false >>> + >>> +examples: >>> + - | >>> + mmc@36600000 { >>> + compatible = "fujitsu,mb86s70-sdhci-3.0"; >>> + reg = <0x36600000 0x1000>; >>> + interrupts = <0 172 0x4>, >>> + <0 173 0x4>; >>> + bus-width = <4>; >>> + vqmmc-supply = <&vccq_sdhci1>; >>> + clocks = <&clock 2 2 0>, <&clock 2 3 0>; >>> + clock-names = "core", "iface"; >>> + }; >>> +... >>> diff --git a/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt b/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt >>> deleted file mode 100644 >>> index 3ee9263adf73..000000000000 >>> --- a/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt >>> +++ /dev/null >>> @@ -1,32 +0,0 @@ >>> -* Fujitsu SDHCI controller >>> - >>> -This file documents differences between the core properties in mmc.txt >>> -and the properties used by the sdhci_f_sdh30 driver. >>> - >>> -Required properties: >>> -- compatible: "fujitsu,mb86s70-sdhci-3.0" >>> -- clocks: Must contain an entry for each entry in clock-names. It is a >>> - list of phandles and clock-specifier pairs. >>> - See ../clocks/clock-bindings.txt for details. >>> -- clock-names: Should contain the following two entries: >>> - "iface" - clock used for sdhci interface >>> - "core" - core clock for sdhci controller >>> - >>> -Optional properties: >>> -- vqmmc-supply: phandle to the regulator device tree node, mentioned >>> - as the VCCQ/VDD_IO supply in the eMMC/SD specs. >>> -- fujitsu,cmd-dat-delay-select: boolean property indicating that this host >>> - requires the CMD_DAT_DELAY control to be enabled. >>> - >>> -Example: >>> - >>> - sdhci1: mmc@36600000 { >>> - compatible = "fujitsu,mb86s70-sdhci-3.0"; >>> - reg = <0 0x36600000 0x1000>; >>> - interrupts = <0 172 0x4>, >>> - <0 173 0x4>; >>> - bus-width = <4>; >>> - vqmmc-supply = <&vccq_sdhci1>; >>> - clocks = <&clock 2 2 0>, <&clock 2 3 0>; >>> - clock-names = "iface", "core"; >>> - }; >>> -- >>> 2.35.1 >>> I converted this dt-bindings as follows. - [PATCH v2 1/6] dt-bindings: mmc: Convert sdhci-fujitsu to JSON schema https://marc.info/?l=linux-mmc&m=166815383930945 - [PATCH v2 3/6] dt-bindings: sdhci-fujitsu: Add compatible string for F_SDH30_E51 https://marc.info/?l=linux-mmc&m=166815384730959 And this series has already merged by Ulf. https://marc.info/?l=linux-mmc&m=166861511322498 Could you check it and update some diffs? Thank you, --- Best Regards Kunihiko Hayashi
diff --git a/Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml b/Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml new file mode 100644 index 000000000000..0218a6ce4b2f --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/fujitsu,mb86s70-sdhci-3.0.yaml @@ -0,0 +1,67 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mmc/fujitsu,mb86s70-sdhci-3.0.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Fujitsu SDHCI controller + +maintainers: + - Vincent Yang <Vincent.Yang@tw.fujitsu.com> + +allOf: + - $ref: mmc-controller.yaml# + +properties: + compatible: + oneOf: + - items: + - const: socionext,synquacer-sdhci + - const: fujitsu,mb86s70-sdhci-3.0 + - const: fujitsu,mb86s70-sdhci-3.0 + + reg: + maxItems: 1 + + clocks: + items: + - description: Core clock + - description: Interface clock + + clock-names: + items: + - const: core + - const: iface + + dma-coherent: true + + interrupts: + maxItems: 2 + + fujitsu,cmd-dat-delay-select: + type: boolean + description: Indicating that the host requires the CMD_DAT_DELAY control + to be enabled. + +required: + - compatible + - reg + - clocks + - clock-names + - interrupts + +unevaluatedProperties: false + +examples: + - | + mmc@36600000 { + compatible = "fujitsu,mb86s70-sdhci-3.0"; + reg = <0x36600000 0x1000>; + interrupts = <0 172 0x4>, + <0 173 0x4>; + bus-width = <4>; + vqmmc-supply = <&vccq_sdhci1>; + clocks = <&clock 2 2 0>, <&clock 2 3 0>; + clock-names = "core", "iface"; + }; +... diff --git a/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt b/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt deleted file mode 100644 index 3ee9263adf73..000000000000 --- a/Documentation/devicetree/bindings/mmc/sdhci-fujitsu.txt +++ /dev/null @@ -1,32 +0,0 @@ -* Fujitsu SDHCI controller - -This file documents differences between the core properties in mmc.txt -and the properties used by the sdhci_f_sdh30 driver. - -Required properties: -- compatible: "fujitsu,mb86s70-sdhci-3.0" -- clocks: Must contain an entry for each entry in clock-names. It is a - list of phandles and clock-specifier pairs. - See ../clocks/clock-bindings.txt for details. -- clock-names: Should contain the following two entries: - "iface" - clock used for sdhci interface - "core" - core clock for sdhci controller - -Optional properties: -- vqmmc-supply: phandle to the regulator device tree node, mentioned - as the VCCQ/VDD_IO supply in the eMMC/SD specs. -- fujitsu,cmd-dat-delay-select: boolean property indicating that this host - requires the CMD_DAT_DELAY control to be enabled. - -Example: - - sdhci1: mmc@36600000 { - compatible = "fujitsu,mb86s70-sdhci-3.0"; - reg = <0 0x36600000 0x1000>; - interrupts = <0 172 0x4>, - <0 173 0x4>; - bus-width = <4>; - vqmmc-supply = <&vccq_sdhci1>; - clocks = <&clock 2 2 0>, <&clock 2 3 0>; - clock-names = "iface", "core"; - };