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

Commit b9168d4f authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 52e4dad7 on remote branch 

Change-Id: Ice6e40e6489e06eeb2fe095664eea073a6ad4c2a
parents c5470df8 52e4dad7

qcom/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -453,7 +453,8 @@ dtb-$(CONFIG_ARCH_SDXLEMUR) += sdxlemur-rumi.dtb \ 
	sdxlemur-v2-mtp-mbb-m2-ep-usb.dtb \

	sdxlemur-v2-mtp-mbb-m2-ep.dtb \

	sdxlemur-v2-rcm-rc-pine1x.dtb \

	sdxlemur-v2-rcm-rc-pine2x.dtb

	sdxlemur-v2-rcm-rc-pine2x.dtb \

	sdxlemur-v2-m2-ep-fwa.dtb

qcom/blair-cdp.dtsi

+4 −1
Original line number Diff line number Diff line
@@ -309,6 +309,9 @@ 
		pinctrl-0 = <&ts_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&pmx_ts_release>;



		panel = <&dsi_r66451_amoled_cmd

			&dsi_r66451_amoled_video>;

	};



	novatek@62 {

qcom/sdxlemur-mtp-cpe.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ 
				/* ipa shares this group */

				qcom,iommu-group = <&ipa_eth_group2>;

				phy-supply = <&qca_vreg>;

				qcom,phy-rst-delay-us = <0>;

				qcom,phy-rst-delay-us = <20000>;



				#address-cells = <1>;

				#size-cells = <1>;

qcom/sdxlemur-pcie.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
		vreg-mx-supply = <&VDD_MXA_LEVEL>;



		qcom,vreg-1p8-voltage-level = <1200000 1200000 30000>;

		qcom,vreg-0p9-voltage-level = <912000 912000 132000>;

		qcom,vreg-0p9-voltage-level = <912000 880000 132000>;

		qcom,vreg-cx-voltage-level = <RPMH_REGULATOR_LEVEL_MAX

						RPMH_REGULATOR_LEVEL_LOW_SVS 0>;

		qcom,vreg-mx-voltage-level = <RPMH_REGULATOR_LEVEL_MAX

qcom/sdxlemur-regulators.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -217,9 +217,9 @@ 
		L4B: pmx65_l4: regulator-pmx65-l4 {

			regulator-name = "pmx65_l4";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

			regulator-min-microvolt = <912000>;

			regulator-min-microvolt = <880000>;

			regulator-max-microvolt = <912000>;

			qcom,init-voltage = <912000>;

			qcom,init-voltage = <880000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_HPM>;

		};

	};