From: Konrad Dybcio <konradybcio@gmail.com>
To: skrzynka@konradybcio.pl
Cc: Konrad Dybcio <konradybcio@gmail.com>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Kees Cook <keescook@chromium.org>,
Anton Vorontsov <anton@enomsg.org>,
Colin Cross <ccross@android.com>, Tony Luck <tony.luck@intel.com>,
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 02/13] arm64: dts: qcom: msm8992: Fix SDHCI1
Date: Thu, 25 Jun 2020 20:21:06 +0200 [thread overview]
Message-ID: <20200625182118.131476-3-konradybcio@gmail.com> (raw)
In-Reply-To: <20200625182118.131476-1-konradybcio@gmail.com>
This commit ensures the correct IRQ type is set
and disables the device by default.
The mmc-hs400-1_8v property is also moved to
Bullhead as it might not be present on all boards.
The node has been renamed to sdhci@ instead of mmc@
and the phandle was changed to sdhc_1 to comply with
the newer DTS style.
Signed-off-by: Konrad Dybcio <konradybcio@gmail.com>
---
.../boot/dts/qcom/msm8992-bullhead-rev-101.dts | 6 ++++++
arch/arm64/boot/dts/qcom/msm8992.dtsi | 16 +++++++++-------
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
index a2de69292d28..1061fd5404aa 100644
--- a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
+++ b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
@@ -271,3 +271,9 @@ pm8994_l32: l32 {
};
};
};
+
+&sdhc_1 {
+ status = "okay";
+
+ mmc-hs400-1_8v;
+};
diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qcom/msm8992.dtsi
index 43b2e4cd26f0..8ef1cb8ba8ef 100644
--- a/arch/arm64/boot/dts/qcom/msm8992.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi
@@ -158,18 +158,19 @@ frame@f9028000 {
};
};
- sdhci1: mmc@f9824900 {
+ sdhc_1: sdhci@f9824900 {
compatible = "qcom,sdhci-msm-v4";
reg = <0xf9824900 0x1a0>, <0xf9824000 0x800>;
reg-names = "hc_mem", "core_mem";
- interrupts = <GIC_SPI 123 IRQ_TYPE_NONE>,
- <GIC_SPI 138 IRQ_TYPE_NONE>;
+ interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "hc_irq", "pwr_irq";
clocks = <&gcc GCC_SDCC1_APPS_CLK>,
- <&gcc GCC_SDCC1_AHB_CLK>;
- clock-names = "core", "iface";
+ <&gcc GCC_SDCC1_AHB_CLK>,
+ <&xo_board>;
+ clock-names = "core", "iface", "xo";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on
@@ -179,8 +180,9 @@ sdhci1: mmc@f9824900 {
regulator-always-on;
bus-width = <8>;
- mmc-hs400-1_8v;
- status = "okay";
+ non-removable;
+
+ status = "disabled";
};
blsp1_uart2: serial@f991e000 {
--
2.27.0
next prev parent reply other threads:[~2020-06-25 18:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-25 18:21 [PATCH v3 00/13] msm8992 DTS updates, peripheral enablement Konrad Dybcio
2020-06-25 18:21 ` [PATCH v3 01/13] arm64: dts: qcom: msm8992: Modernize the DTS style Konrad Dybcio
2020-06-25 18:21 ` Konrad Dybcio [this message]
2020-06-25 18:21 ` [PATCH v3 03/13] arm64: dts: qcom: bullhead: Add qcom,msm-id Konrad Dybcio
2020-06-25 18:21 ` [PATCH v3 04/13] arm64: dts: qcom: bullhead: Move UART pinctrl to SoC Konrad Dybcio
2020-06-25 18:21 ` [PATCH v3 05/13] arm64: dts: qcom: msm8992: Add a proper CPU map Konrad Dybcio
2020-06-25 18:21 ` [PATCH v3 06/13] arm64: dts: qcom: msm8992: Add a SCM node Konrad Dybcio
2020-06-25 18:21 ` [PATCH v3 07/13] arm64: dts: qcom: msm8992: Add SPMI PMIC arbiter device Konrad Dybcio
2020-06-25 18:21 ` [PATCH v3 08/13] arm64: dts: qcom: msm8992: Add BLSP2_UART2 and I2C nodes Konrad Dybcio
2020-06-25 18:21 ` [PATCH v3 09/13] arm64: dts: qcom: msm8992: Add PMU node Konrad Dybcio
2020-06-25 18:21 ` [PATCH v3 10/13] arm64: dts: qcom: msm8992: Add PSCI support Konrad Dybcio
2020-06-25 18:21 ` [PATCH v3 11/13] arm64: dts: qcom: msm8992: Add RPMCC node Konrad Dybcio
2020-06-25 18:21 ` [PATCH v3 12/13] arm64: dts: qcom: Add Xiaomi Libra (Mi 4C) device tree Konrad Dybcio
2020-06-25 18:21 ` [PATCH v3 13/13] arm64: dts: qcom: Add Microsoft Lumia 950 (Talkman) " Konrad Dybcio
2020-07-27 18:20 ` [PATCH v3 00/13] msm8992 DTS updates, peripheral enablement Konrad Dybcio
2020-07-28 6:48 ` Bjorn Andersson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200625182118.131476-3-konradybcio@gmail.com \
--to=konradybcio@gmail.com \
--cc=agross@kernel.org \
--cc=anton@enomsg.org \
--cc=bjorn.andersson@linaro.org \
--cc=ccross@android.com \
--cc=devicetree@vger.kernel.org \
--cc=keescook@chromium.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=skrzynka@konradybcio.pl \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).