From patchwork Sun Dec 4 09:47:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 630909 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1076C4708D for ; Sun, 4 Dec 2022 09:47:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230025AbiLDJrc (ORCPT ); Sun, 4 Dec 2022 04:47:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230032AbiLDJrb (ORCPT ); Sun, 4 Dec 2022 04:47:31 -0500 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A343186C5 for ; Sun, 4 Dec 2022 01:47:29 -0800 (PST) Received: by mail-lf1-x12d.google.com with SMTP id b3so14194664lfv.2 for ; Sun, 04 Dec 2022 01:47:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2EgtMAreZX6v1a607duaaNtdR2Ho0lCLyBFIAD2u3Bg=; b=UWp5jxo5SgZmhR0ShSmbaFj2r/WTYvATnZCcb7Y1/Z8uIpW/2lS9xmd8kKm1Amh3r0 SxbkFRMragD1BtlHGxx9EE1jOkLTJpdPyZVkEeCmuf/lna+QNz7teiHwXzcLr2C8TN1X He16v951Ffc6greL0gE0+xyxeOf27PkSE+u2iExhp+PVEBMsi0l+U5DukPYjVxhxRSlI ZsZTLazwK2iceFkYAGlt8LQNcwijhJa1ZmuGvNdFwwtwgGnhoYwvlIYFBdQcRUt8uKrs snrLHZvchdcWFOVEB82bx3MNaGN4fAIjSYzESwO0D45AW81gxMudu1AO/Qujy498EyKT radw== 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=2EgtMAreZX6v1a607duaaNtdR2Ho0lCLyBFIAD2u3Bg=; b=k3SguhLnMfJ5HeExrzJdzwG9XUfTWGllD/yfIAMueLVcdjc1sUxJseXj7cMtokFnV9 hIVLTdngYbCo0jQ5052IWxnImLiRta5B6zlnPRu7xSKt1Rm9hOQKQUUykIE0/MbYG2tJ 603HvISuIyc4Wvzt/cEigOEciLbx5l9k1C8dusBPRjRQnV4/WNWQljNyjpKp8TJ5nyN3 csVrDhvQh7yErbJwqoOVICnuIPl3bYsxHsfqrVYgoZEZ+CG+NP0JC2+ozRYO+zXKgXuM 206HYas3SuF09W5l8VFf1oEKtHsdBs7u5FGi5qwAwnPX4f8ECQ0LD/Q+hIayWNlMLMuR Qnmg== X-Gm-Message-State: ANoB5pn4N7PnY6+tm9fq00iuN5dNSU1nBLbZ/NSAFicpPY+ilbSuGkto cWi9if2MClZOFv51lkxRAg9Zig== X-Google-Smtp-Source: AA0mqf4W++yII+JEJwHg1ZSnJBcLnVCaLxtGiBo9TVPZxhyKrxyFYE9NY5p/RQ+ELRJQi3lL/QqSWg== X-Received: by 2002:a05:6512:1515:b0:4b5:5785:625c with SMTP id bq21-20020a056512151500b004b55785625cmr2429989lfb.361.1670147247643; Sun, 04 Dec 2022 01:47:27 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id e18-20020a056512091200b00498f00420e9sm1706703lft.194.2022.12.04.01.47.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 01:47:27 -0800 (PST) From: Krzysztof Kozlowski To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Adrian Hunter , Bhupesh Sharma , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Bjorn Andersson , Konrad Dybcio , abel.vesa@linaro.org, Johan Hovold , Krzysztof Kozlowski Subject: [PATCH 1/5] dt-bindings: mmc: sdhci: document sdhci-caps and sdhci-caps-mask Date: Sun, 4 Dec 2022 10:47:13 +0100 Message-Id: <20221204094717.74016-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The Linux SDHCI driver core reads 'sdhci-caps' and 'sdhci-caps-mask' properties and few devices already use it (e.g. Qualcomm SM8450), so add them to a shared SDHCI bindings. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring Reviewed-by: Rob Herring --- .../devicetree/bindings/mmc/sdhci-am654.yaml | 4 +-- .../devicetree/bindings/mmc/sdhci-common.yaml | 32 +++++++++++++++++++ .../devicetree/bindings/mmc/sdhci-msm.yaml | 2 +- MAINTAINERS | 1 + 4 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-common.yaml diff --git a/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml b/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml index 382d5face49a..c4c73ee1422c 100644 --- a/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml +++ b/Documentation/devicetree/bindings/mmc/sdhci-am654.yaml @@ -11,7 +11,7 @@ maintainers: - Ulf Hansson allOf: - - $ref: mmc-controller.yaml# + - $ref: sdhci-common.yaml# properties: compatible: @@ -49,8 +49,6 @@ properties: - const: clk_ahb - const: clk_xin - sdhci-caps-mask: true - dma-coherent: type: boolean diff --git a/Documentation/devicetree/bindings/mmc/sdhci-common.yaml b/Documentation/devicetree/bindings/mmc/sdhci-common.yaml new file mode 100644 index 000000000000..1664615187c8 --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/sdhci-common.yaml @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mmc/sdhci-common.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: SDHCI Controller Common Properties + +maintainers: + - Adrian Hunter + +description: + Common properties present on Secure Digital Host Controller Interface (SDHCI) + devices. + +properties: + sdhci-caps: + $ref: /schemas/types.yaml#/definitions/uint64 + description: + Additionally present SDHCI capabilities - values for SDHCI_CAPABILITIES + and SDHCI_CAPABILITIES_1 registers. + + sdhci-caps-mask: + $ref: /schemas/types.yaml#/definitions/uint64 + description: + Masked SDHCI capabilities to remove from SDHCI_CAPABILITIES and + SDHCI_CAPABILITIES_1 registers. + +allOf: + - $ref: mmc-controller.yaml# + +additionalProperties: true diff --git a/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml b/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml index fade797af150..2736c9a79f65 100644 --- a/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml +++ b/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml @@ -169,7 +169,7 @@ required: - interrupts allOf: - - $ref: mmc-controller.yaml# + - $ref: sdhci-common.yaml# - if: properties: diff --git a/MAINTAINERS b/MAINTAINERS index 3583c5f6889d..be71999cea73 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18732,6 +18732,7 @@ SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER M: Adrian Hunter L: linux-mmc@vger.kernel.org S: Supported +F: Documentation/devicetree/bindings/mmc/sdhci-common.yaml F: drivers/mmc/host/sdhci* SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER From patchwork Sun Dec 4 09:47:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 630908 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5AF07C47090 for ; Sun, 4 Dec 2022 09:47:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230092AbiLDJrj (ORCPT ); Sun, 4 Dec 2022 04:47:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230094AbiLDJrg (ORCPT ); Sun, 4 Dec 2022 04:47:36 -0500 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F883186F2 for ; Sun, 4 Dec 2022 01:47:31 -0800 (PST) Received: by mail-lf1-x12f.google.com with SMTP id 1so574746lfz.4 for ; Sun, 04 Dec 2022 01:47:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=srKBWWOhJxYyjQwFZkBs/XLc9rLtWfdgyHo2JMkH7Vk=; b=VFdR1I3gqvoJOg0RDy0RBE3NAkURp4Oxnx1mtTBCPMzIiwf798wsfSZFQwyzrlhQAT sVcF4zuOzTDKxXMDL3ydljMPQHXXDdQ3PIqZD/SQp4bZqC44gwiMjkVjxGXi0C+FD+uC MHyxEWbft5Sa+CT1qmG0o322ZeKZSf9hxJaQ9blkmYfwvtBT3shA+MbSMLQbdDDxi5Gf jBn2uvBq1SFLCUfFA5CX+gOXMB1ouYcCLpxMGn4JtEqQh+fOin8JOJj8zLUv124z5jxt rFe6vjshig4dNr446ocPcWHlvYURqm5bpcl983g8HRwWwdNcxd+hx4yOlnjsMRVf0sYo muuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=srKBWWOhJxYyjQwFZkBs/XLc9rLtWfdgyHo2JMkH7Vk=; b=gS8gdlSJ+8oCDNH7oVgEsaZt5N5JG6syr2yhddjk4b2TD0V0zH+3od86djr4DOgSx8 GgeNV1M6SNphEocorwduQ2f2z60XqzixPY2UQmu40CdA4nEhsXsCWkJjTe/PeA4Bk69P Ugo8KkUdyTXDTtNpLTRAzMpLUt5hdhnIa92Hosyb2iqWDW3IDvn10SeL/A1WHOAik6LF tkENkqysesscmtVUZwS+zG7vgG1elc5dCWXPZVmyVoLtdtnj8HOD3JFMwqzZu/Fe9kVg TKvvnQ1HHYMKbICG5QTnA8ic8T0SG97GK0mG2XESpatEnKQWXw8DfT7Wpgt0d5sZDZys de9A== X-Gm-Message-State: ANoB5pkB8ImxrpKyeGuewBWP74JSi3RDCoW3ZY/+8rAeD9nQKq20+KI0 q7HdZfV7W3njOQpURI7hexN9+A== X-Google-Smtp-Source: AA0mqf4lr/mGSjU8QsCMm+HChH3211vl5JOKt8EuaZDBBHJQjmbqjp3DrpMuS+qmcLkLrjWxQjk+4w== X-Received: by 2002:ac2:4f05:0:b0:497:aa48:8fe7 with SMTP id k5-20020ac24f05000000b00497aa488fe7mr29383228lfr.612.1670147249756; Sun, 04 Dec 2022 01:47:29 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id e18-20020a056512091200b00498f00420e9sm1706703lft.194.2022.12.04.01.47.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 01:47:29 -0800 (PST) From: Krzysztof Kozlowski To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Adrian Hunter , Bhupesh Sharma , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Bjorn Andersson , Konrad Dybcio , abel.vesa@linaro.org, Johan Hovold , Krzysztof Kozlowski Subject: [PATCH 3/5] dt-bindings: mmc: sdhci-msm: cleanup style Date: Sun, 4 Dec 2022 10:47:15 +0100 Message-Id: <20221204094717.74016-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221204094717.74016-1-krzysztof.kozlowski@linaro.org> References: <20221204094717.74016-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Drop unnecessary quotes from $ref. Signed-off-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/mmc/sdhci-msm.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml b/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml index 2736c9a79f65..9e7c0e3803c6 100644 --- a/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml +++ b/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml @@ -1,9 +1,8 @@ # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) - %YAML 1.2 --- -$id: "http://devicetree.org/schemas/mmc/sdhci-msm.yaml#" -$schema: "http://devicetree.org/meta-schemas/core.yaml#" +$id: http://devicetree.org/schemas/mmc/sdhci-msm.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# title: Qualcomm SDHCI controller (sdhci-msm) From patchwork Sun Dec 4 09:47:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 630907 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A92DC4708D for ; Sun, 4 Dec 2022 09:47:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230101AbiLDJrv (ORCPT ); Sun, 4 Dec 2022 04:47:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230096AbiLDJrj (ORCPT ); Sun, 4 Dec 2022 04:47:39 -0500 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F3DC389 for ; Sun, 4 Dec 2022 01:47:33 -0800 (PST) Received: by mail-lf1-x12b.google.com with SMTP id b13so3257772lfo.3 for ; Sun, 04 Dec 2022 01:47:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HV9iDq9ASawaJ80Vnkd4V2c06IYqg91+S5dBHxjopKQ=; b=Ywq8JTIppvGS+u73xDuB2V1FMFl9uieH9iGsVs28JoExEMBFJRczI3+P86bLxbCzE8 1aEy646UPgd2Af8q09vFWDK+vbEWz478Sv6T21j93UhiqDsFsIc5o+3VkgP1SzSyoy++ 3/SKzQl2i12sDhxT9eWoPrRbmhD11ABYZQA3dCwC9qkEETnI1VG739LObJQvmgNy+6oF pCkeNNF71XO/BPFx3NapEsof0aCLPfeOx4PXiCSArGNwD99ODDQAt08kW2PinqtZ3Sit npa0cK3x+3NSGnzrjgIa+NLTNf4/domrz0P4dODoSnRdmczWxgZQxC3eD5k7qwrL/lSf Tv0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HV9iDq9ASawaJ80Vnkd4V2c06IYqg91+S5dBHxjopKQ=; b=jKyChFcruzXzNrn9KYxat9tzcE1RnDk8WfiClNERqVgKrziZcMimVqi7uvLCvUeiiU mD3Cmr3rsR3BXpQ4SIpM2TrKpeCbn7GGuJdqo58neZdP8Ewu07HJ2E6Ss14ZQ9rLM4aK xlwMoCdg8NQ5q1oFbUUS3kOo4cXRA7AWoEpPJL4zURHqrEyXiOsyo46rOdYmLMJ+bzQ9 hfXXZiGBZ1nyc4jXdseNUHHDZjCu8A0XnChf7Ng2DSUJ0JbkOXn70WY3G/v2E5wgKPNY oxF8nbbX3jvzsG4wHYTWtA0FrmqkiUj3ttQnqRW0V2buH8R5FBqnIbbkXy9xMyuQZVsY Ujcg== X-Gm-Message-State: ANoB5pnIEYiK/xpitTjsw5RHLioWnr+xDJX4VpZAispzRmbJDazU5+oL WPGBxnpewtEV1rpXq2Gd/rngfA== X-Google-Smtp-Source: AA0mqf4NXpqkpNJWIOCVpnhjza3+x2Mh1nBOpGFv66z4tTQHVxxOKG6fb3yuxq20BEQywA/02mkD8g== X-Received: by 2002:a05:6512:3153:b0:4a2:da6:d969 with SMTP id s19-20020a056512315300b004a20da6d969mr23719756lfi.671.1670147251886; Sun, 04 Dec 2022 01:47:31 -0800 (PST) Received: from krzk-bin.NAT.warszawa.vectranet.pl (088156142067.dynamic-2-waw-k-3-2-0.vectranet.pl. [88.156.142.67]) by smtp.gmail.com with ESMTPSA id e18-20020a056512091200b00498f00420e9sm1706703lft.194.2022.12.04.01.47.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 01:47:31 -0800 (PST) From: Krzysztof Kozlowski To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Adrian Hunter , Bhupesh Sharma , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Bjorn Andersson , Konrad Dybcio , abel.vesa@linaro.org, Johan Hovold , Krzysztof Kozlowski Subject: [PATCH 5/5] dt-bindings: mmc: sdhci-msm: allow dma-coherent Date: Sun, 4 Dec 2022 10:47:17 +0100 Message-Id: <20221204094717.74016-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221204094717.74016-1-krzysztof.kozlowski@linaro.org> References: <20221204094717.74016-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org SM8350, SM8450 and SM8550 SDHCI controllers for SD card are marked with dma-coherent, so allow it. Signed-off-by: Krzysztof Kozlowski --- dma-coherent was first added to SM8450... then to SM8350 (not merged yet) and now it appeared in SM8550 patches, but I actually do not know if this is copy-paste or real need. --- Documentation/devicetree/bindings/mmc/sdhci-msm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml b/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml index 39e303468bc4..6b89238f0565 100644 --- a/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml +++ b/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml @@ -83,6 +83,8 @@ properties: - const: cal - const: sleep + dma-coherent: true + interrupts: maxItems: 2