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

Commit b6070128 authored by Mike Tipton's avatar Mike Tipton
Browse files

ARM: dts: msm: Remove interconnect phandles from clock nodes 

Clock optionally votes for interconnect in runtime_resume and
runtime_suspend to ensure access to its configuration registers.
However, interconnect also votes for clocks when configuring QoS. This
can lead to deadlocks between the clock and interconnect frameworks.

Voting for interconnects isn't strictly necessary for register access
currently, since the required bus (CNOC) is always on when HLOS is
running. Voting may become necessary in the future, but until then
remove the interconnect phandles to prevent the deadlocks.

Change-Id: If4392361a394b7ace52cb95a0ac2184bf64a7882
parent 840b38c0

qcom/lahaina.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -2347,7 +2347,6 @@ 
		reg-name = "cc_base";

		vdd_mm-supply = <&VDD_MM_LEVEL>;

		vdd_mx-supply = <&VDD_MXA_LEVEL>;

		interconnects = <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_VENUS_CFG>;

		clocks = <&clock_gcc GCC_VIDEO_AHB_CLK>;

		clock-names = "iface";

		#clock-cells = <1>;
@@ -2360,7 +2359,6 @@ 
		reg-names = "cc_base";

		vdd_mm-supply = <&VDD_MM_LEVEL>;

		vdd_mx-supply = <&VDD_MXA_LEVEL>;

		interconnects = <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_CAMERA_CFG>;

		clocks = <&clock_gcc GCC_CAMERA_AHB_CLK>;

		clock-names = "iface";

		#clock-cells = <1>;
@@ -2372,7 +2370,6 @@ 
		reg = <0xaf00000 0x20000>;

		reg-name = "cc_base";

		vdd_mm-supply = <&VDD_MM_LEVEL>;

		interconnects = <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_DISPLAY_CFG>;

		clocks = <&clock_gcc GCC_DISP_AHB_CLK>;

		clock-names = "iface";

		#clock-cells = <1>;