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

Commit a8986735 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: board-8084: qca1530: added entries for qca1530"

parents 72447d3f a59d80c4

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

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ static struct of_dev_auxdata apq8084_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("qcom,sdhci-msm", 0xF9824900, "msm_sdcc.1", NULL),

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

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

	OF_DEV_AUXDATA("qcom,qca1530", 0x00000000, "qca1530.1", NULL),

	OF_DEV_AUXDATA("qcom,ufshc", 0xFC594000, "msm_ufs.1", NULL),

	OF_DEV_AUXDATA("qcom,xhci-msm-hsic", 0xf9c00000, "msm_hsic_host", NULL),

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

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

+2 −0
Original line number Diff line number Diff line
@@ -6571,6 +6571,8 @@ static struct clk_lookup apq_clocks_8084[] = { 
	CLK_LOOKUP("pcie_0_ldo",	pcie_0_phy_ldo.c,  "msm_pcie"),

	CLK_LOOKUP("pcie_1_ldo",	pcie_1_phy_ldo.c,  "msm_pcie"),

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



	CLK_LOOKUP("rtc_clk",	div_clk3.c, "qca1530.1"),

};



static struct pll_config_regs mmpll0_regs __initdata = {