Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8abc987 authored by taojiang's avatar taojiang Committed by guyang
Browse files

ARM: dts: msm: bring up s5k3p9sx04 for spyro device 



update GPIO and LDO configuration

Change-Id: I7aef02f8d181f369854b0684f43b441bd5f80ace
Signed-off-by: default avatartaojiang <taojiang@codeaurora.org>
Signed-off-by: default avatarGuyang Yang <guyang@codeaurora.org>
parent a0ff78ed

arch/arm64/boot/dts/qcom/sdm429-qrd-spyro-evt.dtsi

+116 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 


#include "sdm439-qrd.dtsi"

#include "sdm429w-pm660.dtsi"

#include "sdm429w-camera-sensor-spyro.dtsi"



&gpio_key_active {

	mux {
@@ -66,9 +65,125 @@ 
	};

};



&cam_sensor_rear_standby {

	/* STANDBY */

	mux {

		/delete-property/ pins;

		pins = "gpio92";

		function = "gpio";

	};



	config {

		/delete-property/ pins;

		pins = "gpio92";

		bias-disable; /* No PULL */

		drive-strength = <2>; /* 2 MA */

	};

};



&cam_sensor_rear_standby_sleep {

	/* STANDBY */

	mux {

		/delete-property/ pins;

		pins = "gpio92";

		function = "gpio";

	};



	config {

		/delete-property/ pins;

		pins = "gpio92";

		bias-disable; /* No PULL */

		drive-strength = <2>; /* 2 MA */

	};

};



&cam_sensor_rear_vana {

	/* VANA */

	mux {

		/delete-property/ pins;

		pins = "gpio58";

		function = "gpio";

	};



	config {

		/delete-property/ pins;

		pins = "gpio58";

		bias-disable; /* No PULL */

		drive-strength = <2>; /* 2 MA */

	};

};



&cam_sensor_rear_vana_sleep {

	/* VANA */

	mux {

		/delete-property/ pins;

		pins = "gpio58";

		function = "gpio";

	};



	config {

		/delete-property/ pins;

		pins = "gpio58";

		bias-disable; /* No PULL */

		drive-strength = <2>; /* 2 MA */

	};

};

&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_hx8399c_hd_vid>;

};

&soc {

	/delete-node/ qcom,cci@1b0c000;

	cci: qcom,cci@1b0c000 {

		status = "ok";

		cell-index = <0>;

		compatible = "qcom,cci";

		reg = <0x1b0c000 0x4000>;

		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "cci";

		interrupts = <0 50 0>;

		interrupt-names = "cci";

		clocks = <&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

			<&clock_gcc clk_cci_clk_src>,

			<&clock_gcc clk_gcc_camss_cci_ahb_clk>,

			<&clock_gcc clk_gcc_camss_cci_clk>,

			<&clock_gcc clk_gcc_camss_ahb_clk>,

			<&clock_gcc clk_gcc_camss_top_ahb_clk>;

		clock-names = "ispif_ahb_clk", "cci_src_clk",

			"cci_ahb_clk", "camss_cci_clk",

			"camss_ahb_clk", "camss_top_ahb_clk";

		qcom,clock-rates = <61540000 19200000 0 0 0 0>,

				<61540000 37500000 0 0 0 0>;

		pinctrl-names = "cci_default", "cci_suspend";

			pinctrl-0 = <&cci0_active &cci1_active>;

			pinctrl-1 = <&cci0_suspend &cci1_suspend>;

		gpios = <&tlmm 29 0>,

			<&tlmm 30 0>,

			<&tlmm 31 0>,

			<&tlmm 32 0>;

		qcom,gpio-tbl-num = <0 1 2 3>;

		qcom,gpio-tbl-flags = <1 1 1 1>;

		qcom,gpio-tbl-label = "CCI_I2C_DATA0",

						"CCI_I2C_CLK0",

						"CCI_I2C_DATA1",

						"CCI_I2C_CLK1";

		i2c_freq_100Khz: qcom,i2c_standard_mode {

			status = "disabled";

		};

		i2c_freq_400Khz: qcom,i2c_fast_mode {

			status = "disabled";

		};

		i2c_freq_custom: qcom,i2c_custom_mode {

			status = "disabled";

		};



		i2c_freq_1Mhz: qcom,i2c_fast_plus_mode {

			status = "disabled";

		};

	};

};



#include "sdm429w-camera-sensor-spyro.dtsi"



&i2c_5 {

	status = "disabled";

arch/arm64/boot/dts/qcom/sdm429w-camera-sensor-spyro.dtsi

+21 −17
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
		cam_vaf-supply = <&pm660_l19>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-min-voltage = <2850000>;

		qcom,cam-vreg-max-voltage = <2850000>;

		qcom,cam-vreg-max-voltage = <3200000>;

		qcom,cam-vreg-op-mode = <80000>;

	};
