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

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

Merge 97d1c526 on remote branch 

Change-Id: I15278467b8061a129f5bf8541b28853a55dfffdf
parents be2e5627 97d1c526

bindings/clock/qcom,gcc.txt

+1 −3
Original line number Diff line number Diff line
@@ -32,11 +32,9 @@ Required properties : 
			"qcom,gcc-msm8937"

			"qcom,gcc-sdm429w"

			"qcom,gcc-mdss-msm8937"

			"qcom,gcc-mdss-8917"

			"qcom,gcc-mdss-qm215"

			"qcom,gcc-mdss-sdm429w"

			"qcom,gcc-mdss-sdm429"

			"qcom,gcc-mdss-sdm439"

			"qcom,gcc-mdss-sdm429w"



- reg : shall contain base register location and length

- #clock-cells : shall contain 1

bindings/clock/qcom,rpmcc.txt

+1 −2
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ Required properties : 
			"qcom,rpmcc-msm8996", "qcom,rpmcc"

			"qcom,rpmcc-bengal", "qcom,rpmcc"

			"qcom,rpmcc-sdm660", "qcom,rpmcc"

			"qcom,rpmcc-msm8937", "qcom,rpmcc"

			"qcom,rpmcc-msm8917", "qcom,rpmcc"

			"qcom,rpmcc-sdm439", "qcom,rpmcc"

			"qcom,rpmcc-qm215", "qcom,rpmcc"



- #clock-cells : shall contain 1

bindings/media/video/msm-vidc.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Required properties: 
        - "qcom,bengal-vidc" : Invokes driver specific data for BENGAL.

        - "qcom,lagoon-vidc" : Invokes driver specific data for LAGOON.

        - "qcom,scuba-vidc" : Invokes driver specific data for SCUBA.

        - "qcom,qcs8250-vidc" : Invokes driver specific data for KONA.

Optional properties:

- reg : offset and length of the register set for the device.

- sku-index : sku version of the hardware.

bindings/thermal/qcom-thermal-efprom.txt

0 → 100644
+73 −0
Original line number Diff line number Diff line 
Modify Thermal Zone based on efuse data



This driver is to enable/disable pre-configured thermal

zones selectively at runtime based on efuse data. It uses QFPROM

nvmem cell interface to read efuse data. It supports multiple

efuse condition. If any of the efuse condition fails, driver just

exits with default enabled thermal zones.



Properties:



- compatible:

	Usage: Required

	Value type: <string>

	Definition: shall be "qcom,thermal-qfprom-device".



- nvmem-cells:

	Usage: Required

	Value type: <array of phandle>

	Definition: Array of phandles pointing to a nvmem-cells node

		representing the efuse registers that has information that

		is used to select the right thermal zone to enable.

		Please refer nvmem-cells bindings

		Documentation/devicetree/bindings/nvmem/nvmem.txt and also

		example below.



 nvmem-cell-names:

	Usage: Required

	Value type: <array of string>

	Definition:  Should be array of name for each nvmem-cells phandle data.

		Please refer nvmem-cells bindings

		Documentation/devicetree/bindings/nvmem/nvmem.txt and also

		example below.



- qcom,thermal-qfprom-bit-values: It should be array of bit mask values to

		match with each nvmem-cells bit value respectively. If all

		nvmem-cells values are matching with respective bit mask value

		from this property, then driver will update thermal zones as

		per thermal zones mentioned in 'qcom,thermal-zone-enable-list'

		and 'qcom,thermal-zone-disable-list'.



- qcom,thermal-zone-enable-list:

	Usage: Required

	Value type: <array of strings>

	Definition: Should define this property with list of thermal zone

		names those need to be enabled if nvmem-cells condition is met.



- qcom,thermal-zone-disable-list:

	Usage: Required

	Value type: <array of strings>

	Definition: Should define this property with list of thermal zone

		names those need to be disabled if nvmem-cells condition is met.



