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

Commit b15484bc authored by Zhiqiang Tu's avatar Zhiqiang Tu
Browse files

Merge remote-tracking branch 'remotes/quic/dev/msm-4.4-8996au' into msm-4.4 



Conflicts:
	arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
	drivers/gpu/drm/msm/Makefile

Change-Id: Ief80c28ff1422fd71a0c3d2041531e2ab078ee7a
Signed-off-by: default avatarZhiqiang Tu <ztu@codeaurora.org>
parents b1980b6b 35ae76d2

Documentation/devicetree/bindings/arm/msm/clock-cpu-8996.txt

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ PLL FMAXes etc. 
Required properties:

- compatible:		Must be either "qcom,cpu-clock-8996" or

			"qcom,cpu-clock-8996-v3" or "qcom,cpu-clock-8996-pro"

			or "qcom,cpu-clock-8996-auto"

- reg:			Pairs of physical base addresses and region sizes of

			memory mapped registers.

- reg-names:		Names of the bases for the above registers. Expected
@@ -39,6 +40,11 @@ Required properties: 
			clock for the CBF.

- cbf-dev:		The CBF cache device to which the OPP table for the

			CBF clock domain will be added.



Optional properties:

- qcom,pwrcl-early-boot-freq:	Power cluster early boot up frequency in HZ.

- qcom,perfcl-early-boot-freq:	Perf cluster early boot up frequency in HZ.



Example:

	clock_cpu: qcom,cpu-clock-8996@ {

		compatible = "qcom,cpu-clock-8996";

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

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ compatible = "qcom,apq8094-fluid" 
compatible = "qcom,apq8094-liquid"

compatible = "qcom,apq8094-mtp"

compatible = "qcom,apq8094-dragonboard"

compatible = "qcom,apq8096-adp"

compatible = "qcom,apq8096-cdp"

compatible = "qcom,apq8096-mtp"

compatible = "qcom,apq8096-dragonboard"

Documentation/devicetree/bindings/cache/msm_cache_erp64.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
* MSM 64bit L0, L1, L2 and L3 cache error reporting driver



Required properties:

- compatible: Should be "qcom,kryo_cache_erp64"

- reg: I/O address L3 hardware block.

- interrupts: Should contain the L0/L1, L2 and L3 cache error interrupt number.

- interrupt-names: Should contain the interrupt names "l1_irq", "l2_irq_info_0",

		   "l2_irq_info_1", "l2_irq_err_0", "l2_irq_err_1", "l3_irq".



Example:

	qcom,cache_erp64@6500000 {

		compatible = "qcom,kryo_cache_erp64";

		reg = <0x6500000 0x4000>;

		/*

		 * PPI 0  for L0/L1

		 * SPI 1  for Cluster 1 L2 Info

		 * SPI 9  for Cluster 2 L2 Info

		 * SPI 2  for Cluster 1 L2 Error

		 * SPI 10 for Cluster 2 L2 Error

		 * SPI 17 for L3 error

		 */

		interrupts = <1 0 0>, <0 1 0>, <0 9 0>, <0 2 0>, <0 10 0>,

			     <0 17 0>;

		interrupt-names = "l1_irq", "l2_irq_info_0", "l2_irq_info_1",

				  "l2_irq_err_0", "l2_irq_err_1", "l3_irq";

	};

Documentation/devicetree/bindings/cache/msm_m4m_erp.txt

0 → 100644
+15 −0
Original line number Diff line number Diff line 
* MSM M4M error reporting driver



Required properties:

- compatible: Should be "qcom,m4m_erp".

- reg: I/O address M4M hardware block.

- interrupts: Should contain the M4M error interrupt number.

- interrupt-names: Should contain the interrupt names "m4m_irq".



Example:

	qcom,m4m_erp64@9A40000 {

		compatible = "qcom,m4m_erp";

		reg = <0x9A40000 0x40000>;

		interrupts = <0 22 0>;

		interrupt-names = "m4m_irq";

	};

Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt

+1 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ Optional properites: 
					to a non-DSI interface.

- qcom,bridge-name:			A string to indicate the name of the bridge chip connected to DSI. qcom,bridge-name

					is required if qcom,dba-panel is defined for the panel.

- qcom,hdmi-mode:			Indicates where current panel is HDMI mode, otherwise, it will be DVI mode.

- qcom,adjust-timer-wakeup-ms:		An integer value to indicate the timer delay(in ms) to accommodate

					s/w delay while configuring the event timer wakeup logic.