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

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

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

parents ef3f7529 2c58dcea

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

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ static struct reserve_info msmkrypton_reserve_info __initdata = { 


static struct of_dev_auxdata msmkrypton_auxdata_lookup[] __initdata = {

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

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

	{}

};

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

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

	CLK_LOOKUP("",	usb_hsic_xcvr_fs_clk_src.c,	""),



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

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

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

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

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

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

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

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

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

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

	CLK_LOOKUP("iface_clk",	gcc_sys_noc_usb3_axi_clk.c,

		   "f9200000.qcom,ssusb"),

	CLK_LOOKUP("",	gcc_usb3_aux_clk.c,	""),
@@ -2164,7 +2164,7 @@ static struct clk_lookup msm_clocks_krypton[] = { 
	CLK_LOOKUP("",	ce1_clk_src.c,	""),

	CLK_LOOKUP("",  gcc_usb3_phy_com_reset.c,       ""),

	CLK_LOOKUP("",  gcc_usb3_phy_reset.c,   ""),

	CLK_LOOKUP("",  gcc_pcie_gpio_ldo.c,   ""),

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

	CLK_LOOKUP("",  gcc_usb_ss_ldo.c,   ""),



	CLK_LOOKUP("ref_clk", lnbbclk_clk.c, "f9200000.qcom,ssusb"),