diff --git a/qcom/bengal-pinctrl.dtsi b/qcom/bengal-pinctrl.dtsi
index fa8c4660..565339a1 100644
--- a/qcom/bengal-pinctrl.dtsi
+++ b/qcom/bengal-pinctrl.dtsi
@@ -8,140 +8,105 @@
 		interrupt-controller;
 		#interrupt-cells = <2>;
 
-		/* SDC pin type */
-		sdc1_clk_on: sdc1_clk_on {
-			config {
+		sdc1_on: sdc1_on {
+			clk {
 				pins = "sdc1_clk";
 				bias-disable;		/* NO pull */
 				drive-strength = <16>;	/* 16 MA */
 			};
-		};
 
-		sdc1_clk_off: sdc1_clk_off {
-			config {
-				pins = "sdc1_clk";
-				bias-disable;		/* NO pull */
-				drive-strength = <2>;	/* 2 MA */
-			};
-		};
-
-		sdc1_cmd_on: sdc1_cmd_on {
-			config {
+			cmd {
 				pins = "sdc1_cmd";
 				bias-pull-up;		/* pull up */
 				drive-strength = <10>;	/* 10 MA */
 			};
-		};
 
-		sdc1_cmd_off: sdc1_cmd_off {
-			config {
-				pins = "sdc1_cmd";
-				bias-pull-up;		/* pull up */
-				drive-strength = <2>;	/* 2 MA */
-			};
-		};
-
-		sdc1_data_on: sdc1_data_on {
-			config {
+			data {
 				pins = "sdc1_data";
 				bias-pull-up;		/* pull up */
 				drive-strength = <10>;	/* 10 MA */
 			};
-		};
 
-		sdc1_data_off: sdc1_data_off {
-			config {
-				pins = "sdc1_data";
-				bias-pull-up;		/* pull up */
-				drive-strength = <2>;	/* 2 MA */
-			};
-		};
-
-		sdc1_rclk_on: sdc1_rclk_on {
-			config {
+			rclk {
 				pins = "sdc1_rclk";
 				bias-pull-down; /* pull down */
 			};
 		};
 
-		sdc1_rclk_off: sdc1_rclk_off {
-			config {
+		sdc1_off: sdc1_off {
+			clk {
+				pins = "sdc1_clk";
+				bias-disable;		/* NO pull */
+				drive-strength = <2>;	/* 2 MA */
+			};
+
+			cmd {
+				pins = "sdc1_cmd";
+				bias-pull-up;		/* pull up */
+				drive-strength = <2>;	/* 2 MA */
+			};
+
+			data {
+				pins = "sdc1_data";
+				bias-pull-up;		/* pull up */
+				drive-strength = <2>;	/* 2 MA */
+			};
+
+			rclk {
 				pins = "sdc1_rclk";
 				bias-pull-down; /* pull down */
 			};
 		};
 
-		sdc2_clk_on: sdc2_clk_on {
-			config {
+		sdc2_on: sdc2_on {
+			clk {
 				pins = "sdc2_clk";
 				bias-disable;		/* NO pull */
 				drive-strength = <16>;	/* 16 MA */
 			};
-		};
 
-		sdc2_clk_off: sdc2_clk_off {
-			config {
-				pins = "sdc2_clk";
-				bias-disable;		/* NO pull */
-				drive-strength = <2>;	/* 2 MA */
-			};
-		};
-
-		sdc2_cmd_on: sdc2_cmd_on {
-			config {
+			cmd {
 				pins = "sdc2_cmd";
 				bias-pull-up;		/* pull up */
 				drive-strength = <10>;	/* 10 MA */
 			};
-		};
 
-		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 = <10>;	/* 10 MA */
 			};
-		};
 
-		sdc2_data_off: sdc2_data_off {
-			config {
-				pins = "sdc2_data";
-				bias-pull-up;		/* pull up */
-				drive-strength = <2>;	/* 2 MA */
-			};
-		};
-
-		sdc2_cd_on: cd_on {
-			mux {
+			sd-cd {
 				pins = "gpio88";
-				function = "gpio";
-			};
-
-			config {
-				pins = "gpio88";
-				drive-strength = <2>;
 				bias-pull-up;
+				drive-strength = <2>;
 			};
 		};
 
-		sdc2_cd_off: cd_off {
-			mux {
-				pins = "gpio88";
-				function = "gpio";
+		sdc2_off: sdc2_off {
+			clk {
+				pins = "sdc2_clk";
+				bias-disable;		/* NO pull */
+				drive-strength = <2>;	/* 2 MA */
 			};
 
-			config {
+			cmd {
+				pins = "sdc2_cmd";
+				bias-pull-up;		/* pull up */
+				drive-strength = <2>;	/* 2 MA */
+			};
+
+			data {
+				pins = "sdc2_data";
+				bias-pull-up;		/* pull up */
+				drive-strength = <2>;	/* 2 MA */
+			};
+
+			sd-cd {
 				pins = "gpio88";
-				drive-strength = <2>;
 				bias-disable;
+				drive-strength = <2>;
 			};
 		};
 
diff --git a/qcom/khaje-atp.dtsi b/qcom/khaje-atp.dtsi
index 89abcda8..af91e0dd 100644
--- a/qcom/khaje-atp.dtsi
+++ b/qcom/khaje-atp.dtsi
@@ -41,10 +41,8 @@
 	qcom,vdd-io-current-level = <0 325000>;
 
 	pinctrl-names = "active", "sleep";
-	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on
-					&sdc1_rclk_on>;
-	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off
-					&sdc1_rclk_off>;
+	pinctrl-0 = <&sdc1_on>;
+	pinctrl-1 = <&sdc1_off>;
 
 	status = "ok";
 };
@@ -63,8 +61,8 @@
 	qcom,vdd-io-bias-current-level = <0 6000>;
 
 	pinctrl-names = "active", "sleep";
-	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
-	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
+	pinctrl-0 = <&sdc2_on>;
+	pinctrl-1 = <&sdc2_off>;
 
 	cd-gpios = <&tlmm 88 GPIO_ACTIVE_LOW>;
 
diff --git a/qcom/khaje-idp.dtsi b/qcom/khaje-idp.dtsi
index e5bbfbd5..d4d75671 100644
--- a/qcom/khaje-idp.dtsi
+++ b/qcom/khaje-idp.dtsi
@@ -171,10 +171,9 @@
 	qcom,vdd-io-current-level = <0 325000>;
 
 	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on
-					&sdc1_rclk_on>;
-	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off
-					&sdc1_rclk_off>;
+	pinctrl-0 = <&sdc1_on>;
+	pinctrl-1 = <&sdc1_off>;
+
 	status = "ok";
 };
 
@@ -192,8 +191,8 @@
 	qcom,vdd-io-bias-current-level = <0 6000>;
 
 	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
-	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
+	pinctrl-0 = <&sdc2_on>;
+	pinctrl-1 = <&sdc2_off>;
 
 	cd-gpios = <&tlmm 88 GPIO_ACTIVE_LOW>;
 	status = "ok";
diff --git a/qcom/khaje-qrd.dtsi b/qcom/khaje-qrd.dtsi
index 74b0dba1..4461431a 100644
--- a/qcom/khaje-qrd.dtsi
+++ b/qcom/khaje-qrd.dtsi
@@ -116,11 +116,9 @@
 	qcom,vdd-io-voltage-level = <1800000 1800000>;
 	qcom,vdd-io-current-level = <0 325000>;
 
-	pinctrl-names = "active", "sleep";
-	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on
-					&sdc1_rclk_on>;
-	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off
-					&sdc1_rclk_off>;
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&sdc1_on>;
+	pinctrl-1 = <&sdc1_off>;
 
 	status = "ok";
 };
@@ -138,9 +136,9 @@
 	qcom,vdd-io-bias-voltage-level = <1256000 1256000>;
 	qcom,vdd-io-bias-current-level = <0 6000>;
 
-	pinctrl-names = "active", "sleep";
-	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
-	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&sdc2_on>;
+	pinctrl-1 = <&sdc2_off>;
 
 	cd-gpios = <&tlmm 88 GPIO_ACTIVE_LOW>;