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

Commit d46dc6c8 authored by Komal Bajaj's avatar Komal Bajaj
Browse files

ARM: dts: msm: Realign device tree nodes for Khaje 

Moving required device tree nodes from bengal to Khaje.

Change-Id: I0f8978531c232636633cd01c024a8ce33b3c8543
parent 72407570

qcom/khaje-idp-nopmi.dtsi

+35 −1
Original line number Original line Diff line number Diff line 
#include "bengal-idp-nopmi.dtsi"
 
#include "khaje-idp.dtsi"



&sde_dsi {

	/delete-property/ lab-supply;

	/delete-property/ ibb-supply;

};



&dsi_td4330_truly_v2_video {

	/delete-property/ qcom,esd-check-enabled;

};



&dsi_td4330_truly_v2_cmd {

	/delete-property/ qcom,esd-check-enabled;

};



&qupv3_se2_i2c {

	synaptics_tcm@20 {

		status = "disabled";

	};



	novatek@62 {

		status = "disabled";

	};



	focaltech@38 {

		status = "disabled";

	};

};



&usb0 {

	/delete-property/ extcon;

	dwc3@4e00000 {

		dr_mode = "peripheral";

	};

};

qcom/khaje-idp-pm7250b.dtsi

+0 −18
Original line number Original line Diff line number Diff line 
#include "khaje-pm7250b.dtsi"

#include "khaje-pm7250b.dtsi"





&led_flash_rear {

	/delete-property/ flash-source;

	/delete-property/ torch-source;

	/delete-property/ switch-source;

};



&led_flash_rear_aux {

	/delete-property/ flash-source;

	/delete-property/ torch-source;

	/delete-property/ switch-source;

};



&led_flash_rear_aux2 {

	/delete-property/ flash-source;

	/delete-property/ torch-source;

	/delete-property/ switch-source;

};



&sde_dsi {

&sde_dsi {

	/delete-property/ lab-supply;

	/delete-property/ lab-supply;

	/delete-property/ ibb-supply;

	/delete-property/ ibb-supply;

qcom/khaje-idp.dtsi

+360 −1
Original line number Original line Diff line number Diff line 
#include "bengal-idp.dtsi"
 
#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/iio/qcom,spmi-vadc.h>

#include <dt-bindings/input/input.h>

#include "bengal-audio-overlay.dtsi"

#include "bengal-thermal-overlay.dtsi"

#include "bengal-sde-display.dtsi"



&qupv3_se1_i2c {

	status = "ok";

	#include "smb1355.dtsi"

};



&qupv3_se4_2uart {

	status = "ok";

};



&pm6125_vadc {

	pinctrl-0 = <&camera_therm_default &emmc_therm_default &rf_pa1_therm_default>;



	rf_pa1_therm {

		reg = <ADC_GPIO4_PU2>;

		label = "rf_pa1_therm";

		qcom,ratiometric;

		qcom,hw-settle-time = <200>;

		qcom,pre-scaling = <1 1>;

	};

};



&pm6125_adc_tm {

	io-channels = <&pm6125_vadc ADC_AMUX_THM1_PU2>,

			<&pm6125_vadc ADC_AMUX_THM2_PU2>,

			<&pm6125_vadc ADC_XO_THERM_PU2>,

			<&pm6125_vadc ADC_GPIO4_PU2>;



	rf_pa1_therm {

		reg = <ADC_GPIO4_PU2>;

		qcom,ratiometric;

		qcom,hw-settle-time = <200>;

	};

};



&thermal_zones {

	rf-pa1-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm6125_adc_tm ADC_GPIO4_PU2>;

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};

};



&pm6125_gpios {



	rf_pa1_therm {

		rf_pa1_therm_default: rf_pa1_therm_default {

			pins = "gpio7";

			 bias-high-impedance;

		};

	};



	key_vol_up {

		key_vol_up_default: key_vol_up_default {

			pins = "gpio5";

			function = "normal";

			input-enable;

			bias-pull-up;

			power-source = <0>;

		};

	};

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";

		label = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&key_vol_up_default>;



		vol_up {

			label = "volume_up";

			gpios = <&pm6125_gpios 5 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_VOLUMEUP>;

			linux,can-disable;

			debounce-interval = <15>;

			gpio-key,wakeup;

		};

	};

};



