arm64: dts: qcom: ipq9574: Add details for eMMC

RDP433 and RDP418 has NAND and eMMC variants. Presently, only NAND
variant is supported. To enable support for eMMC variant, add the
relevant GPIO and regulator information.

Do not enable NAND or eMMC by default in ipq9574-rdp-common.dtsi. Enable
it in board specific DTS as applicable.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Varadarajan Narayanan <varadarajan.narayanan@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260205085936.3220108-2-varadarajan.narayanan@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi b/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
index fb398857b73d259f218f871b003e53007eb2fdb2..62877b46f9b3fc93c1a684107ff9b034b45824fc 100644 (file)
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
@@ -22,6 +22,15 @@
                stdout-path = "serial0:115200n8";
        };
 
+       regulator_fixed_1p8: s1800 {
+               compatible = "regulator-fixed";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               regulator-boot-on;
+               regulator-always-on;
+               regulator-name = "fixed_1p8";
+       };
+
        regulator_fixed_3p3: s3300 {
                compatible = "regulator-fixed";
                regulator-min-microvolt = <3300000>;
@@ -137,6 +146,11 @@
        };
 };
 
+&sdhc_1 {
+       vmmc-supply = <&regulator_fixed_3p3>;
+       vqmmc-supply = <&regulator_fixed_1p8>;
+};
+
 &sleep_clk {
        clock-frequency = <32000>;
 };
@@ -185,6 +199,38 @@
                        bias-disable;
                };
        };
+
+       sdc_default_state: sdc-default-state {
+               clk-pins {
+                       pins = "gpio5";
+                       function = "sdc_clk";
+                       drive-strength = <8>;
+                       bias-disable;
+               };
+
+               cmd-pins {
+                       pins = "gpio4";
+                       function = "sdc_cmd";
+                       drive-strength = <8>;
+                       bias-pull-up;
+               };
+
+               data-pins {
+                       pins = "gpio0", "gpio1", "gpio2",
+                              "gpio3", "gpio6", "gpio7",
+                              "gpio8", "gpio9";
+                       function = "sdc_data";
+                       drive-strength = <8>;
+                       bias-pull-up;
+               };
+
+               rclk-pins {
+                       pins = "gpio10";
+                       function = "sdc_rclk";
+                       drive-strength = <8>;
+                       bias-pull-down;
+               };
+       };
 };
 
 &qpic_bam {
@@ -195,8 +241,6 @@
        pinctrl-0 = <&qpic_snand_default_state>;
        pinctrl-names = "default";
 
-       status = "okay";
-
        flash@0 {
                compatible = "spi-nand";
                reg = <0>;

diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
index f4f9199d4ab1e51ccf4dc30f4aa980a52a5643cc..23d4cba7c6b657e2e5e1b09aa3b7470a69898a87 100644 (file)
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts
@@ -16,48 +16,6 @@
 
 };
 
-&sdhc_1 {
-       pinctrl-0 = <&sdc_default_state>;
-       pinctrl-names = "default";
-       mmc-ddr-1_8v;
-       mmc-hs200-1_8v;
-       mmc-hs400-1_8v;
-       mmc-hs400-enhanced-strobe;
-       max-frequency = <384000000>;
-       bus-width = <8>;
+&qpic_nand {
        status = "okay";
 };
-
-&tlmm {
-       sdc_default_state: sdc-default-state {
-               clk-pins {
-                       pins = "gpio5";
-                       function = "sdc_clk";
-                       drive-strength = <8>;
-                       bias-disable;
-               };
-
-               cmd-pins {
-                       pins = "gpio4";
-                       function = "sdc_cmd";
-                       drive-strength = <8>;
-                       bias-pull-up;
-               };
-
-               data-pins {
-                       pins = "gpio0", "gpio1", "gpio2",
-                              "gpio3", "gpio6", "gpio7",
-                              "gpio8", "gpio9";
-                       function = "sdc_data";
-                       drive-strength = <8>;
-                       bias-pull-up;
-               };
-
-               rclk-pins {
-                       pins = "gpio10";
-                       function = "sdc_rclk";
-                       drive-strength = <8>;
-                       bias-pull-down;
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
index 5a546a14998b04a4b52abfc12571ec0f793f959b..73091067bad28acd08130c1981fd5fe881814c7a 100644 (file)
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
@@ -55,6 +55,10 @@
        status = "okay";
 };
 
+&qpic_nand {
+       status = "okay";
+};
+
 &tlmm {
 
        pcie1_default: pcie1-default-state {

diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
index d36d1078763ec329c4a3ed5184da7d167ca010a7..cbc9047cfe929bb5f63d28499bd68b5e1e14e0b4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts
@@ -15,3 +15,7 @@
        compatible = "qcom,ipq9574-ap-al02-c6", "qcom,ipq9574";
 
 };
+
+&qpic_nand {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
index c30c9fbedf26bf557fef85449a059217864cde4c..d233ec530cc3de2c876ba84e8ea86224afd24300 100644 (file)
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts
@@ -15,3 +15,7 @@
        compatible = "qcom,ipq9574-ap-al02-c8", "qcom,ipq9574";
 
 };
+
+&qpic_nand {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts b/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
index 0dc382f5d5ecdfc238bca1fa402b845b418cbce1..f2334b9e0ed49e568a9bcb86638607577bf55413 100644 (file)
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts
@@ -14,3 +14,7 @@
        model = "Qualcomm Technologies, Inc. IPQ9574/AP-AL02-C9";
        compatible = "qcom,ipq9574-ap-al02-c9", "qcom,ipq9574";
 };
+
+&qpic_nand {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
index 8cc0098fc5e364f2535f3a2d403c1745d929cbc6..622cfa96ed2b385875dacaaccb64a8212613da49 100644 (file)
--- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi
@@ -463,6 +463,15 @@
                        clock-names = "iface", "core", "xo", "ice";
                        non-removable;
                        supports-cqe;
+                       pinctrl-0 = <&sdc_default_state>;
+                       pinctrl-names = "default";
+                       mmc-ddr-1_8v;
+                       mmc-hs200-1_8v;
+                       mmc-hs400-1_8v;
+                       mmc-hs400-enhanced-strobe;
+                       max-frequency = <384000000>;
+                       bus-width = <8>;
+
                        status = "disabled";
                };