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

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

Merge "drivers: thermal: bcl-pmic5: clean up PMIC v5 BCL driver"

parents 1f10e695 e49406e7

Documentation/devicetree/bindings/thermal/qcom-bcl-pmic5.txt

+9 −9
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ with the multiple BCL peripherals. 


Required Parameters:

- compatible: must be

	'qcom,msm-bcl-pmic5' for bcl peripheral in PMIC version 5.

	'qcom,bcl-v5' for bcl peripheral in PMIC version 5.

- reg: <a b> where 'a' is the starting register address of the PMIC

	peripheral and 'b' is the size of the peripheral address space.

- interrupts: <a b c> Where 'a' is the SLAVE ID of the PMIC, 'b' is
@@ -28,8 +28,8 @@ Required Parameters: 


Example:

	bcl@4200 {

			compatible = "qcom,msm-bcl-pmic5";

			reg = <0x4200 0xFF>;

		compatible = "qcom,bcl-v5";

		reg = <0x4200 0x100>;

		interrupts = <0x2 0x42 0x0>,

				<0x2 0x42 0x1>;

		interrupt-names = "bcl-high-ibat",

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

+2 −2
Original line number Diff line number Diff line
@@ -414,8 +414,8 @@ 
		};



		bcl_sensor: bcl@3d00 {

			compatible = "qcom,msm-bcl-pmic5";

			reg = <0x3d00 0xff>;

			compatible = "qcom,bcl-v5";

			reg = <0x3d00 0x100>;

			interrupts = <0x2 0x3d 0x0 IRQ_TYPE_NONE>,

					<0x2 0x3d 0x1 IRQ_TYPE_NONE>;

			interrupt-names = "bcl-high-ibat",

arch/arm64/configs/msm8953-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ CONFIG_THERMAL_TSENS=y 
CONFIG_QTI_VIRTUAL_SENSOR=y

CONFIG_QTI_QMI_COOLING_DEVICE=y

CONFIG_REGULATOR_COOLING_DEVICE=y

CONFIG_MSM_BCL_PMIC5=y

CONFIG_QTI_BCL_PMIC5=y

CONFIG_QTI_BCL_SOC_DRIVER=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

arch/arm64/configs/msm8953_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ CONFIG_THERMAL_TSENS=y 
CONFIG_QTI_VIRTUAL_SENSOR=y

CONFIG_QTI_QMI_COOLING_DEVICE=y

CONFIG_REGULATOR_COOLING_DEVICE=y

CONFIG_MSM_BCL_PMIC5=y

CONFIG_QTI_BCL_PMIC5=y

CONFIG_QTI_BCL_SOC_DRIVER=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

drivers/thermal/qcom/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ config REGULATOR_COOLING_DEVICE 


	  If you want this support, you should say Y here.



config MSM_BCL_PMIC5

config QTI_BCL_PMIC5

	bool "BCL driver for BCL peripherals in PMIC5"

	depends on SPMI && THERMAL_OF

	help