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

Commit 021ea4d1 authored by Ankit Sharma's avatar Ankit Sharma Committed by Anirudh Ghayal
Browse files

ARM: dts: msm: Remove PM8909/PM8916 references for msm8909w-BG 



The msm9009w-BG platform is derived from the 8909w platform which
supports PM8916/PM8909. However, 8909w-BG supports PM660, hence
remove all the references of PM8909/PM8916 from the PM660 supported
DT configuration. Touch, eeprom, camera and mdss DT nodes are updated
accordingly.

While at it, change haptics type to ERM for 8909w+PM660 platforms.

Change-Id: I2b9b41d90d481107337d8d8e33ca56de26b01185
Signed-off-by: default avatarAnkit Sharma <ansharma@codeaurora.org>
parent 827c6ada

arch/arm/boot/dts/qcom/msm8909w-bg-wtp-v2.dts

+4 −8
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
&soc {

	i2c@78b9000 { /* BLSP1 QUP5 */

		synaptics@20 {

			status = "disabled";

			synaptics,display-coords = <0 0 479 479>;

			/delete-property/ synaptics,power-down;

			/delete-property/ synaptics,disable-gpios;
@@ -41,12 +42,13 @@ 
		};



		it7260@46 {

			status = "disabled";

			compatible = "ite,it7260_ts";

			reg = <0x46>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <13 0x2008>;

			avdd-supply = <&pm8916_l17>;

			vdd-supply = <&pm8916_l6>;

			/* deleted - avdd-supply */

			/* deleted - vdd-supply */

			/* pins used by touchscreen */

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

							"pmx_ts_release";
@@ -66,12 +68,6 @@ 
			ite,cfg-name = "it7260_cfg_62011E01.bin";

			ite,avdd-lpm-cur = <3000>;

		};



		it7260@46 {

			/* Update with PM660 regulator handles */

			/delete-property/ avdd-supply;

			/delete-property/ vdd-supply;

		};

	};



	qcom,blackghost {

arch/arm/boot/dts/qcom/msm8909w-pm660-mtp.dtsi

+83 −28
Original line number Diff line number Diff line
@@ -11,11 +11,15 @@ 
 * GNU General Public License for more details.

 */



#include "msm-pm660.dtsi"

#include "msm-pm660-rpm-regulator.dtsi"

#include "msm8909w-pm660-regulator.dtsi"



&soc {

	qcom,csid@1b08000 {

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

	};



	qcom,csid@1b08400 {

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

	};



	i2c@78b9000 {

		synaptics@20 {

			/delete-property/ avdd-supply;
@@ -23,13 +27,6 @@ 
		};

	};



	qcom,gcc@1800000 {

		vdd_dig-supply = <&pm660_s2_corner>;

		vdd_sr2_dig-supply = <&pm660_s2_corner_ao>;

		vdd_sr2_pll-supply = <&pm660_l12_ao>;



	};



	qcom,wcnss-wlan@a000000 {

		/delete-property/ qcom,pronto-vddmx-supply;

		/delete-property/ qcom,pronto-vddcx-supply;
@@ -41,14 +38,6 @@ 
		/delete-property/ qcom,wcnss-adc_tm;

	};



	usb@78d9000 {

		hsusb_vdd_dig-supply = <&pm660_l5>;

		HSUSB_1p8-supply = <&pm660_l12>;

		HSUSB_3p3-supply = <&pm660_l16>;

		qcom,hsusb-otg-mode = <1>; /* DEVICE only */

		qcom,hsusb-otg-otg-control = <3>; /* USER */

	};



	qcom,pronto@a21b000 {

		/delete-property/ vdd_pronto_pll-supply;

	};
@@ -86,10 +75,6 @@ 
		/delete-property/ vdd-dig-supply;

	};



	qcom,clock-a7@0b011050 {

		cpu-vdd-supply = <&apc_vreg_corner>;

	};



	vadc@3400 {

		/delete-property/ qcom,adc_tm-vadc;

		/delete-property/ qcom,pmic-revid;
@@ -104,13 +89,40 @@ 
	};

};



&audio_codec_mtp {

	/delete-property/ asoc-codec;

&i2c_1 {

	mpu6050@68 {

		/delete-property/ vdd-supply;

		/delete-property/ vlogic-supply;

	};

};



&sdhc_1 {

	vdd-supply = <&pm660_l19>;

	vdd-io-supply = <&pm660_l13>;

&i2c_3 {

	qcom,actuator@0 {

		/delete-property/ cam_vaf-supply;

	};



	qcom,eeprom@6c {

		/delete-property/ cam_vdig-supply;

		/delete-property/ cam_vana-supply;

		/delete-property/ cam_vio-supply;

		/delete-property/ cam_vaf-supply;

	};



	qcom,camera@0 {

		/delete-property/ cam_vdig-supply;

		/delete-property/ cam_vana-supply;

		/delete-property/ cam_vio-supply;

		/delete-property/ cam_vaf-supply;

	};



	qcom,camera@1 {

		/delete-property/ cam_vana-supply;

		/delete-property/ cam_vio-supply;

	};

};



&audio_codec_mtp {

	/delete-property/ asoc-codec;

};



&sdhc_2 {
@@ -136,3 +148,46 @@ 
&dsi_hx8394d_qhd_vid {

	/delete-property/ qcom,mdss-dsi-pwm-gpio;

};



&soc {

	/delete-node/ qcom,rpm-smd;

	rpm_bus: qcom,rpm-smd {

		compatible = "qcom,rpm-smd";

		rpm-channel-name = "rpm_requests";

		rpm-channel-type = <15>;

	};

};



#include "msm-pm660.dtsi"

#include "msm-pm660-rpm-regulator.dtsi"

#include "msm8909w-pm660-regulator.dtsi"



&soc {

	qcom,gcc@1800000 {

		vdd_dig-supply = <&pm660_s2_corner>;

		vdd_sr2_dig-supply = <&pm660_s2_corner_ao>;

		vdd_sr2_pll-supply = <&pm660_l12_ao>;



	};



	usb@78d9000 {

		hsusb_vdd_dig-supply = <&pm660_l5>;

		HSUSB_1p8-supply = <&pm660_l12>;

		HSUSB_3p3-supply = <&pm660_l16>;

		qcom,hsusb-otg-mode = <1>; /* DEVICE only */

		qcom,hsusb-otg-otg-control = <3>; /* USER */

	};



	qcom,clock-a7@0b011050 {

		cpu-vdd-supply = <&apc_vreg_corner>;

	};

};



&sdhc_1 {

	vdd-supply = <&pm660_l19>;

	vdd-io-supply = <&pm660_l13>;

};



&pm660_haptics {

	qcom,actuator-type = "erm";

};