Example:

	qcom-thermal-qfprom {

		compatible = "qcom,thermal-qfprom-device";

		nvmem-cells = <&thermal_cpe>, <&thermal_revision>;

		nvmem-cell-names = "cpe", "revision";

		qcom,thermal-qfprom-bit-values = <0x1 0x3>

		qcom,thermal-zone-enable-list = "mdm-core-0-cpe-step",

					"mdm-core-1-cpe-step";

		qcom,thermal-zone-disable-list = "mdm-core-0-step",

					"mdm-core-1-step";

	};



	In this example, driver gets efuse bit values of nvmem-cell register

	for both 'cpe' and 'revision' nvmem cells. It then compares these efuse

	values with property 'qcom,thermal-qfprom-bit-values' values (0x1 and

	0x3 here) respectively. If both efuse values are matching with this

	property values, driver enables thermal zones listed in property

	'qcom,thermal-zone-enable-list' and disables thermal zones listed in

	property 'qcom,thermal-zone-disable-list'. If any of the efuse

	value is not matching with respective 'qcom,thermal-qfprom-bit-values'

	values, driver just exits without modifying any thermal zone.

qcom/Makefile

+21 −1
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
                bengal-rumi-overlay.dtbo \

                bengal-qrd-overlay.dtbo \

                bengal-idp-overlay.dtbo \

                bengal-idp-nopmi-overlay.dtbo \

                bengal-idp-usbc-overlay.dtbo \

                bengalp-idp-overlay.dtbo \

                bengal-idp-1gb-overlay.dtbo \
@@ -150,6 +151,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
bengal-rumi-overlay.dtbo-base := bengal.dtb

bengal-qrd-overlay.dtbo-base := bengal.dtb

bengal-idp-overlay.dtbo-base := bengal.dtb

bengal-idp-nopmi-overlay.dtbo-base := bengal.dtb

bengal-idp-usbc-overlay.dtbo-base := bengal.dtb

bengalp-idp-overlay.dtbo-base := bengalp.dtb

bengal-idp-1gb-overlay.dtbo-base := bengal-1gb.dtb
@@ -168,6 +170,7 @@ else 
dtb-$(CONFIG_ARCH_BENGAL) += bengal-rumi.dtb \

                bengal-qrd.dtb \

		bengal-idp.dtb \

		bengal-idp-nopmi.dtb \

		bengal-idp-usbc.dtb \

		bengalp-idp.dtb \

		bengal-idp-1gb.dtb \
@@ -290,7 +293,12 @@ sdm660-internal-codec-cdp.dtb \ 
endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

dtbo-$(CONFIG_ARCH_SDM439) += sdm439-mtp-overlay.dtbo



dtbo-$(CONFIG_ARCH_SDM439) += sdm439-mtp-overlay.dtbo \

        sdm439-cdp-overlay.dtbo \

        sdm439-qrd-overlay.dtbo \

        sdm439-external-codec-mtp-overlay.dtbo \

        sdm439-rcm-overlay.dtbo



dtbo-$(CONFIG_ARCH_SDM429) += sdm429-mtp-overlay.dtbo \

	sdm429-cdp-overlay.dtbo \
@@ -299,10 +307,22 @@ dtbo-$(CONFIG_ARCH_SDM429) += sdm429-mtp-overlay.dtbo \ 
dtbo-$(CONFIG_ARCH_QM215) +=qm215-qrd-overlay.dtbo \

	qcm2150-qrd-overlay.dtbo \

	qm215-qrd-smb1360-overlay.dtbo



sdm439-mtp-overlay.dtbo-base := sdm439.dtb \

	sda439.dtb \

	msm8937-interposer-sdm439.dtb



sdm439-cdp-overlay.dtbo-base := sdm439.dtb \

        sda439.dtb \

        msm8937-interposer-sdm439.dtb



sdm439-qrd-overlay.dtbo-base := sdm439.dtb \

        msm8937-interposer-sdm439.dtb



sdm439-external-codec-mtp-overlay.dtbo-base := sdm439.dtb

sdm439-rcm-overlay.dtbo-base := sdm439.dtb





sdm429-mtp-overlay.dtbo-base := sdm429.dtb \

	sda429.dtb \

	msm8937-interposer-sdm429.dtb