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

Commit fd57658d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes Ia80c0854,Ie0c4dfd1 into msm-4.14 

* changes:
  defconfig: msm: Enable TSENS driver for sdmshrike
  ARM: dts: msm: Enable TSENS for sdmshrike
parents 7fd17cbc 02894714

arch/arm64/boot/dts/qcom/sdmshrike.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -529,6 +529,28 @@ 
		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	tsens0: tsens@c222000 {

		compatible = "qcom,tsens24xx";

		reg = <0xc222000 0x4>,

			<0xc263000 0x1ff>;

		reg-names = "tsens_srot_physical",

				"tsens_tm_physical";

		interrupts = <0 506 0>, <0 508 0>;

		interrupt-names = "tsens-upper-lower", "tsens-critical";

		#thermal-sensor-cells = <1>;

	};



	tsens1: tsens@c223000 {

		compatible = "qcom,tsens24xx";

		reg = <0xc223000 0x4>,

			<0xc265000 0x1ff>;

		reg-names = "tsens_srot_physical",

			"tsens_tm_physical";

		interrupts = <0 507 0>, <0 509 0>;

		interrupt-names = "tsens-upper-lower", "tsens-critical";

		#thermal-sensor-cells = <1>;

	};

};



&emac_gdsc {

arch/arm64/configs/sdmshrike-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -242,6 +242,8 @@ CONFIG_SPMI=y 
CONFIG_GPIO_SYSFS=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_THERMAL=y

CONFIG_THERMAL_TSENS=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

arch/arm64/configs/sdmshrike_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -249,6 +249,8 @@ CONFIG_SPMI=y 
CONFIG_GPIO_SYSFS=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_THERMAL=y

CONFIG_THERMAL_TSENS=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y