diff --git a/qcom/sun-pinctrl.dtsi b/qcom/sun-pinctrl.dtsi
index 7b13fc9a..961d516d 100644
--- a/qcom/sun-pinctrl.dtsi
+++ b/qcom/sun-pinctrl.dtsi
@@ -2517,6 +2517,34 @@
 	};
 
 	qupv3_se13_q2spi_pins: qupv3_se13_q2spi_pins {
+		qupv3_se13_q2spi_default: qupv3_se13_q2spi_default {
+			mux {
+				pins = "gpio21", "gpio22",
+					"gpio23";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio21", "gpio22",
+					"gpio23";
+				drive-strength = <2>;
+				bias-pull-down;
+			};
+		};
+
+		qupv3_se13_q2spi_miso_default: qupv3_se13_q2spi_miso_default {
+			mux {
+				pins = "gpio20";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio20";
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+
 		qupv3_se13_q2spi_miso_active: qupv3_se13_q2spi_miso_active {
 			mux {
 				pins = "gpio20";
@@ -2556,7 +2584,7 @@
 			};
 		};
 
-		qupv3_se13_q2spi_doorbell_active: qupv3_se13_q2spi_cs_active {
+		qupv3_se13_q2spi_doorbell_active: qupv3_se13_q2spi_doorbell_active {
 			mux {
 				pins = "gpio23";
 				function = "qup2_se5_l6";
diff --git a/qcom/sun-qupv3.dtsi b/qcom/sun-qupv3.dtsi
index 476b691f..008b5e6a 100644
--- a/qcom/sun-qupv3.dtsi
+++ b/qcom/sun-qupv3.dtsi
@@ -973,11 +973,13 @@
 			<&aggre2_noc MASTER_QUP_2 &mc_virt  SLAVE_EBI1>;
 			mosi-pin = <&tlmm 21 0>;
 			clk-pin = <&tlmm 22 0>;
-			pinctrl-names = "default", "sleep";
-			pinctrl-0 = <&qupv3_se13_q2spi_mosi_active>, <&qupv3_se13_q2spi_miso_active>,
+			pinctrl-names = "default", "active", "sleep", "shutdown";
+			pinctrl-0 = <&qupv3_se13_q2spi_miso_default>, <&qupv3_se13_q2spi_default>;
+			pinctrl-1 = <&qupv3_se13_q2spi_mosi_active>, <&qupv3_se13_q2spi_miso_active>,
 				<&qupv3_se13_q2spi_clk_active>, <&qupv3_se13_q2spi_doorbell_active>;
-			pinctrl-1 = <&qupv3_se13_q2spi_mosi_active>, <&qupv3_se13_q2spi_miso_sleep>,
+			pinctrl-2 = <&qupv3_se13_q2spi_mosi_active>, <&qupv3_se13_q2spi_miso_sleep>,
 				<&qupv3_se13_q2spi_clk_active>, <&qupv3_se13_q2spi_doorbell_sleep>;
+			pinctrl-3 = <&qupv3_se13_q2spi_miso_default>, <&qupv3_se13_q2spi_default>;
 			dmas = <&gpi_dma2 0 5 14 64 0>,
 				<&gpi_dma2 1 5 14 64 0>;
 			dma-names = "tx", "rx";