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

Commit c46a3651 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: clock-8084: Remove gcc_lpass_mport_axi_clk"

parents 74d83966 b1efdfc1

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

+2 −15
Original line number Diff line number Diff line
@@ -2618,17 +2618,6 @@ static struct branch_clk gcc_gp3_clk = { 
	},

};



static struct branch_clk gcc_lpass_mport_axi_clk = {

	.cbcr_reg = LPASS_MPORT_AXI_CBCR,

	.has_sibling = 1,

	.base = &virt_bases[GCC_BASE],

	.c = {

		.dbg_name = "gcc_lpass_mport_axi_clk",

		.ops = &clk_ops_branch,

		CLK_INIT(gcc_lpass_mport_axi_clk.c),

	},

};



static struct branch_clk gcc_lpass_q6_axi_clk = {

	.cbcr_reg = LPASS_Q6_AXI_CBCR,

	.has_sibling = 1,
@@ -5375,7 +5364,6 @@ static struct measure_mux_entry measure_mux[] = { 
	{&gcc_ce2_axi_clk.c,			GCC_BASE, 0x0141},

	{&gcc_ce2_ahb_clk.c,			GCC_BASE, 0x0142},

	{&gcc_lpass_q6_axi_clk.c,		GCC_BASE, 0x0160},

	{&gcc_lpass_mport_axi_clk.c,		GCC_BASE, 0x0162},

	{&gcc_lpass_sway_clk.c,			GCC_BASE, 0x0163},

	{&gcc_copss_smmu_axi_clk.c,		GCC_BASE, 0x01e8},

	{&gcc_copss_smmu_ahb_clk.c,		GCC_BASE, 0x01e9},
@@ -5784,6 +5772,8 @@ static struct clk_lookup apq_clocks_8084[] = { 
									OFF),

	CLK_DUMMY("iface_clk", lcc_core_smmu_cfg_clk.c, "fe064000.qcom,iommu",

									OFF),

	CLK_DUMMY("core_clk",  gcc_lpass_mport_axi_clk.c, "fe064000.qcom,iommu",

									OFF),



	CLK_LOOKUP("xo",  cxo_pil_lpass_clk.c,      "fe200000.qcom,lpass"),

	CLK_LOOKUP("xo",  cxo_dwc3_clk.c,           "f9200000.qcom,ssusb"),
@@ -5938,7 +5928,6 @@ static struct clk_lookup apq_clocks_8084[] = { 
	CLK_LOOKUP("",	gcc_gp2_clk.c,	""),

	CLK_LOOKUP("",	gcc_gp3_clk.c,	""),



	CLK_LOOKUP("",	gcc_lpass_mport_axi_clk.c,	""),

	CLK_LOOKUP("bus_clk",	gcc_lpass_q6_axi_clk.c,	"fe200000.qcom,lpass"),

	CLK_LOOKUP("core_clk",	dummy_clk,	"fe200000.qcom,lpass"),

	CLK_LOOKUP("iface_clk",	dummy_clk,	"fe200000.qcom,lpass"),
@@ -6319,8 +6308,6 @@ static struct clk_lookup apq_clocks_8084[] = { 
	CLK_LOOKUP("core_clk", vpu_axi_clk.c, "fdee4000.qcom,iommu"),

	CLK_LOOKUP("alt_core_clk", vpu_bus_clk.c, "fdee4000.qcom,iommu"),

	CLK_LOOKUP("core_clk", gcc_lpass_q6_axi_clk.c, "fe054000.qcom,iommu"),

	CLK_LOOKUP("core_clk", gcc_lpass_mport_axi_clk.c,

							"fe064000.qcom,iommu"),

	CLK_LOOKUP("core_clk", vpu_vdp_clk.c, "fd8c1404.qcom,gdsc"),

	CLK_LOOKUP("maple_clk", vpu_maple_clk.c, "fd8c1404.qcom,gdsc"),

	CLK_LOOKUP("core_clk", mdss_mdp_clk.c, "fd8c2304.qcom,gdsc"),