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

Commit 4d994b72 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: thermal: Pass reg base parameter for CX Ipeak hardware init API"

parents fd7097e9 5e742c3a

arch/arm64/boot/dts/qcom/sm6150-thermal.dtsi

+14 −14
Original line number Diff line number Diff line
@@ -396,23 +396,23 @@ 
		thermal-governor = "step_wise";

		thermal-sensors = <&tsens0 1>;

		trips {

			cpu01_config: cpu01-config {

			cpu45_config: cpu45-config {

				temperature = <110000>;

				hysteresis = <10000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu0_cdev {

				trip = <&cpu01_config>;

			cpu4_cdev {

				trip = <&cpu45_config>;

				cooling-device =

					<&CPU0 THERMAL_MAX_LIMIT

					<&CPU4 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			cpu1_cdev {

				trip = <&cpu01_config>;

			cpu5_cdev {

				trip = <&cpu45_config>;

				cooling-device =

					<&CPU1 THERMAL_MAX_LIMIT

					<&CPU5 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};
@@ -452,23 +452,23 @@ 
		thermal-sensors = <&tsens0 3>;

		thermal-governor = "step_wise";

		trips {

			cpu45_config: cpu45-config {

			cpu01_config: cpu01-config {

				temperature = <110000>;

				hysteresis = <10000>;

				type = "passive";

			};

		};

		cooling-maps {

			cpu4_cdev {

				trip = <&cpu45_config>;

			cpu0_cdev {

				trip = <&cpu01_config>;

				cooling-device =

					<&CPU4 THERMAL_MAX_LIMIT

					<&CPU0 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

			cpu5_cdev {

				trip = <&cpu45_config>;

			cpu1_cdev {

				trip = <&cpu01_config>;

				cooling-device =

					<&CPU5 THERMAL_MAX_LIMIT

					<&CPU1 THERMAL_MAX_LIMIT

						THERMAL_MAX_LIMIT>;

			};

		};

drivers/thermal/qcom/cx_ipeak_cdev.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static int cxip_lm_cdev_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



	cxip_lm_initialize_cxip_hw(cxip_dev);

	cxip_lm_initialize_cxip_hw(cxip_dev->cx_ip_reg_base);



	/* Set thermal vote till we get first vote from TF */

	cxip_dev->state = true;