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

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

Merge "msm: 8092: Enable PCIe with clock and board support"

parents 7966e68e b2a4b108

arch/arm/mach-msm/board-8092.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -62,6 +62,7 @@ static struct of_dev_auxdata mpq8092_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("qcom,msm-sdcc", 0xF98A4000, "msm_sdcc.2", NULL),

	OF_DEV_AUXDATA("qcom,msm-sdcc", 0xF98A4000, "msm_sdcc.2", NULL),

	OF_DEV_AUXDATA("qcom,sdhci-msm", 0xF9824900, "msm_sdcc.1", NULL),

	OF_DEV_AUXDATA("qcom,sdhci-msm", 0xF9824900, "msm_sdcc.1", NULL),

	OF_DEV_AUXDATA("qcom,sdhci-msm", 0xF98A4900, "msm_sdcc.2", NULL),

	OF_DEV_AUXDATA("qcom,sdhci-msm", 0xF98A4900, "msm_sdcc.2", NULL),

	OF_DEV_AUXDATA("qti,msm_pcie", 0xFC520000, "msm_pcie", NULL),

	{}

	{}

};

};

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

+6 −6
Original line number Original line Diff line number Diff line
@@ -6680,11 +6680,11 @@ static struct clk_lookup mpq_clocks_8092[] = { 
	CLK_LOOKUP("",	gcc_mmss_a5ss_axi_clk.c,	""),

	CLK_LOOKUP("",	gcc_mmss_a5ss_axi_clk.c,	""),





	/* PCIE */

	/* PCIE */

	CLK_LOOKUP("",	gcc_pcie_axi_clk.c,	""),

	CLK_LOOKUP("pcie_0_slv_axi_clk", gcc_pcie_axi_clk.c, "msm_pcie"),

	CLK_LOOKUP("",	gcc_pcie_axi_mstr_clk.c,	""),

	CLK_LOOKUP("pcie_0_mstr_axi_clk", gcc_pcie_axi_mstr_clk.c, "msm_pcie"),

	CLK_LOOKUP("",	gcc_pcie_cfg_ahb_clk.c,	""),

	CLK_LOOKUP("pcie_0_cfg_ahb_clk", gcc_pcie_cfg_ahb_clk.c, "msm_pcie"),

	CLK_LOOKUP("",	gcc_pcie_pipe_clk.c,	""),

	CLK_LOOKUP("pcie_0_pipe_clk",	gcc_pcie_pipe_clk.c,	"msm_pcie"),

	CLK_LOOKUP("",	gcc_pcie_sleep_clk.c,	""),

	CLK_LOOKUP("pcie_0_aux_clk",	gcc_pcie_sleep_clk.c,	"msm_pcie"),





	CLK_LOOKUP("",	gcc_pdm2_clk.c,	""),

	CLK_LOOKUP("",	gcc_pdm2_clk.c,	""),

	CLK_LOOKUP("",	gcc_pdm_ahb_clk.c,	""),

	CLK_LOOKUP("",	gcc_pdm_ahb_clk.c,	""),
@@ -7105,7 +7105,7 @@ static struct clk_lookup mpq_clocks_8092[] = { 
	CLK_LOOKUP("alt_core_clk", vcap_vp_clk_src.c, "fdfb6000.qti,iommu"),

	CLK_LOOKUP("alt_core_clk", vcap_vp_clk_src.c, "fdfb6000.qti,iommu"),





	/* LDO clocks */

	/* LDO clocks */

	CLK_LOOKUP("", pcie_gpio_ldo.c, ""),

	CLK_LOOKUP("pcie_0_ldo", pcie_gpio_ldo.c, "msm_pcie"),

	CLK_LOOKUP("", sata_phy_ldo.c, ""),

	CLK_LOOKUP("", sata_phy_ldo.c, ""),

	CLK_LOOKUP("", vby1_gpio_ldo.c, ""),

	CLK_LOOKUP("", vby1_gpio_ldo.c, ""),