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

Commit 6ff409d3 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 20e221fb on remote branch 

Change-Id: Ia55b9c58339200596cbc6ad91c40f721bf114e0c
parents 63997e1a 20e221fb

bindings/clock/qcom,aop-qmp.txt

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ Required properties : 
- mboxes : list of QMP mailbox phandle and channel identifier tuples.

- mbox-names: List of identifier strings for each mailbox channel.

		Must contain "qdss_clk".

- qcom,clk-stop-bimc-log: Presence indicates a BIMC logging request will

			  be sent to AOP during kernel panic.



Example :

	clock_qdss: qcom,aopclk {

bindings/clock/qcom,rpmh-clk.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Required properties : 
		"qcom,sdm845-rpmh-clk"

		"qcom,lito-rpmh-clk"

		"qcom,lagoon-rpmh-clk"

		"qcom,litomagnus-rpmh-clk"



- #clock-cells : must contain 1

bindings/cnss/cnss-wlan.txt

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ Optional properties: 
                             and off sequences.

  - qcom,converged-dt: Boolean property to decide whether it supports multiple

                       WLAN devices.

  - cnss-enable-self-recovery: Boolean property to enable self recovery when

                               recovery is trigeered with reason link down.



Example:

qcom/bengal-gpu.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ 
			<&gpucc GPU_CC_CX_GMU_CLK>,

			<&gpucc GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK>;



		clock-names = "core_clk", "rbbmtimer_clk", "mem_clk",

				"iface_clk", "mem_iface_clk", "gmu_clk",

		clock-names = "core_clk", "rbbmtimer_clk", "iface_clk",

				"ahb_clk", "mem_clk", "gmu_clk",

				"smmu_vote";



		/* Bus Scale Settings */

qcom/bengal-pinctrl.dtsi

+10 −1
Original line number Diff line number Diff line
@@ -56,7 +56,16 @@ 
				<94 0 &wakegpio 47 0>,

				<95 0 &wakegpio 48 0>,

				<96 0 &wakegpio 49 0>,

				<97 0 &wakegpio 50 0>;

				<97 0 &wakegpio 50 0>,

				<99 0 &wakegpio 64 0>,	/* LPI_GPIO 7 */

				<102 0 &wakegpio 65 0>,	/* LPI_GPIO 10 */

				<103 0 &wakegpio 66 0>,	/* LPI_GPIO 11 */

				<104 0 &wakegpio 67 0>,	/* LPI_GPIO 12 */

				<105 0 &wakegpio 69 0>,	/* LPI_GPIO 17 */

				<106 0 &wakegpio 14 0>,	/* LPI_GPIO 16 */

				<107 0 &wakegpio 7 0>,	/* LPI_GPIO 17 */

				<109 0 &wakegpio 37 0>,	/* LPI_GPIO 19 */

				<112 0 &wakegpio 25 0>;	/* LPI_GPIO 24 */

		irqdomain-map-pass-thru = <0 0xff>;

		irqdomain-map-mask = <0xff 0>;