Merge "ARM: dts: msm: Resolve GPIO conflict on Automotive CDP Platform" (08f8d92b) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi

+9 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		*/

		#include "msm8996-pinctrl.dtsi"
		#include "msm8996-camera-sensor-adp.dtsi"
		#include "msm8996-camera-sensor-cdp.dtsi"
		#include "msm8996-wsa881x.dtsi"

		/ {
		@@ -28,6 +28,10 @@
		};
		};

		&eeprom0 {
		status = "disabled";
		};

		&ufs_ice {
		status = "ok";
		};
		@@ -692,6 +696,10 @@
		pinctrl-0 = <&quat_tdm_dout_active>;
		pinctrl-1 = <&quat_tdm_dout_sleep>;
		};

		qcom,msm-ssc-sensors {
		status = "disabled";
		};
		};

		&pm8994_gpios {