Changes since v3:
-----------------
- v3 can be seen here: https://lore.kernel.org/lkml/[email protected]/
- Use explicit qrb4210 .mbn files instead of qrb4210-rb2 .mbn ones.
- Collected R-Bs from Dmitry.
Changes since v2:
-----------------
- v2 can be seen here: https://lore.kernel.org/linux-arm-msm/[email protected]/
- Use explicit qrb4210-rb2 .mbn files instead of sm6115 .mdt ones.
- Collected Acks and R-Bs from Konrad and Krzysztof.
Changes since v1:
-----------------
- v1 can be seen here: https://lore.kernel.org/linux-arm-msm/[email protected]/
- Converted the SDHC2 CD gpio fix into a separate patch as
suggested by Krzysztof.
Add the default and sleep pinctrl states for SDHC1 & 2 controllers
on QRB4210 RB2 board.
While at it also fix the Card-Detect (CD) gpio for SDHC2 which
allows the uSD card to be detected on the board.
Also enable the adsp and cdsp remoteproc nodes on QRB4210-RB2 board.
*** BLURB HERE ***
Bhupesh Sharma (3):
arm64: dts: qcom: qrb4210-rb2: Add SD pinctrl states
arm64: dts: qcom: qrb4210-rb2: Fix CD gpio for SDHC2
arm64: dts: qcom: qrb4210-rb2: Enable aDSP and cDSP remoteproc nodes
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 30 +++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
--
2.38.1
Add the default and sleep pinctrl states for SDHC1 & 2 controllers
on QRB4210 RB2 board.
Reviewed-by: Dmitry Baryshkov <[email protected]>
Reviewed-by: Konrad Dybcio <[email protected]>
Reviewed-by: Krzysztof Kozlowski <[email protected]>
Signed-off-by: Bhupesh Sharma <[email protected]>
---
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
index dc80f0bca767..504543ad1a1b 100644
--- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
+++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
@@ -190,6 +190,10 @@ vreg_l24a_2p96: l24 {
};
&sdhc_1 {
+ pinctrl-0 = <&sdc1_state_on>;
+ pinctrl-1 = <&sdc1_state_off>;
+ pinctrl-names = "default", "sleep";
+
vmmc-supply = <&vreg_l24a_2p96>;
vqmmc-supply = <&vreg_l11a_1p8>;
no-sdio;
@@ -200,6 +204,11 @@ &sdhc_1 {
&sdhc_2 {
cd-gpios = <&tlmm 88 GPIO_ACTIVE_HIGH>; /* card detect gpio */
+
+ pinctrl-0 = <&sdc2_state_on &sdc2_card_det_n>;
+ pinctrl-1 = <&sdc2_state_off &sdc2_card_det_n>;
+ pinctrl-names = "default", "sleep";
+
vmmc-supply = <&vreg_l22a_2p96>;
vqmmc-supply = <&vreg_l5a_2p96>;
no-sdio;
@@ -216,6 +225,13 @@ &tlmm {
<49 1>, <52 1>, <54 1>,
<56 3>, <61 2>, <64 1>,
<68 1>, <72 8>, <96 1>;
+
+ sdc2_card_det_n: sd-card-det-n-state {
+ pins = "gpio88";
+ function = "gpio";
+ drive-strength = <2>;
+ bias-pull-up;
+ };
};
&uart4 {
--
2.38.1
Enable the aDSP and cDSP remoteproc nodes on Qualcomm QRB4210 RB2 board.
Signed-off-by: Bhupesh Sharma <[email protected]>
---
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
index abea44fd369d..5cbca0e4ec90 100644
--- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
+++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
@@ -34,6 +34,18 @@ &qupv3_id_0 {
status = "okay";
};
+&remoteproc_adsp {
+ firmware-name = "qcom/qrb4210/adsp.mbn";
+
+ status = "okay";
+};
+
+&remoteproc_cdsp {
+ firmware-name = "qcom/qrb4210/cdsp.mbn";
+
+ status = "okay";
+};
+
&rpm_requests {
regulators {
compatible = "qcom,rpm-pm6125-regulators";
--
2.38.1
Card-Detect (CD) gpio for SDHC2 is an active GPIO line. Fix the same.
This allows the uSD card to be properly detected on the board.
Fixes: 8d58a8c0d930 ("arm64: dts: qcom: Add base qrb4210-rb2 board dts")
Reviewed-by: Dmitry Baryshkov <[email protected]>
Reviewed-by: Krzysztof Kozlowski <[email protected]>
Signed-off-by: Bhupesh Sharma <[email protected]>
---
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
index 504543ad1a1b..abea44fd369d 100644
--- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
+++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
@@ -203,7 +203,7 @@ &sdhc_1 {
};
&sdhc_2 {
- cd-gpios = <&tlmm 88 GPIO_ACTIVE_HIGH>; /* card detect gpio */
+ cd-gpios = <&tlmm 88 GPIO_ACTIVE_LOW>; /* card detect gpio */
pinctrl-0 = <&sdc2_state_on &sdc2_card_det_n>;
pinctrl-1 = <&sdc2_state_off &sdc2_card_det_n>;
--
2.38.1
On Tue, 16 May 2023 13:29:05 +0530, Bhupesh Sharma wrote:
> Changes since v3:
> -----------------
> - v3 can be seen here: https://lore.kernel.org/lkml/[email protected]/
> - Use explicit qrb4210 .mbn files instead of qrb4210-rb2 .mbn ones.
> - Collected R-Bs from Dmitry.
>
> Changes since v2:
> -----------------
> - v2 can be seen here: https://lore.kernel.org/linux-arm-msm/[email protected]/
> - Use explicit qrb4210-rb2 .mbn files instead of sm6115 .mdt ones.
> - Collected Acks and R-Bs from Konrad and Krzysztof.
>
> [...]
Applied, thanks!
[1/3] arm64: dts: qcom: qrb4210-rb2: Add SD pinctrl states
commit: 10254fb73fdadec81e47a776e149863a13030291
[2/3] arm64: dts: qcom: qrb4210-rb2: Fix CD gpio for SDHC2
commit: 14e6c47b628788a8c8634bc59b2dd50d68a74de3
[3/3] arm64: dts: qcom: qrb4210-rb2: Enable aDSP and cDSP remoteproc nodes
commit: 50931b44dc751784cdc5721bf30a79093c2c9fe9
Best regards,
--
Bjorn Andersson <[email protected]>