From nobody Sun Apr 19 04:07:18 2026 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 5E50CC433EF for ; Thu, 7 Jul 2022 08:04:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235100AbiGGIEx (ORCPT ); Thu, 7 Jul 2022 04:04:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234922AbiGGIEo (ORCPT ); Thu, 7 Jul 2022 04:04:44 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E96E533379 for ; Thu, 7 Jul 2022 01:04:42 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id t24so29820083lfr.4 for ; Thu, 07 Jul 2022 01:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/f9p62fMS99xM7mHr2HHjGLpTbZceR2Zn1lLek1ud1w=; b=qcCCSCFt2Fd3xS6h0fNJd8tshWFUhAnilR0zaFXiYC+2gr9VkWb1raxklvKrDw6hlY dAPVWf/k1xdeharGHf7BNCouDaAdRErvrpC2wTWIp6eRyFwEw//K9DvEr9pXrm0eMM98 ajJNzpUIKBBSa0ITyfQfshw1WcAKt3vIi5Iax3LvgTHmzFgkdoxJKuUkFoeK4sIVaHo0 izNTxua9Yuk1XQBqYn8WrDw7bG2XIqfdtUZ/i4qew913Lmc2Jx2aOkPasA5aYuaylm4v 1mgTkBoxM9t1sI9y+fK8lLdFgxcZ25BvWviYXcOot4tFhtkMJRA14QfEYhmkmt0Pvvfz u1Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/f9p62fMS99xM7mHr2HHjGLpTbZceR2Zn1lLek1ud1w=; b=FuD2OZIxOg59PwUCgDz1jBtWaseaT2/oCwSfUadM8WTsOOx6lkYTYLGAu7jzXe4y5U 4V3VuelsCxsi+A+lWccnlNzLz/gLvqQftctNCfW2vQAxkuipdKGhziqHXVv0eOk0Hlpm CvjIh+Q/Jsk8wHaQ048eLUjI4Vw+a4V5enEvI7WwLMylmYw23S7qHmFs5/6pI3vsNz9H 3VVE6CIzVwYiRzbCLK9SFIMJEDNxgaXhKM1lNoLizuCAua5W/4SkrzW6FhPfdGszKB8R Tu/CPs40UPst3WgU3Bo2t+5CSMUNLhu7AWqmdMcXlgmzhhdfxC26Ok005lHW1ucFzNq3 qLVQ== X-Gm-Message-State: AJIora/Low9i1ws/zNYlXQObMz1sSUO2hJF6yr+QKfqsx+Gb/3wFMOAX UzWI5iZvpbGO1Zmg1XD1gPiMmg== X-Google-Smtp-Source: AGRyM1uyxLr6utQh6WzGkS/o4ElVNUkS91rxr9fiBUrexVoQfiiRTZ7YoxUejt5fjwk0KqBV2M5Tag== X-Received: by 2002:a05:6512:169f:b0:482:f605:c19c with SMTP id bu31-20020a056512169f00b00482f605c19cmr10449081lfb.592.1657181079425; Thu, 07 Jul 2022 01:04:39 -0700 (PDT) Received: from krzk-bin.home ([84.20.121.239]) by smtp.gmail.com with ESMTPSA id s6-20020a056512214600b0047b0f2d7650sm6697187lfr.271.2022.07.07.01.04.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 01:04:39 -0700 (PDT) From: Krzysztof Kozlowski To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Konrad Dybcio , Bhupesh Sharma , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: Douglas Anderson , Krzysztof Kozlowski Subject: [PATCH 1/5] dt-bindings: mmc: sdhci-msm: fix reg-names entries Date: Thu, 7 Jul 2022 09:51:47 +0200 Message-Id: <20220707075151.67335-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220707075151.67335-1-krzysztof.kozlowski@linaro.org> References: <20220707075151.67335-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Bindings before conversion to DT schema expected reg-names without "_mem" suffix. This was used by older DTS files and by the MSM SDHCI driver. Reported-by: Douglas Anderson Fixes: edfbf8c307ff ("dt-bindings: mmc: sdhci-msm: Fix issues in yaml bindi= ngs") Signed-off-by: Krzysztof Kozlowski Reviewed-by: Douglas Anderson --- .../devicetree/bindings/mmc/sdhci-msm.yaml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml b/Documen= tation/devicetree/bindings/mmc/sdhci-msm.yaml index 31a3ce208e1a..10707c4f7184 100644 --- a/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml +++ b/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml @@ -59,22 +59,22 @@ properties: maxItems: 4 oneOf: - items: - - const: hc_mem + - const: hc - items: - - const: hc_mem - - const: core_mem + - const: hc + - const: core - items: - - const: hc_mem - - const: cqe_mem + - const: hc + - const: cqhci - items: - - const: hc_mem - - const: cqe_mem - - const: ice_mem + - const: hc + - const: cqhci + - const: ice - items: - - const: hc_mem - - const: core_mem - - const: cqe_mem - - const: ice_mem + - const: hc + - const: core + - const: cqhci + - const: ice =20 clocks: minItems: 3 --=20 2.34.1 From nobody Sun Apr 19 04:07:18 2026 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 69784CCA483 for ; Thu, 7 Jul 2022 08:04:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235129AbiGGIEr (ORCPT ); Thu, 7 Jul 2022 04:04:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235041AbiGGIEn (ORCPT ); Thu, 7 Jul 2022 04:04:43 -0400 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B67431373 for ; Thu, 7 Jul 2022 01:04:42 -0700 (PDT) Received: by mail-lj1-x231.google.com with SMTP id 19so407271ljz.4 for ; Thu, 07 Jul 2022 01:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n1Cekmq7TYnVG5tqYEZsZt/zviIxcNS3D+dEpzhRHwU=; b=Omcc45hH1GiKX1/GhXujp0AuDRhFvjJOHcXwPAIlBBU+iqACbHOSYHLKyk9AnZBz0j eiQlKFTlcUgUdMxuwMF/HVE2eXUdv4gg8jKdEU3iG1dx8kVgRLhcFXMl+945YxLFx03+ 7iqkr1nOpNyfUUy7HSaIuy/CCMV+QGlQ8j9WbCLA2W5fMrLKOwd8A6TykeNqmk25IIyi DXa7Wlxw9cXsl/93/2Q7JvPghbMyyP6Czt+GtTwMom4UKfH0mC6No5LNP7Kx7dr6fVHc uDS/kfc0K8OmbHzEBygb+Y/YgPJ2+rgzwl1a/mYs03hqVOTh1U3dSRgRJ3WVQSq1yHW2 cJVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=n1Cekmq7TYnVG5tqYEZsZt/zviIxcNS3D+dEpzhRHwU=; b=d5owLf653KdSORwwRK4DtR7yv0ktSc/HA9tSaA+naucUU6b7Wu6VRDNjfoAoRzQ1HR Bysst/LkFEZfj7nZ+ew/VyjagWPEqF58ZEg84+6igMBVSs7HPo2yrKySW83ZbkaA+PsR Mot+1KCwPcVM2G9E8kXddaYy+EcdP3olyU973Remu0CLU8HbEa9/YKHhfoiOBrburnvA itnBuLoNkQZugs6NFzagaWB7lFjqKbVNRk5RcKa8//596VuF/oWq4pv1NaxCNeF3O71I zKrTg9qgl7pdSbw+H+CJ+Xsdx5XwSwuueDrin5qZgpk7Gky8adzOh5J/5UNbsuO7Eos5 U27A== X-Gm-Message-State: AJIora8YnPI/YPjvbMQhRJ7cw0yqdzgYlLzEhZwVs66cs4dlzblEO9iI PcZwiZjeCqgRtn5WnvzmoAOnsg== X-Google-Smtp-Source: AGRyM1sVYGg01zQzr/CMPKBYHIrqCPfa7RVWy+4aECW25nqKJ/ylq/PwKJZR0WNGP3962VS82yBRAw== X-Received: by 2002:a05:651c:4d1:b0:25b:b6ab:5b56 with SMTP id e17-20020a05651c04d100b0025bb6ab5b56mr27248114lji.84.1657181080560; Thu, 07 Jul 2022 01:04:40 -0700 (PDT) Received: from krzk-bin.home ([84.20.121.239]) by smtp.gmail.com with ESMTPSA id s6-20020a056512214600b0047b0f2d7650sm6697187lfr.271.2022.07.07.01.04.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 01:04:40 -0700 (PDT) From: Krzysztof Kozlowski To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Konrad Dybcio , Bhupesh Sharma , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: Douglas Anderson , Krzysztof Kozlowski Subject: [PATCH 2/5] dt-bindings: mmc: sdhci-msm: constrain reg-names at least for one variant Date: Thu, 7 Jul 2022 09:51:48 +0200 Message-Id: <20220707075151.67335-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220707075151.67335-1-krzysztof.kozlowski@linaro.org> References: <20220707075151.67335-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The entries in arrays must have fixed order, so the bindings and Linux driver expecting various combinations of 'reg' addresses was never actually conforming to guidelines. Specifically Linux driver always expects 'core' reg entry as second item, but some DTSes are having there 'cqhci'. Bring at least some sanity here by enforcing one known (used in DTS) configuration of 'reg': 'hc' followed by 'core' for older variants. Signed-off-by: Krzysztof Kozlowski --- .../devicetree/bindings/mmc/sdhci-msm.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml b/Documen= tation/devicetree/bindings/mmc/sdhci-msm.yaml index 10707c4f7184..ac48e36a6949 100644 --- a/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml +++ b/Documentation/devicetree/bindings/mmc/sdhci-msm.yaml @@ -176,6 +176,22 @@ required: allOf: - $ref: mmc-controller.yaml# =20 + - if: + properties: + compatible: + contains: + enum: + - qcom,sdhci-msm-v4 + then: + properties: + reg: + minItems: 2 + maxItems: 2 + reg-names: + items: + - const: hc + - const: core + unevaluatedProperties: false =20 examples: --=20 2.34.1 From nobody Sun Apr 19 04:07:18 2026 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 38D0CC433EF for ; Thu, 7 Jul 2022 08:04:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234285AbiGGIE4 (ORCPT ); Thu, 7 Jul 2022 04:04:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235074AbiGGIEo (ORCPT ); Thu, 7 Jul 2022 04:04:44 -0400 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 7805333A1A for ; Thu, 7 Jul 2022 01:04:43 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id t25so29773522lfg.7 for ; Thu, 07 Jul 2022 01:04:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1L2dW9zNQvinu8XHvxoKS0HMhPSpQ5KOTWxdUJ/fYdE=; b=usBAI484cwtx6EacQZ4Q8BZwJvEP+JqPu5SdsQSWenwPYuC9Lr5H6g75z0MxKvcOTP TIBIqdATOtYnRqbLTL5NOyAQmW6wQ1uTV2QqumkZxMfJY/ZzruT7iT4p9JULKInwfK95 yYbSRArUYgMhGrdy6/4djbadYATCQbIKfW7oQ4nH3lq/MGDxy15q17Pz/dcSeX4STPSC c80sq4l30eaPcNT97AvA2+kkzewVE5cRt50SOPy6zhdMbhXVUv4aRz/LLPM+YQPXpPJ0 wkMfJFLobuntYRejAcNVqaThUyuZDLOvu5JvDuqB4h0x7YfiPIrCkNCgFR7ESC8cb+F3 MtcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1L2dW9zNQvinu8XHvxoKS0HMhPSpQ5KOTWxdUJ/fYdE=; b=aVoNXbrr8IysDzoFE62bAcEJbJDENFVGOdS1OtsEUTaQo/vwbaQindMPr3Hqm+bwmq AnljYJgFm3q64xrWk8n3wBjdH/5fzeJUYEjjBEFFl6icuAYJ7tQ/IvZKUPp8vp4dsBnL edGrSjcUZ9Wg2N6UJD0phNrI+EhGA0JEso3bWluNpWWP//4AMVKHKMXfRMsj4RzYkenw FJaFB1RPQ0VCVoSGtQYUr7Zk/ZC1qkk2B6bhBGFOJG5MpPk1tWS2RvE5EqC+OVa0ZODA E7Ojsd88jwfevwUnbz1Xg6vIjNlambElCLWyhbKGh04gXLZQENmMMAfTSIgH+vCpevsG vEEw== X-Gm-Message-State: AJIora+yC3peZCBuPG7D9frjTAylvx14bmpoHh9oG4iDds/DiTi3Ds+2 82dahLZKqiQLWWTA5zRhqkYM/g== X-Google-Smtp-Source: AGRyM1tFLoXoaaTIrywB7BNTCg5BhqNQrYAN+996kWLqbl3iVX7O4C6vEb/IkoGOtV83xi4t+qyBnQ== X-Received: by 2002:a05:6512:260e:b0:47d:ae43:62b3 with SMTP id bt14-20020a056512260e00b0047dae4362b3mr31485459lfb.77.1657181081816; Thu, 07 Jul 2022 01:04:41 -0700 (PDT) Received: from krzk-bin.home ([84.20.121.239]) by smtp.gmail.com with ESMTPSA id s6-20020a056512214600b0047b0f2d7650sm6697187lfr.271.2022.07.07.01.04.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 01:04:41 -0700 (PDT) From: Krzysztof Kozlowski To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Konrad Dybcio , Bhupesh Sharma , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: Douglas Anderson , Krzysztof Kozlowski Subject: [PATCH 3/5] ARM: dts: qcom: align SDHCI reg-names with DT schema Date: Thu, 7 Jul 2022 09:51:49 +0200 Message-Id: <20220707075151.67335-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220707075151.67335-1-krzysztof.kozlowski@linaro.org> References: <20220707075151.67335-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" DT schema requires SDHCI reg names to be hc/core without "_mem" suffix, just like TXT bindings were expecting before the conversion. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Douglas Anderson --- arch/arm/boot/dts/qcom-apq8084.dtsi | 4 ++-- arch/arm/boot/dts/qcom-ipq4019.dtsi | 1 + arch/arm/boot/dts/qcom-msm8226.dtsi | 6 +++--- arch/arm/boot/dts/qcom-msm8974.dtsi | 6 +++--- arch/arm/boot/dts/qcom-sdx65.dtsi | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-a= pq8084.dtsi index 3e8bded2b5c8..45f3cbcf6238 100644 --- a/arch/arm/boot/dts/qcom-apq8084.dtsi +++ b/arch/arm/boot/dts/qcom-apq8084.dtsi @@ -422,7 +422,7 @@ blsp2_uart2: serial@f995e000 { mmc@f9824900 { compatible =3D "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0xf9824900 0x11c>, <0xf9824000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; clocks =3D <&gcc GCC_SDCC1_APPS_CLK>, @@ -435,7 +435,7 @@ mmc@f9824900 { mmc@f98a4900 { compatible =3D "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0xf98a4900 0x11c>, <0xf98a4000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; clocks =3D <&gcc GCC_SDCC2_APPS_CLK>, diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-i= pq4019.dtsi index a2632349cec4..1b98764bab7a 100644 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi @@ -224,6 +224,7 @@ vqmmc: regulator@1948000 { sdhci: mmc@7824900 { compatible =3D "qcom,sdhci-msm-v4"; reg =3D <0x7824900 0x11c>, <0x7824000 0x800>; + reg-names =3D "hc", "core"; interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; bus-width =3D <8>; diff --git a/arch/arm/boot/dts/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom-m= sm8226.dtsi index 0b5effdb269a..f711463d22dc 100644 --- a/arch/arm/boot/dts/qcom-msm8226.dtsi +++ b/arch/arm/boot/dts/qcom-msm8226.dtsi @@ -137,7 +137,7 @@ apcs: syscon@f9011000 { sdhc_1: mmc@f9824900 { compatible =3D "qcom,msm8226-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0xf9824900 0x11c>, <0xf9824000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; @@ -153,7 +153,7 @@ sdhc_1: mmc@f9824900 { sdhc_2: mmc@f98a4900 { compatible =3D "qcom,msm8226-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0xf98a4900 0x11c>, <0xf98a4000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; @@ -169,7 +169,7 @@ sdhc_2: mmc@f98a4900 { sdhc_3: mmc@f9864900 { compatible =3D "qcom,msm8226-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0xf9864900 0x11c>, <0xf9864000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-m= sm8974.dtsi index 11b4206036e6..971eceaef3d1 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -439,7 +439,7 @@ acc3: clock-controller@f90b8000 { sdhc_1: mmc@f9824900 { compatible =3D "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0xf9824900 0x11c>, <0xf9824000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; @@ -456,7 +456,7 @@ sdhc_1: mmc@f9824900 { sdhc_3: mmc@f9864900 { compatible =3D "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0xf9864900 0x11c>, <0xf9864000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; @@ -475,7 +475,7 @@ sdhc_3: mmc@f9864900 { sdhc_2: mmc@f98a4900 { compatible =3D "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0xf98a4900 0x11c>, <0xf98a4000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; diff --git a/arch/arm/boot/dts/qcom-sdx65.dtsi b/arch/arm/boot/dts/qcom-sdx= 65.dtsi index 7a193678b4f5..4f3389cb6300 100644 --- a/arch/arm/boot/dts/qcom-sdx65.dtsi +++ b/arch/arm/boot/dts/qcom-sdx65.dtsi @@ -334,7 +334,7 @@ glink-edge { sdhc_1: mmc@8804000 { compatible =3D "qcom,sdx65-sdhci", "qcom,sdhci-msm-v5"; reg =3D <0x08804000 0x1000>; - reg-names =3D "hc_mem"; + reg-names =3D "hc"; interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; --=20 2.34.1 From nobody Sun Apr 19 04:07:18 2026 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 2C050C433EF for ; Thu, 7 Jul 2022 08:05:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235143AbiGGIFA (ORCPT ); Thu, 7 Jul 2022 04:05:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235094AbiGGIEq (ORCPT ); Thu, 7 Jul 2022 04:04:46 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9471133A28 for ; Thu, 7 Jul 2022 01:04:43 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id bf9so6552161lfb.13 for ; Thu, 07 Jul 2022 01:04:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p3oBdjTdR29pNyOQBbtY8v56Cbhul4FZ5CnvjyKdni8=; b=qgp2q/wJ8bOWiPAFNpG+rGY+/3KjcP5g/NCky+q+D0nY6fQJb9GOa+x282L/GCFzLI dBSiTQxXuVejEW7csnfLJxftpfk4meYl+fFjz+/ZM/RXG/SemZzc8mxG3PJcUCIt8BSR B8qo9RZTqKrKMDrVtDFeuR9AwABzM1yS+MIYhxi+h4KRNxv6okl9JJar8yge5PohZxQh SezvclDiwWnXV9D+3bNMaKQmhsRYSlVgQf1GOroZZ6Yd+sKFk7aStoCJ2dEx7Lc26Mmr zOSuMyo8pLhR+sB5nHyrAZz0yRTCCoblOTY/y2QlI8kEHKQgVZ7eb0REsIk6sPQoiTer Tg9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p3oBdjTdR29pNyOQBbtY8v56Cbhul4FZ5CnvjyKdni8=; b=bdvEpa0wKdp9PJpD2xE8IxI1r1Q+oXV6nW6ZKBE4+Z1EJqnYcjQbGC5O/arKA9Yco9 Of+qW3yRr7mMIY9U8FRPaVfoFGm9V20ydyuVBTC6tKcUN0ATn+vVggYHOzCNBUNb9/yC LaP2dmpViRrahD2fdAEhd5T5eE7HMEqWcrh564J4kYB2bIJMuwz1cf630UP7GvywzxJ2 UZdLPKX/9Za6Z8p7inMq8u1W/BtNlJLvin9r/fOTMWdJwIHJjzI332TF26h/s23oym0/ rrx7LvIOOj+KWM979t/eMERgyiuX5lPxItMh5Sn9lkOLRvDcJ/QV7cmEPSQjq/AwOHm/ /Lyw== X-Gm-Message-State: AJIora/lRzkTaQLF2iYjPLaYkQqVwVpWKl6Estv/ufS7exq5+IX2JWzn 2zCtDIrKyQfip6rdnurjdPoTOQ== X-Google-Smtp-Source: AGRyM1vIYwUntzyrCs1GJCtryiH8V3WoOiqhiS6dRLD2qg9NO9EcdTAw4yo47oF7W6GFsoWjrdMhwA== X-Received: by 2002:a05:6512:1316:b0:484:88a0:2574 with SMTP id x22-20020a056512131600b0048488a02574mr7573733lfu.399.1657181082966; Thu, 07 Jul 2022 01:04:42 -0700 (PDT) Received: from krzk-bin.home ([84.20.121.239]) by smtp.gmail.com with ESMTPSA id s6-20020a056512214600b0047b0f2d7650sm6697187lfr.271.2022.07.07.01.04.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 01:04:42 -0700 (PDT) From: Krzysztof Kozlowski To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Konrad Dybcio , Bhupesh Sharma , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: Douglas Anderson , Krzysztof Kozlowski Subject: [PATCH 4/5] arm64: dts: qcom: align SDHCI reg-names with DT schema Date: Thu, 7 Jul 2022 09:51:50 +0200 Message-Id: <20220707075151.67335-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220707075151.67335-1-krzysztof.kozlowski@linaro.org> References: <20220707075151.67335-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" DT schema requires SDHCI reg names to be hc/core without "_mem" suffix, just like TXT bindings were expecting before the conversion. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Douglas Anderson --- arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/msm8953.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/msm8994.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qc= om/ipq8074.dtsi index a6cb0dafcc17..2b9374f61d5b 100644 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi @@ -379,7 +379,7 @@ spmi_bus: spmi@200f000 { sdhc_1: mmc@7824900 { compatible =3D "qcom,sdhci-msm-v4"; reg =3D <0x7824900 0x500>, <0x7824000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; =20 interrupts =3D , ; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qc= om/msm8916.dtsi index 48bc2e09128d..0bdf4d39f778 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1469,7 +1469,7 @@ lpass_codec: audio-codec@771c000 { sdhc_1: mmc@7824000 { compatible =3D "qcom,msm8916-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0x07824900 0x11c>, <0x07824000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; =20 interrupts =3D , ; @@ -1487,7 +1487,7 @@ sdhc_1: mmc@7824000 { sdhc_2: mmc@7864000 { compatible =3D "qcom,msm8916-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0x07864900 0x11c>, <0x07864000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; =20 interrupts =3D , ; diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qc= om/msm8953.dtsi index 1bc0ef476cdb..97dde1a429d9 100644 --- a/arch/arm64/boot/dts/qcom/msm8953.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi @@ -799,7 +799,7 @@ sdhc_1: mmc@7824900 { compatible =3D "qcom,msm8953-sdhci", "qcom,sdhci-msm-v4"; =20 reg =3D <0x7824900 0x500>, <0x7824000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; =20 interrupts =3D , ; @@ -859,7 +859,7 @@ sdhc_2: mmc@7864900 { compatible =3D "qcom,msm8953-sdhci", "qcom,sdhci-msm-v4"; =20 reg =3D <0x7864900 0x500>, <0x7864000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; =20 interrupts =3D , ; diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qc= om/msm8994.dtsi index 8bc6c070e306..35c1ca080684 100644 --- a/arch/arm64/boot/dts/qcom/msm8994.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi @@ -464,7 +464,7 @@ usb@f9200000 { sdhc1: mmc@f9824900 { compatible =3D "qcom,msm8994-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0xf9824900 0x1a0>, <0xf9824000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; =20 interrupts =3D , ; @@ -487,7 +487,7 @@ sdhc1: mmc@f9824900 { sdhc2: mmc@f98a4900 { compatible =3D "qcom,msm8994-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0xf98a4900 0x11c>, <0xf98a4000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; =20 interrupts =3D , ; diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qc= om/msm8996.dtsi index 25d6b26fab60..9745df5dc007 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -2896,7 +2896,7 @@ hsusb_phy2: phy@7412000 { sdhc1: mmc@7464900 { compatible =3D "qcom,msm8996-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0x07464900 0x11c>, <0x07464000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; =20 interrupts =3D , ; @@ -2920,7 +2920,7 @@ sdhc1: mmc@7464900 { sdhc2: mmc@74a4900 { compatible =3D "qcom,msm8996-sdhci", "qcom,sdhci-msm-v4"; reg =3D <0x074a4900 0x314>, <0x074a4000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; =20 interrupts =3D , ; diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qc= om/msm8998.dtsi index 85bbd4f7306d..91153a0234f5 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -2078,7 +2078,7 @@ qusb2phy: phy@c012000 { sdhc2: mmc@c0a4900 { compatible =3D "qcom,sdhci-msm-v4"; reg =3D <0x0c0a4900 0x314>, <0x0c0a4000 0x800>; - reg-names =3D "hc_mem", "core_mem"; + reg-names =3D "hc", "core"; =20 interrupts =3D , ; --=20 2.34.1 From nobody Sun Apr 19 04:07:18 2026 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 97311C433EF for ; Thu, 7 Jul 2022 08:04:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235136AbiGGIE5 (ORCPT ); Thu, 7 Jul 2022 04:04:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235095AbiGGIEq (ORCPT ); Thu, 7 Jul 2022 04:04:46 -0400 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7958925C5 for ; Thu, 7 Jul 2022 01:04:44 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id 19so407416ljz.4 for ; Thu, 07 Jul 2022 01:04:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NtRj5O4nkE3cVEceWCLBngIdUnO9GCbDr+tkVq82xkI=; b=IZ/WuPDO2Es2t+93M8st9KdI2bn3shb7sRgxrO49iwvDI1QCCZJofarEfpsidIseO1 R+WqbcP6szS/8bTLMIknwl/vuilpf0FFhB8TK3VXhgGT2mlC2JU+yTskZfSGAlUmGzwK RvXPfGf9G3Kfb6ME1/0empb1vN7IzvO8d0nRx55ilZ+FoEgtBUy1lyt+iDMSiQkiXs1s lDN57vRksfHa9Tct/002BRSBAUxRT/TuTTd8Ez+PS8Qkg6SnY/mq9z2dau4LJZouYTxV Ja12Ssw9fUMcuGziBiBnaW8l9CwowvtBqFY2KobHJ/Fu4arctyh676VHJIi+mszh8fx3 LOSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NtRj5O4nkE3cVEceWCLBngIdUnO9GCbDr+tkVq82xkI=; b=YfeAMY+jABTFtBdg9knMZRvNR32xQdZTAaByCxxA9MypXPMwgWhXiryd6OVQ7KZgFB UOEIT56BapymHp1lVlKytMJMoxtd3gzo90r25LoQGiE710fZIJ6EocbHxCb9JOkfFQyT Tu+gp9uKDzazyuOKFlsx54ZoSxV2Zzgn9EqnhwP3sl3EXmo4ru/Q/g+rRShdEUeGc5pK 9LMVLRWyjcYZSDgpv5YI/Oo9SbhypFmQYw1fdbLpFFLa63PKnugmUWP1WOS+6Twf8aQF 65v6v+IHmm5Xssj1AsuL9CSimXALrlfCkQ9S2jDWovF+z0L8RXEbdt3F8YbQtyog3UrQ 0NwQ== X-Gm-Message-State: AJIora/ZpJxXfeL5JH+w28JLEZcg2JRVBegexAF+qdr+yU93VW6YvJm0 w08n/lYy8fHvMZzwGlTPWSAiJg== X-Google-Smtp-Source: AGRyM1tFydeT/z45l04X0FlpzM1XlJMya0/TVJwM+JiRkhSe36n+dUVfOKUD3tBOoHWEAl6u+yK/Sg== X-Received: by 2002:a2e:7c07:0:b0:25a:73a0:4373 with SMTP id x7-20020a2e7c07000000b0025a73a04373mr25637376ljc.409.1657181084041; Thu, 07 Jul 2022 01:04:44 -0700 (PDT) Received: from krzk-bin.home ([84.20.121.239]) by smtp.gmail.com with ESMTPSA id s6-20020a056512214600b0047b0f2d7650sm6697187lfr.271.2022.07.07.01.04.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 01:04:43 -0700 (PDT) From: Krzysztof Kozlowski To: Ulf Hansson , Rob Herring , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Konrad Dybcio , Bhupesh Sharma , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: Douglas Anderson , Krzysztof Kozlowski Subject: [PATCH 5/5] ARM: dts: qcom: align SDHCI clocks with DT schema Date: Thu, 7 Jul 2022 09:51:51 +0200 Message-Id: <20220707075151.67335-6-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220707075151.67335-1-krzysztof.kozlowski@linaro.org> References: <20220707075151.67335-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The DT schema expects clocks iface-core order. No functional change. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Douglas Anderson --- arch/arm/boot/dts/qcom-apq8084.dtsi | 12 ++++++------ arch/arm/boot/dts/qcom-ipq4019.dtsi | 4 ++-- arch/arm/boot/dts/qcom-msm8226.dtsi | 18 +++++++++--------- arch/arm/boot/dts/qcom-msm8974.dtsi | 18 +++++++++--------- arch/arm/boot/dts/qcom-msm8974pro.dtsi | 6 +++--- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-a= pq8084.dtsi index 45f3cbcf6238..c887ac5cdd7d 100644 --- a/arch/arm/boot/dts/qcom-apq8084.dtsi +++ b/arch/arm/boot/dts/qcom-apq8084.dtsi @@ -425,10 +425,10 @@ mmc@f9824900 { reg-names =3D "hc", "core"; interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; - clocks =3D <&gcc GCC_SDCC1_APPS_CLK>, - <&gcc GCC_SDCC1_AHB_CLK>, + clocks =3D <&gcc GCC_SDCC1_AHB_CLK>, + <&gcc GCC_SDCC1_APPS_CLK>, <&xo_board>; - clock-names =3D "core", "iface", "xo"; + clock-names =3D "iface", "core", "xo"; status =3D "disabled"; }; =20 @@ -438,10 +438,10 @@ mmc@f98a4900 { reg-names =3D "hc", "core"; interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; - clocks =3D <&gcc GCC_SDCC2_APPS_CLK>, - <&gcc GCC_SDCC2_AHB_CLK>, + clocks =3D <&gcc GCC_SDCC2_AHB_CLK>, + <&gcc GCC_SDCC2_APPS_CLK>, <&xo_board>; - clock-names =3D "core", "iface", "xo"; + clock-names =3D "iface", "core", "xo"; status =3D "disabled"; }; =20 diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-i= pq4019.dtsi index 1b98764bab7a..a8a32a5e7e5d 100644 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi @@ -228,9 +228,9 @@ sdhci: mmc@7824900 { interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; bus-width =3D <8>; - clocks =3D <&gcc GCC_SDCC1_APPS_CLK>, <&gcc GCC_SDCC1_AHB_CLK>, + clocks =3D <&gcc GCC_SDCC1_AHB_CLK>, <&gcc GCC_SDCC1_APPS_CLK>, <&gcc GCC_DCD_XO_CLK>; - clock-names =3D "core", "iface", "xo"; + clock-names =3D "iface", "core", "xo"; status =3D "disabled"; }; =20 diff --git a/arch/arm/boot/dts/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom-m= sm8226.dtsi index f711463d22dc..9d4223bf8fc1 100644 --- a/arch/arm/boot/dts/qcom-msm8226.dtsi +++ b/arch/arm/boot/dts/qcom-msm8226.dtsi @@ -141,10 +141,10 @@ sdhc_1: mmc@f9824900 { interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; - clocks =3D <&gcc GCC_SDCC1_APPS_CLK>, - <&gcc GCC_SDCC1_AHB_CLK>, + clocks =3D <&gcc GCC_SDCC1_AHB_CLK>, + <&gcc GCC_SDCC1_APPS_CLK>, <&xo_board>; - clock-names =3D "core", "iface", "xo"; + clock-names =3D "iface", "core", "xo"; pinctrl-names =3D "default"; pinctrl-0 =3D <&sdhc1_default_state>; status =3D "disabled"; @@ -157,10 +157,10 @@ sdhc_2: mmc@f98a4900 { interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; - clocks =3D <&gcc GCC_SDCC2_APPS_CLK>, - <&gcc GCC_SDCC2_AHB_CLK>, + clocks =3D <&gcc GCC_SDCC2_AHB_CLK>, + <&gcc GCC_SDCC2_APPS_CLK>, <&xo_board>; - clock-names =3D "core", "iface", "xo"; + clock-names =3D "iface", "core", "xo"; pinctrl-names =3D "default"; pinctrl-0 =3D <&sdhc2_default_state>; status =3D "disabled"; @@ -173,10 +173,10 @@ sdhc_3: mmc@f9864900 { interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; - clocks =3D <&gcc GCC_SDCC3_APPS_CLK>, - <&gcc GCC_SDCC3_AHB_CLK>, + clocks =3D <&gcc GCC_SDCC3_AHB_CLK>, + <&gcc GCC_SDCC3_APPS_CLK>, <&xo_board>; - clock-names =3D "core", "iface", "xo"; + clock-names =3D "iface", "core", "xo"; pinctrl-names =3D "default"; pinctrl-0 =3D <&sdhc3_default_state>; status =3D "disabled"; diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-m= sm8974.dtsi index 971eceaef3d1..1f4baa6ac64d 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -443,10 +443,10 @@ sdhc_1: mmc@f9824900 { interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; - clocks =3D <&gcc GCC_SDCC1_APPS_CLK>, - <&gcc GCC_SDCC1_AHB_CLK>, + clocks =3D <&gcc GCC_SDCC1_AHB_CLK>, + <&gcc GCC_SDCC1_APPS_CLK>, <&xo_board>; - clock-names =3D "core", "iface", "xo"; + clock-names =3D "iface", "core", "xo"; bus-width =3D <8>; non-removable; =20 @@ -460,10 +460,10 @@ sdhc_3: mmc@f9864900 { interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; - clocks =3D <&gcc GCC_SDCC3_APPS_CLK>, - <&gcc GCC_SDCC3_AHB_CLK>, + clocks =3D <&gcc GCC_SDCC3_AHB_CLK>, + <&gcc GCC_SDCC3_APPS_CLK>, <&xo_board>; - clock-names =3D "core", "iface", "xo"; + clock-names =3D "iface", "core", "xo"; bus-width =3D <4>; =20 #address-cells =3D <1>; @@ -479,10 +479,10 @@ sdhc_2: mmc@f98a4900 { interrupts =3D , ; interrupt-names =3D "hc_irq", "pwr_irq"; - clocks =3D <&gcc GCC_SDCC2_APPS_CLK>, - <&gcc GCC_SDCC2_AHB_CLK>, + clocks =3D <&gcc GCC_SDCC2_AHB_CLK>, + <&gcc GCC_SDCC2_APPS_CLK>, <&xo_board>; - clock-names =3D "core", "iface", "xo"; + clock-names =3D "iface", "core", "xo"; bus-width =3D <4>; =20 #address-cells =3D <1>; diff --git a/arch/arm/boot/dts/qcom-msm8974pro.dtsi b/arch/arm/boot/dts/qco= m-msm8974pro.dtsi index 1e882e16a221..58df6e75ab6d 100644 --- a/arch/arm/boot/dts/qcom-msm8974pro.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974pro.dtsi @@ -10,10 +10,10 @@ &gpu { }; =20 &sdhc_1 { - clocks =3D <&gcc GCC_SDCC1_APPS_CLK>, - <&gcc GCC_SDCC1_AHB_CLK>, + clocks =3D <&gcc GCC_SDCC1_AHB_CLK>, + <&gcc GCC_SDCC1_APPS_CLK>, <&xo_board>, <&gcc GCC_SDCC1_CDCCAL_FF_CLK>, <&gcc GCC_SDCC1_CDCCAL_SLEEP_CLK>; - clock-names =3D "core", "iface", "xo", "cal", "sleep"; + clock-names =3D "iface", "core", "xo", "cal", "sleep"; }; --=20 2.34.1