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

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

Merge 212ab2d0 on remote branch 

Change-Id: I810759db2820549a67e08571a2b8f8c60ff81908
parents ccfddb10 212ab2d0

bindings/pci/pci-msm.txt

+5 −0
Original line number Diff line number Diff line
@@ -407,6 +407,11 @@ interconnects: 
	Usage: optional

	Value type: <u32 array of bdfs>

	Definition: Skip enumeration for the list of 32-bit BDFs.

- qcom,config-recovery:

	Usage: optional

	Value type : <bool>

	Definition: Enable to notify the client driver for recovery when

		config space is not accessible



==============

Root port node

qcom/blair-atp.dtsi

+40 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <dt-bindings/input/linux-event-codes.h>

#include "holi-pmic-overlay.dtsi"

#include "display/holi-sde-display-atp.dtsi"

#include "display/blair-sde-display-atp.dtsi"

#include "holi-thermal-overlay.dtsi"

#include <dt-bindings/iio/qti_power_supply_iio.h>
@@ -354,6 +355,7 @@ 


	/* Enable mx_cdev for PM6350 */

	rpm-regulator-smpa5 {

		proxy-supply = <&S5A_LEVEL>;

		regulator-s5-level {

			status = "okay";

		};
@@ -373,10 +375,44 @@ 


	/* Enable mx_cdev for PM6150A */

	rpm-regulator-smpe1 {

		regulator-s1-level {

			status = "okay";

		};



		regulator-s1-floor-level {

			status = "okay";

		};



		regulator-s1-level-ao {

			status = "okay";

		};



		cx-cdev-lvl {

			status = "okay";

		};

	};



	/* VDD_LPI_CX supply */

	rpm-regulator-ldoa1 {

		regulator-l1-level {

			status = "okay";

		};

	};



	rpm-regulator-ldoa3 {

		proxy-supply = <&pm6350_l3>;

	};



	rpm-regulator-ldoa8 {

		proxy-supply = <&pm6350_l8>;

	};



	/* VDD_LPI_MX supply */

	rpm-regulator-ldoa17 {

		regulator-l17-level {

			status = "okay";

		};

	};

};
@@ -707,6 +743,10 @@ 
	qcom,bt-vdd-xtal-supply = <&L7A>; /* XO */

};



&mdss_dsi0 {

	vdda-1p2-supply = <&L22A>;

};



&mdss_dsi_phy0 {

	vdda-0p9-supply = <&S5A_LEVEL>;

};

qcom/blair-qrd.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ 
		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM2_100K_PU>;

		disable-thermal-zone;

		trips {

			battery_trip0: battery-trip0 {

				temperature = <42000>;
@@ -349,6 +350,7 @@ 
		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM1_100K_PU>;

		disable-thermal-zone;

		trips {

			modem_trip0: modem-trip0 {

				temperature = <46000>;
@@ -392,6 +394,7 @@ 
		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM1_100K_PU>;

		disable-thermal-zone;

		trips {

			modem_pa_fr1_trip0: modem-pa-fr1-trip0 {

				temperature = <45000>;

qcom/blair-usb.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -106,9 +106,9 @@ 
		resets = <&gcc GCC_QUSB2PHY_PRIM_BCR>;

		reset-names = "phy_reset";

		qcom,param-override-seq =

			<0x61 0x6c	/* override_x0 */

			 0x43 0x70	/* override_x1 */

			 0x2e 0x74>;	/* override x2 */

			<0xa6 0x6c	/* override_x0 */

			 0x85 0x70	/* override_x1 */

			 0x16 0x74>;	/* override x2 */

	};



	/* Primary USB port related QMP USB DP Combo PHY */

qcom/blair.dtsi

+12 −22
Original line number Diff line number Diff line
@@ -283,12 +283,7 @@ 


	xbl_aop_mem: xbl_aop_mem@80700000 {

		no-map;

		reg = <0x0 0x80700000 0x0 0x160000>;

	};



	cmd_db: reserved-memory@80860000 {

		no-map;

		reg = <0x0 0x80860000 0x0 0x20000>;

		reg = <0x0 0x80700000 0x0 0x100000>;

	};



	reserved_xbl_uefi: reserved_xbl_uefi@80880000 {
@@ -318,37 +313,32 @@ 


	pil_adsp_mem: adsp@86700000 {

		no-map;

		reg = <0x0 0x86700000 0x0 0x2800000>;

	};



	pil_cdsp_mem: cdsp@88f00000 {

		no-map;

		reg = <0x0 0x88f00000 0x0 0x1e00000>;

		reg = <0x0 0x86700000 0x0 0x2000000>;

	};



	pil_camera_mem: camera@8ad00000 {

	pil_cdsp_mem: cdsp@88700000 {

		no-map;

		reg = <0x0 0x8ad00000 0x0 0x500000>;

		reg = <0x0 0x88700000 0x0 0x1e00000>;

	};



	pil_video_mem: video@8b200000 {

	pil_video_mem: video@8a500000 {

		no-map;

		reg = <0x0 0x8b200000 0x0 0x500000>;

		reg = <0x0 0x8a500000 0x0 0x500000>;

	};



	pil_ipa_fw_mem: ipa_fw@8b700000 {

	pil_ipa_fw_mem: ipa_fw@8aa00000 {

		no-map;

		reg = <0x0 0x8b700000 0x0 0x10000>;

		reg = <0x0 0x8aa00000 0x0 0x10000>;

	};



	pil_ipa_gsi_mem: ipa_gsi@8b710000 {

	pil_ipa_gsi_mem: ipa_gsi@8aa10000 {

		no-map;

		reg = <0x0 0x8b710000 0x0 0xa000>;

		reg = <0x0 0x8aa10000 0x0 0xa000>;

	};



	pil_gpu_micro_code_mem: gpu_micro_code@8b71a000 {

	pil_gpu_micro_code_mem: gpu_micro_code@8aa1a000 {

		no-map;

		reg = <0x0 0x8b71a000 0x0 0x2000>;

		reg = <0x0 0x8aa1a000 0x0 0x2000>;

	};



	pil_mpss_wlan_mem: mpss_wlan@8b800000 {