@@ -56,10 +56,10 @@ 
		reg = <0x1>;

		compatible = "qcom,actuator";

		qcom,cci-master = <0>;

		cam_vaf-supply = <&pm660_l17>;

		cam_vaf-supply = <&pm660_l19>;

		qcom,cam-vreg-name = "cam_vaf";

		qcom,cam-vreg-min-voltage = <2850000>;

		qcom,cam-vreg-max-voltage = <2850000>;

		qcom,cam-vreg-max-voltage = <3200000>;

		qcom,cam-vreg-op-mode = <80000>;

	};
@@ -75,7 +75,7 @@ 
		qcom,cam-vreg-name = "cam_vana", "cam_vio",

					"cam_vdig", "cam_vaf";

		qcom,cam-vreg-min-voltage = <2800000 0 1200000 2850000>;

		qcom,cam-vreg-max-voltage = <2800000 0 1200000 2850000>;

		qcom,cam-vreg-max-voltage = <2800000 0 1200000 3200000>;

		qcom,cam-vreg-op-mode = <80000 0 200000 100000>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_default
@@ -149,7 +149,7 @@ 
		qcom,cam-vreg-name = "cam_vdig", "cam_vio",

				"cam_vana", "cam_vaf";

		qcom,cam-vreg-min-voltage = <1200000 0 2800000 2850000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2800000 2850000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2800000 3200000>;

		qcom,cam-vreg-op-mode = <105000 0 80000 100000>;

		qcom,gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";
@@ -192,32 +192,36 @@ 
		//qcom,led-flash-src = <&led_flash0>;

		//qcom,eeprom-src = <&eeprom_spyro0>;

		qcom,actuator-src = <&actuator_spyro0>;

		cam_vana-supply = <&pm660_l6>;

		cam_vio-supply = <&pm660_l14>;

		cam_vaf-supply = <&pm660_l19>;

		cam_vaf-supply = <&L19A>;

		cam_vdig-supply = <&pm660_l2>;

		qcom,cam-vreg-name = "cam_vana", "cam_vio",

				"cam_vdig", "cam_vaf";

		qcom,cam-vreg-min-voltage = <2800000 0 1200000 2850000>;

		qcom,cam-vreg-max-voltage = <2800000 0 1200000 2850000>;

		qcom,cam-vreg-max-voltage = <2800000 0 1200000 3200000>;

		qcom,cam-vreg-op-mode = <80000 0 200000 100000>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk0_default

				&cam_sensor_rear_reset

				&cam_sensor_rear_vana>;

				&cam_sensor_rear_vana

				&cam_sensor_rear_standby>;

		pinctrl-1 = <&cam_sensor_mclk0_sleep

				&cam_sensor_rear_reset_sleep

				&cam_sensor_rear_vana_sleep>;

				&cam_sensor_rear_vana_sleep

				&cam_sensor_rear_standby_sleep>;

		gpios = <&tlmm 26 0>,

			<&tlmm 36 0>,

			<&tlmm 58 0>;

			<&tlmm 58 0>,

			<&tlmm 92 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vana = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-standby = <3>;

		qcom,gpio-req-tbl-num = <0 1 2 3>;

		qcom,gpio-req-tbl-flags = <1 0 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK0",

			"CAM_RESET0",

			"CAM_VANA";

			"CAM_VANA",

			"CAM_STANDBY";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;
@@ -241,7 +245,7 @@ 
		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",

							"cam_vaf";

		qcom,cam-vreg-min-voltage = <1200000 0 2800000 2850000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2800000 2850000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2800000 3200000>;

		qcom,cam-vreg-op-mode = <200000 0 80000 100000>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk1_default
@@ -282,11 +286,11 @@ 
		cam_vdig-supply = <&pm660_l3>;

		cam_vana-supply = <&pm660_l7>;

		cam_vio-supply = <&pm660_l6>;

		cam_vaf-supply = <&pm660_l17>;

		cam_vaf-supply = <&pm660_l19>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",

					"cam_vaf";

		qcom,cam-vreg-min-voltage = <1200000 0 2800000 2850000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2800000 2850000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2800000 3200000>;

		qcom,cam-vreg-op-mode = <105000 0 80000 100000>;

		qcom,gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

arch/arm64/boot/dts/qcom/sdm429w-pm660.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -205,14 +205,23 @@ 


	qcom,csid@1b30000 {

		/delete-property/ qcom,mipi-csi-vdd-supply;

		/delete-property/ qcom,csi-vdd-voltage;

		qcom,csi-vdd-voltage = <928000>;

		qcom,mipi-csi-vdd-supply = <&pm660_l6>;

	};



	qcom,csid@1b30400 {

		/delete-property/ qcom,mipi-csi-vdd-supply;

		/delete-property/ qcom,csi-vdd-voltage;

		qcom,csi-vdd-voltage = <928000>;

		qcom,mipi-csi-vdd-supply = <&pm660_l6>;

	};



	qcom,csid@1b30800 {

		/delete-property/ qcom,mipi-csi-vdd-supply;

		/delete-property/ qcom,csi-vdd-voltage;

		qcom,csi-vdd-voltage = <928000>;

		qcom,mipi-csi-vdd-supply = <&pm660_l6>;

	};



	sound {