Merge "board: apq8084: Add AUX data of msm_ufs.x for UFS devices" (74d83966) · Commits · e / devices / android_kernel_sony_msm8994_rework

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,ufshc", 0xFC594000, "msm_ufs.1", NULL),
		OF_DEV_AUXDATA("qcom,xhci-msm-hsic", 0xf9c00000, "msm_hsic_host", NULL),
		{}
		};

+9 −9

Original line number	Diff line number	Diff line
		@@ -5980,19 +5980,19 @@ static struct clk_lookup apq_clocks_8084[] = {
		CLK_LOOKUP("", gcc_tsif_ref_clk.c, ""),

		/* UFS clocks */
		CLK_LOOKUP("ref_clk", rf_clk1.c, "fc594000.ufshc"),
		CLK_LOOKUP("bus_clk", gcc_sys_noc_ufs_axi_clk.c, "fc594000.ufshc"),
		CLK_LOOKUP("iface_clk", gcc_ufs_ahb_clk.c, "fc594000.ufshc"),
		CLK_LOOKUP("core_clk", gcc_ufs_axi_clk.c, "fc594000.ufshc"),
		CLK_LOOKUP("core_clk_src", ufs_axi_clk_src.c, "fc594000.ufshc"),
		CLK_LOOKUP("ref_clk", rf_clk1.c, "msm_ufs.1"),
		CLK_LOOKUP("bus_clk", gcc_sys_noc_ufs_axi_clk.c, "msm_ufs.1"),
		CLK_LOOKUP("iface_clk", gcc_ufs_ahb_clk.c, "msm_ufs.1"),
		CLK_LOOKUP("core_clk", gcc_ufs_axi_clk.c, "msm_ufs.1"),
		CLK_LOOKUP("core_clk_src", ufs_axi_clk_src.c, "msm_ufs.1"),
		CLK_LOOKUP("rx_lane0_sync_clk", gcc_ufs_rx_symbol_0_clk.c,
		"fc594000.ufshc"),
		"msm_ufs.1"),
		CLK_LOOKUP("rx_lane1_sync_clk", gcc_ufs_rx_symbol_1_clk.c,
		"fc594000.ufshc"),
		"msm_ufs.1"),
		CLK_LOOKUP("tx_lane0_sync_clk", gcc_ufs_tx_symbol_0_clk.c,
		"fc594000.ufshc"),
		"msm_ufs.1"),
		CLK_LOOKUP("tx_lane1_sync_clk", gcc_ufs_tx_symbol_1_clk.c,
		"fc594000.ufshc"),
		"msm_ufs.1"),
		/* UFS PHY clocks */
		CLK_LOOKUP("ref_clk_src", rf_clk3.c, "fc597000.ufsphy"),
		CLK_LOOKUP("ref_clk_parent", pcie_1_phy_ldo.c, "fc597000.ufsphy"),