&qupv3_se1_i2c {

	status = "ok";

	#address-cells = <1>;

	#size-cells = <0>;

	nq@28 {

		compatible = "qcom,nq-nci";

		reg = <0x28>;

		qcom,nq-irq = <&tlmm 70 0x00>;

		qcom,nq-ven = <&tlmm 69 0x00>;

		qcom,nq-firm = <&tlmm 31 0x00>;

		qcom,nq-clkreq = <&tlmm 86 0x00>;

		interrupt-parent = <&tlmm>;

		interrupts = <70 0>;

		interrupt-names = "nfc_irq";

		pinctrl-names = "nfc_active", "nfc_suspend";

		pinctrl-0 = <&nfc_int_active &nfc_enable_active

				&nfc_clk_req_active>;

		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend

				&nfc_clk_req_suspend>;

	};

};



&tlmm {

	smb_int_default: smb_int_default {

		mux {

			pins = "gpio105";

			function = "gpio";

		};



		config {

			pins = "gpio105";

			bias-pull-up;

			input-enable;

		};

	};

};



&sdhc_1 {

	vdd-supply = <&L24A>;

	qcom,vdd-voltage-level = <2960000 2960000>;

	qcom,vdd-current-level = <0 570000>;



	vdd-io-supply = <&L11A>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,vdd-io-current-level = <0 325000>;



	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on

					&sdc1_rclk_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off

					&sdc1_rclk_off>;



	status = "ok";

};



&sdhc_2 {

	vdd-supply = <&L22A>;

	qcom,vdd-voltage-level = <2960000 2960000>;

	qcom,vdd-current-level = <0 800000>;



	vdd-io-supply = <&L5A>;

	qcom,vdd-io-voltage-level = <1800000 2960000>;

	qcom,vdd-io-current-level = <0 22000>;



	vdd-io-bias-supply = <&L7A>;

	qcom,vdd-io-bias-voltage-level = <1256000 1256000>;

	qcom,vdd-io-bias-current-level = <0 6000>;



	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;



	cd-gpios = <&tlmm 88 GPIO_ACTIVE_LOW>;



	status = "ok";

};



&ufsphy_mem {

	compatible = "qcom,ufs-phy-qmp-v3-660";



	vdda-phy-supply = <&L4A>; /* 0.9v */

	vdda-pll-supply = <&L12A>; /* 1.8v */

	vdda-phy-max-microamp = <51400>;

	vdda-pll-max-microamp = <14200>;



	status = "ok";

};



&ufshc_mem {

	vdd-hba-supply = <&gcc_ufs_phy_gdsc>;

	vdd-hba-fixed-regulator;

	vcc-supply = <&L24A>;

	vcc-voltage-level = <2950000 2960000>;

	vccq2-supply = <&L11A>;

	vcc-max-microamp = <600000>;

	vccq2-max-microamp = <600000>;

	vccq2-pwr-collapse-sup;



	qcom,vddp-ref-clk-supply = <&L18A>;

	qcom,vddp-ref-clk-max-microamp = <100>;

	qcom,vddp-ref-clk-min-uV = <1232000>;

	qcom,vddp-ref-clk-max-uV = <1232000>;



	status = "ok";

};



&pm6125_pwm {

	status = "ok";

};



&dsi_td4330_truly_v2_video {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";

	pwms = <&pm6125_pwm 0 0>;

	qcom,bl-pmic-pwm-period-usecs = <100>;

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,platform-reset-gpio = <&tlmm 82 0>;

};



&dsi_td4330_truly_v2_cmd {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";

	pwms = <&pm6125_pwm 0 0>;

	qcom,bl-pmic-pwm-period-usecs = <100>;

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,platform-te-gpio = <&tlmm 81 0>;

	qcom,platform-reset-gpio = <&tlmm 82 0>;

};



