diff --git a/qcom/lahaina-cdp.dtsi b/qcom/lahaina-cdp.dtsi
index 7290b1ea..39903cb3 100644
--- a/qcom/lahaina-cdp.dtsi
+++ b/qcom/lahaina-cdp.dtsi
@@ -85,13 +85,13 @@
 	qcom,vdd-io-voltage-level = <1808000 2960000>;
 	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-names = "default", "sleep";
+	pinctrl-0 = <&sdc2_on>;
+	pinctrl-1 = <&sdc2_off>;
 
 	cd-gpios = <&tlmm 92 GPIO_ACTIVE_LOW>;
 
-	status = "disabled";
+	status = "ok";
 };
 
 
diff --git a/qcom/lahaina-mtp.dtsi b/qcom/lahaina-mtp.dtsi
index f6b90a75..0bfed503 100644
--- a/qcom/lahaina-mtp.dtsi
+++ b/qcom/lahaina-mtp.dtsi
@@ -87,13 +87,13 @@
 	qcom,vdd-io-voltage-level = <1808000 2960000>;
 	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-names = "default", "sleep";
+	pinctrl-0 = <&sdc2_on>;
+	pinctrl-1 = <&sdc2_off>;
 
 	cd-gpios = <&tlmm 92 GPIO_ACTIVE_LOW>;
 
-	status = "disabled";
+	status = "ok";
 };
 
 
diff --git a/qcom/lahaina-pinctrl.dtsi b/qcom/lahaina-pinctrl.dtsi
index be8c8f34..ae173d1f 100644
--- a/qcom/lahaina-pinctrl.dtsi
+++ b/qcom/lahaina-pinctrl.dtsi
@@ -82,64 +82,55 @@
 		};
 	};
 
-	storage_cd: storage_cd {
-		mux {
-			pins = "gpio92";
-			function = "gpio";
-		};
-
-		config {
-			pins = "gpio92";
-			bias-pull-up;           /* pull up */
-			drive-strength = <2>;   /* 2 MA */
-		};
-	};
-
-	sdc2_clk_on: sdc2_clk_on {
-		config {
+	sdc2_on: sdc2_on {
+		clk {
 			pins = "sdc2_clk";
-			bias-disable;		/* NO pull */
-			drive-strength = <16>;	/* 16 MA */
+			bias-disable;
+			drive-strength = <16>;
+		};
+
+		cmd {
+			pins = "sdc2_cmd";
+			bias-pull-up;
+			drive-strength = <10>;
+		};
+
+		data {
+			pins = "sdc2_data";
+			bias-pull-up;
+			drive-strength = <10>;
+		};
+
+		sd-cd {
+			pins = "gpio92";
+			bias-pull-up;
+			drive-strength = <2>;
 		};
 	};
 
-	sdc2_clk_off: sdc2_clk_off {
-		config {
+	sdc2_off: sdc2_off {
+		clk {
 			pins = "sdc2_clk";
-			bias-disable;		/* NO pull */
-			drive-strength = <2>;	/* 2 MA */
+			bias-disable;
+			drive-strength = <2>;
 		};
-	};
 
-	sdc2_cmd_on: sdc2_cmd_on {
-		config {
+		cmd {
 			pins = "sdc2_cmd";
-			bias-pull-up;		/* pull up */
-			drive-strength = <16>;	/* 16 MA */
+			bias-pull-up;
+			drive-strength = <2>;
 		};
-	};
 
-	sdc2_cmd_off: sdc2_cmd_off {
-		config {
-			pins = "sdc2_cmd";
-			bias-pull-up;		/* pull up */
-			drive-strength = <2>;	/* 2 MA */
-		};
-	};
-
-	sdc2_data_on: sdc2_data_on {
-		config {
+		data {
 			pins = "sdc2_data";
-			bias-pull-up;		/* pull up */
-			drive-strength = <16>;	/* 16 MA */
+			bias-pull-up;
+			drive-strength = <2>;
 		};
-	};
 
-	sdc2_data_off: sdc2_data_off {
-		config {
-			pins = "sdc2_data";
-			bias-pull-up;		/* pull up */
-			drive-strength = <2>;	/* 2 MA */
+		sd-cd {
+			pins = "gpio92";
+			bias-disable;
+			drive-strength = <2>;
 		};
 	};
 
diff --git a/qcom/lahaina-qrd.dtsi b/qcom/lahaina-qrd.dtsi
index f43b2b3e..9ace5845 100644
--- a/qcom/lahaina-qrd.dtsi
+++ b/qcom/lahaina-qrd.dtsi
@@ -32,6 +32,24 @@
 	status = "ok";
 };
 
+&sdhc_2 {
+	vdd-supply = <&pm8350c_l9>;
+	qcom,vdd-voltage-level = <2950000 2960000>;
+	qcom,vdd-current-level = <200 800000>;
+
+	vdd-io-supply = <&pm8350c_l6>;
+	qcom,vdd-io-voltage-level = <1808000 2960000>;
+	qcom,vdd-io-current-level = <200 22000>;
+
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&sdc2_on>;
+	pinctrl-1 = <&sdc2_off>;
+
+	cd-gpios = <&tlmm 92 GPIO_ACTIVE_LOW>;
+
+	status = "disabled";
+};
+
 &swr_dmic_01 {
 	status = "disabled";
 };
diff --git a/qcom/lahaina-rumi.dtsi b/qcom/lahaina-rumi.dtsi
index c5cfb872..36bdde01 100644
--- a/qcom/lahaina-rumi.dtsi
+++ b/qcom/lahaina-rumi.dtsi
@@ -58,9 +58,9 @@
 	qcom,vdd-io-voltage-level = <1808000 2960000>;
 	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-names = "default", "sleep";
+	pinctrl-0 = <&sdc2_on>;
+	pinctrl-1 = <&sdc2_off>;
 
 	cd-gpios = <&tlmm 92 GPIO_ACTIVE_LOW>;