Merge "DOWNSTREAM: Merge commit 'f526258c529fcdf0c6b9d3047df5beac2420aac6'... (b5185952) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/devicetree/bindings/arm/msm/imem.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,12 @@ Required properties:
		-compatible: "qcom,msm-imem-restart_reason
		-reg: start address and size of restart_reason region in imem

		Download Mode Type:
		-------------------
		Required properties:
		-compatible: "qcom,msm-imem-dload-type"
		-reg: start address and size of dload type region in imem

		Download Mode:
		--------------
		Required properties:

+7 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,9 @@ Reports single and double bit errors in the data and tag ram of LLCC.
		4. LLCC AMON Driver:
		Keeps track of the data progress within the internal channels of LLCC.

		5. LLCC Performance Monitor
		Used to monitor the events of LLCC sub blocks.

		== llcc device ==

		Require Properties:
		@@ -107,6 +110,10 @@ Example:
		compatible = "qcom,llcc-amon";
		qcom,fg-cnt = <0x7>;
		};

		qcom,llcc-perfmon {
		compatible = "qcom,llcc-perfmon";
		};
		};

		== Client ==

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ Optional properties:
		- qcom,ce-hw-key : optional, indicates if the hardware supports use of HW KEY.
		- qcom,support-core-clk-only : optional, indicates if the HW supports single crypto core clk.
		- qcom,bsm-ee : optional, indicate the BAM EE value, changes from target to target. Default value is 1 if not specified.
		- qcom,smmu-s1-bypass : Boolean flag to bypass SMMU stage 1 translation.
		- qcom,smmu-s1-enable : Boolean flag to enable SMMU stage 1 translation.
		- iommus : A list of phandle and IOMMU specifier pairs that describe the IOMMU master interfaces of the device.

		Example:

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ Optional properties:
		required. For other targets such as fsm, they do not perform
		bus scaling. It is not required for those targets.

		- qcom,smmu-s1-bypass : Boolean flag to bypass SMMU stage 1 translation.
		- qcom,smmu-s1-enable : Boolean flag to bypass SMMU stage 1 translation.
		- iommus : A list of phandle and IOMMU specifier pairs that describe the IOMMU master interfaces of the device.

		Example:

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ SDM845 platform.
		- compatible:
		Usage: required
		Value type: <string>
		Definition: must be "qcom,sdm845-pinctrl"
		Definition: must be "qcom,sdm845-pinctrl" or "qcom,sdm845-pinctrl-v2"

		- reg:
		Usage: required