&dsi_nt36525_truly_video {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";

	pwms = <&pm6125_pwm 0 0>;

	qcom,bl-pmic-pwm-period-usecs = <100>;

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,platform-reset-gpio = <&tlmm 82 0>;

};



&dsi_r66451_amoled_hd_90hz_video {

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,platform-reset-gpio = <&tlmm 82 0>;

	qcom,platform-en-gpio = <&tlmm 83 0>;

};



&dsi_r66451_amoled_hd_90hz_cmd {

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,platform-te-gpio = <&tlmm 81 0>;

	qcom,platform-reset-gpio = <&tlmm 82 0>;

	qcom,platform-en-gpio = <&tlmm 83 0>;

};



&sde_dsi {

	qcom,dsi-default-panel = <&dsi_td4330_truly_v2_video>;

};



&tlmm {

	touch_vdd_default: touch_vdd_default {

		mux {

			pins = "gpio84";

			function = "gpio";

		};



		config {

			pins = "gpio84";

			drive-strength = <8>;

			bias-disable = <0>;

			output-high;

		};

	};

};



&soc {

	touch_vdd: touch_vdd {

			compatible = "regulator-fixed";

			regulator-name = "touch_vdd";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			gpio = <&tlmm 84 GPIO_ACTIVE_HIGH>;

			enable-active-high;

			pinctrl-names = "default";

			pinctrl-0 = <&touch_vdd_default>;

	};

};



&qupv3_se2_i2c {

	status = "okay";

	qcom,i2c-touch-active="synaptics,tcm-i2c";



	synaptics_tcm@20 {

		compatible = "synaptics,tcm-i2c";

		reg = <0x20>;

		interrupt-parent = <&tlmm>;

		interrupts = <80 0x2008>;

		pinctrl-names = "pmx_ts_active","pmx_ts_suspend",

			"pmx_ts_release";

		pinctrl-0 = <&ts_int_active &ts_reset_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&ts_release>;

		synaptics,irq-gpio = <&tlmm 80 0x2008>;

		synaptics,irq-on-state = <0>;

		synaptics,reset-gpio = <&tlmm 71 0x00>;

		synaptics,reset-on-state = <0>;

		synaptics,reset-active-ms = <20>;

		synaptics,reset-delay-ms = <200>;

		synaptics,power-delay-ms = <200>;

		synaptics,ubl-i2c-addr = <0x20>;

		synaptics,extend_report;

		synaptics,firmware-name = "synaptics_firmware_k.img";



		panel = <&dsi_td4330_truly_v2_video &dsi_td4330_truly_v2_cmd>;

	};



	novatek@62 {

		compatible = "novatek,NVT-ts";

		reg = <0x62>;

		status = "ok";



		interrupt-parent = <&tlmm>;

		interrupts = <80 0x2008>;

		pinctrl-names = "pmx_ts_active","pmx_ts_suspend",

			"pmx_ts_release";

		pinctrl-0 = <&ts_int_active &ts_reset_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&ts_release>;



		novatek,reset-gpio = <&tlmm 71 0x00>;

		novatek,irq-gpio = <&tlmm 80 0x2008>;



		panel = <&dsi_nt36525_truly_video>;

	};



	focaltech@38 {

		compatible = "focaltech,fts_ts";

		reg = <0x38>;

		interrupt-parent = <&tlmm>;

		interrupts = <80 0x2008>;

		focaltech,reset-gpio = <&tlmm 71 0x00>;

		focaltech,irq-gpio = <&tlmm 80 0x2008>;

		focaltech,max-touch-number = <5>;

		focaltech,display-coords = <0 0 1080 2340>;



		vdd-supply = <&touch_vdd>;



		pinctrl-names = "pmx_ts_active","pmx_ts_suspend",

			"pmx_ts_release";

		pinctrl-0 = <&ts_int_active &ts_reset_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&ts_release>;



		panel = <&dsi_r66451_amoled_hd_90hz_video

			 &dsi_r66451_amoled_hd_90hz_cmd>;

	};

};