Merge "Revert "ARM: dts: msm: Disable secondary USB & dock on APQ8084 Liquid"" (4a918b30) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/qcom/apq8084-liquid.dtsi

+12 −1

Original line number	Diff line number	Diff line
		@@ -137,7 +137,6 @@
		qcom,dock-hub-reset-gpio = <&msmgpio 65 0>;
		qcom,dock-enable-gpio = <&msmgpio 93 0>;
		qcom,dock-eth-reset-gpio = <&msmgpio 94 0>;
		status = "disabled";
		};
		};

		@@ -341,6 +340,18 @@
		qcom,charging-disabled;
		};

		&usb3_sec {
		status = "ok";
		};

		&hsphy1 {
		status = "ok";
		};

		&ssphy1 {
		status = "ok";
		};

		&pma8084_gpios {
		gpio@c000 { /* GPIO 1 */
		qcom,mode = <0>;