Merge "ARM: dts: msm: Update CCI voltage range for MSM8996pro automotive" (d1bf5a8e) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+57 −10

Original line number	Diff line number	Diff line
		@@ -1098,17 +1098,58 @@
		pinctrl-0 = <&quat_tdm_dout_active>;
		pinctrl-1 = <&quat_tdm_dout_sleep>;
		};

		qcom,adv7481@70 {
		compatible = "qcom,adv7481";
		reg = <0x70 0xff>;
		cam_vdig-supply = <&pm8994_s3>;
		/* Cameras powered by PMIC: */
		cam_vio-supply = <&pm8994_lvs1>;
		cam_vana-supply = <&pm8994_l17>;
		/* Self-powered cameras: */
		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
		qcom,cam-vreg-min-voltage = <1300000 0 2500000>;
		qcom,cam-vreg-max-voltage = <1300000 0 2500000>;
		qcom,cam-vreg-op-mode = <105000 0 80000>;

		qcom,cci-master = <0>;
		gpios = <&tlmm 17 0>, /* I2C SDA */
		<&tlmm 18 0>, /* I2C SCL */
		<&pm8994_gpios 4 0>, /* RST */
		<&pm8994_gpios 5 0>, /* INT1 */
		<&pm8994_gpios 6 0>, /* INT2 */
		<&pm8994_gpios 7 0>; /* INT3 */
		};

		qcom,msm-ba {
		compatible = "qcom,msm-ba";
		qcom,ba-input-profile-0 {
		qcom,type = <4>; /* input type */
		qcom,name = "HDMI-1"; /* input name */
		qcom,ba-input = <13>; /* ba input id */
		qcom,ba-output = <0>; /* ba output id */
		qcom,sd-name = "adv7481"; /* sd name */
		qcom,ba-node = <0>; /* ba node */
		qcom,user-type = <1>; /* user type */
		};

		qcom,ba-input-profile-1 {
		qcom,type = <0>; /* input type */
		qcom,name = "CVBS-0"; /* input name */
		qcom,ba-input = <0>; /* ba input id */
		qcom,ba-output = <0>; /* ba output id */
		qcom,sd-name = "adv7481"; /* sd name */
		qcom,ba-node = <1>; /* ba node */
		qcom,user-type = <1>; /* user type */
		};
		};
		};

		&pm8994_gpios {
		gpio@c600 { /* GPIO 7 - NFC DWL REQ */
		qcom,mode = <1>;
		qcom,output-type = <0>;
		qcom,pull = <5>;
		gpio@c600 { /* GPIO 7 - adv7481 INT3 */
		qcom,mode = <0>;
		qcom,vin-sel = <2>;
		qcom,out-strength = <3>;
		qcom,src-sel = <0>;
		qcom,master-en = <1>;
		status = "okay";
		};

		@@ -1159,17 +1200,23 @@
		status = "okay";
		};

		gpio@c300 { /* GPIO 4 */
		qcom,mode = <0>;
		gpio@c300 { /* GPIO 4 - adv7481 RST */
		qcom,mode = <1>;
		qcom,pull = <0>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";
		};

		gpio@c400 { /* GPIO 5 */
		gpio@c400 { /* GPIO 5 - adv7481 INT1 */
		qcom,mode = <0>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";
		};

		gpio@c500 { /* GPIO 6 - adv7481 INT2*/
		qcom,mode = <0>;
		qcom,pull = <0>;
		qcom,vin-sel = <2>;
		qcom,src-sel = <0>;
		status = "okay";

arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts

+5 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,11 @@
		qcom,hotplug-temp-hysteresis = <25>;
		qcom,therm-reset-temp = <119>;
		};

		qcom,adv7481@70 {
		qcom,cam-vreg-min-voltage = <1300000 0 1800000>;
		qcom,cam-vreg-max-voltage = <1300000 0 1800000>;
		};
		};

		&pil_modem {