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

Commit d811feab authored by Matt Wagantall's avatar Matt Wagantall Committed by Stephen Boyd
Browse files

msm: gdsc: Remove csi_clk usage in the 8x10's VFE GDSC sequence 



The CSI_VFE_CLK does not enter the VFE's power-collapsible domain,
and its reset therefore does not need to be controlled. Remove this
unnecessary usage so that the resets asserted manually (when the
'qcom,skip-logic-collapse' GDSC property is set) are the same as
those asserted by the GDSC state machine when the property is not
set.

Change-Id: I109e75ae85ee137f57d4c33ab191d0409f271ef5
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parent 58cee7a5

arch/arm/boot/dts/msm8610.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -975,7 +975,7 @@ 
};



&gdsc_vfe {

	qcom,clock-names = "core_clk", "iface_clk", "bus_clk", "csi_clk";

	qcom,clock-names = "core_clk", "iface_clk", "bus_clk";

	qcom,skip-logic-collapse;

	qcom,retain-periph;

	qcom,retain-mem;

arch/arm/mach-msm/clock-8610.c

+0 −1
Original line number Diff line number Diff line
@@ -3147,7 +3147,6 @@ static struct clk_lookup msm_clocks_8610[] = { 
	CLK_LOOKUP("core_clk", vfe_clk.c,	"fd8c36a4.qcom,gdsc"),

	CLK_LOOKUP("iface_clk", vfe_ahb_clk.c,	"fd8c36a4.qcom,gdsc"),

	CLK_LOOKUP("bus_clk",  vfe_axi_clk.c,	"fd8c36a4.qcom,gdsc"),

	CLK_LOOKUP("csi_clk",  csi_vfe_clk.c,	"fd8c36a4.qcom,gdsc"),

	CLK_LOOKUP("core_clk", oxili_gfx3d_clk.c, "fd8c4034.qcom,gdsc"),

	CLK_LOOKUP("iface_clk", oxili_ahb_clk.c, "fd8c4034.qcom,gdsc"),

	CLK_LOOKUP("mem_clk", gmem_gfx3d_clk.c, "fd8c4034.qcom,gdsc"),