diff --git a/qcom/kona-cdp.dtsi b/qcom/kona-cdp.dtsi
index 3f6f3e78081e..069e345eae7f 100644
--- a/qcom/kona-cdp.dtsi
+++ b/qcom/kona-cdp.dtsi
@@ -81,6 +81,17 @@
 	status = "ok";
 };
 
+&extcon_storage_cd {
+	extcon-gpio = <&tlmm 77 GPIO_ACTIVE_LOW>;
+	debounce-ms = <200>;
+	irq-flags = <IRQ_TYPE_EDGE_BOTH>;
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&storage_cd>;
+
+	status = "ok";
+};
+
 &ufsphy_card {
 	compatible = "qcom,ufs-phy-qmp-v4-card";
 
@@ -104,6 +115,8 @@
 	qcom,vddp-ref-clk-supply = <&pm8150_l6>;
 	qcom,vddp-ref-clk-max-microamp = <100>;
 
+	extcon = <&extcon_storage_cd>;
+
 	status = "ok";
 };
 
@@ -721,10 +734,10 @@
 	qcom,vdd-io-current-level = <200 22000>;
 
 	pinctrl-names = "active", "sleep";
-	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on &storage_cd>;
-	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &storage_cd>;
+	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on>;
+	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
 
-	cd-gpios = <&tlmm 77 GPIO_ACTIVE_LOW>;
+	extcon = <&extcon_storage_cd>;
 
 	status = "ok";
 };
diff --git a/qcom/kona-mtp.dtsi b/qcom/kona-mtp.dtsi
index 6898ec4be41f..6efcc1139f70 100644
--- a/qcom/kona-mtp.dtsi
+++ b/qcom/kona-mtp.dtsi
@@ -81,6 +81,17 @@
 	status = "ok";
 };
 
+&extcon_storage_cd {
+	extcon-gpio = <&tlmm 77 GPIO_ACTIVE_LOW>;
+	debounce-ms = <200>;
+	irq-flags = <IRQ_TYPE_EDGE_BOTH>;
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&storage_cd>;
+
+	status = "ok";
+};
+
 &ufsphy_card {
 	compatible = "qcom,ufs-phy-qmp-v4-card";
 
@@ -104,6 +115,8 @@
 	qcom,vddp-ref-clk-supply = <&pm8150_l6>;
 	qcom,vddp-ref-clk-max-microamp = <100>;
 
+	extcon = <&extcon_storage_cd>;
+
 	status = "ok";
 };
 
@@ -631,10 +644,10 @@
 	qcom,vdd-io-current-level = <200 22000>;
 
 	pinctrl-names = "active", "sleep";
-	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on &storage_cd>;
-	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &storage_cd>;
+	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on>;
+	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
 
-	cd-gpios = <&tlmm 77 GPIO_ACTIVE_LOW>;
+	extcon = <&extcon_storage_cd>;
 
 	status = "ok";
 };
diff --git a/qcom/kona.dtsi b/qcom/kona.dtsi
index f544ac2c2103..c9a0ef52480b 100644
--- a/qcom/kona.dtsi
+++ b/qcom/kona.dtsi
@@ -2202,6 +2202,12 @@
 		status = "disabled";
 	};
 
+	extcon_storage_cd: extcon_storage_cd {
+		compatible = "extcon-gpio";
+		extcon-id = <62>; /* EXTCON_MECHANICAL */
+		status = "disabled";
+	};
+
 	ipcc_mproc: qcom,ipcc@408000 {
 		compatible = "qcom,ipcc";
 		reg = <0x408000 0x1000>;