dts: zuk: Fix some cclogic and haptics locations

* Move out of tlmm_gpio_key, as it is supposed to be

Signed-off-by: Davide Garberi <dade.garberi@gmail.com>

2 files changed, 75 insertions, 79 deletions

diff --git a/arch/arm/boot/dts/qcom/zuk/common-usb.dtsi b/arch/arm/boot/dts/qcom/zuk/common-usb.dtsi
index 31d6c6ce5e09..68bf5c1b9378 100755
--- a/arch/arm/boot/dts/qcom/zuk/common-usb.dtsi
+++ b/arch/arm/boot/dts/qcom/zuk/common-usb.dtsi
@@ -33,68 +33,66 @@
 };
 
 &tlmm {
-	tlmm_gpio_key {
-		cclogic_defaulthigh_active: cclogic_defaulthigh_active {
-			mux {
-				pins = "gpio1", "gpio11";
-				function = "gpio";
-			};
-			config {
-				pins = "gpio1", "gpio11";
-				drive-strength = <0x6>;
-				bias-pull-up;
-			};
+	cclogic_defaulthigh_active: cclogic_defaulthigh_active {
+		mux {
+			pins = "gpio1", "gpio11";
+			function = "gpio";
 		};
-		cclogic_defaulthigh_suspend: cclogic_defaulthigh_suspend {
-			mux {
-				pins = "gpio1", "gpio11";
-				function = "gpio";
-			};
-			config {
-				pins = "gpio1", "gpio11";
-				drive-strength = <0x2>;
-				bias-pull-up;
-			};
+		config {
+			pins = "gpio1", "gpio11";
+			drive-strength = <0x6>;
+			bias-pull-up;
 		};
-		cclogic_defaultnone_active: cclogic_defaultnone_active {
-			mux {
-				function = "gpio";
-			};
-			config {
-				drive-strength = <6>;
-				bias-disable;
-			};
+	};
+	cclogic_defaulthigh_suspend: cclogic_defaulthigh_suspend {
+		mux {
+			pins = "gpio1", "gpio11";
+			function = "gpio";
 		};
-		cclogic_defaultnone_suspend: cclogic_defaultnone_suspend {
-			mux {
-				function = "gpio";
-			};
-			config {
-				drive-strength = <0x2>;
-				bias-disable;
-			};
+		config {
+			pins = "gpio1", "gpio11";
+			drive-strength = <0x2>;
+			bias-pull-up;
 		};
-		cclogic_hold_active: cclogic_hold_active {
-			mux {
-				pins = "gpio12";
-				function = "gpio";
-			};
-			config {
-				pins = "gpio12";
-				drive-strength = <0x2>;
-				bias-disable;
-			};
+	};
+	cclogic_defaultnone_active: cclogic_defaultnone_active {
+		mux {
+			function = "gpio";
 		};
-		cclogic_hold_suspend: cclogc_hold_suspend {
-			mux {
-				pins = "gpio12";
-				function = "gpio";
-			};
-			config {
-				pins = "gpio12";
-				drive-strength = <0x2>;
-				bias-bus-hold;
-			};
+		config {
+			drive-strength = <6>;
+			bias-disable;
+		};
+	};
+	cclogic_defaultnone_suspend: cclogic_defaultnone_suspend {
+		mux {
+			function = "gpio";
+		};
+		config {
+			drive-strength = <0x2>;
+			bias-disable;
+		};
+	};
+	cclogic_hold_active: cclogic_hold_active {
+		mux {
+			pins = "gpio12";
+			function = "gpio";
+		};
+		config {
+			pins = "gpio12";
+			drive-strength = <0x2>;
+			bias-disable;
+		};
+	};
+	cclogic_hold_suspend: cclogc_hold_suspend {
+		mux {
+			pins = "gpio12";
+			function = "gpio";
+		};
+		config {
+			pins = "gpio12";
+			drive-strength = <0x2>;
+			bias-bus-hold;
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/qcom/zuk/common-vibration.dtsi b/arch/arm/boot/dts/qcom/zuk/common-vibration.dtsi
index 53b519e1a026..2dc1a6a56d3f 100755
--- a/arch/arm/boot/dts/qcom/zuk/common-vibration.dtsi
+++ b/arch/arm/boot/dts/qcom/zuk/common-vibration.dtsi
@@ -1,28 +1,26 @@
 &tlmm {
-	tlmm_gpio_key {
-        haptics_en_sleep: haptics_en_sleep {
-			mux {
-				pins = "gpio77";
-				function = "gpio";
-			};
+	haptics_en_sleep: haptics_en_sleep {
+		mux {
+			pins = "gpio77";
+			function = "gpio";
+		};
 
-			config {
-				pins = "gpio77";
-				drive-strength = <2>;   /* 2 mA */
-				bias-disable;           /* NO PULL */
-			};
+		config {
+			pins = "gpio77";
+			drive-strength = <2>;   /* 2 mA */
+			bias-disable;           /* NO PULL */
+		};
+	};
+	haptics_en_active: haptics_en_active {
+		mux {
+			pins = "gpio77";
+			function = "gpio";
 		};
-		haptics_en_active: haptics_en_active {
-			mux {
-				pins = "gpio77";
-				function = "gpio";
-			};
 
-			config {
-				pins = "gpio77";
-				drive-strength = <6>;   /* 8 mA */
-				bias-disable;           /* NO PULL */
-			};
+		config {
+			pins = "gpio77";
+			drive-strength = <6>;   /* 8 mA */
+			bias-disable;           /* NO PULL */
 		};
-    };
+	};
 };