Merge "msm: clock-krypton: Add lookup entries for usb2" (03a3b9dd) · Commits · e / devices / android_kernel_sony_msm8994

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -1642,6 +1642,7 @@ static DEFINE_CLK_VOTER(pnoc_sps_clk, &pnoc_clk.c, LONG_MAX);
		static DEFINE_CLK_BRANCH_VOTER(cxo_pil_mss_clk, &xo.c);
		static DEFINE_CLK_BRANCH_VOTER(cxo_dwc3_clk, &xo.c);
		static DEFINE_CLK_BRANCH_VOTER(cxo_lpm_clk, &xo.c);
		static DEFINE_CLK_BRANCH_VOTER(cxo_otg_clk, &xo.c);

		static DEFINE_CLK_VOTER(qseecom_ce1_clk_src, &ce1_clk_src.c, 171430000);
		static DEFINE_CLK_VOTER(scm_ce1_clk_src, &ce1_clk_src.c, 171430000);
		@@ -1972,6 +1973,11 @@ static struct clk_lookup msm_clocks_krypton[] = {
		CLK_DUMMY("iface_clk", gcc_ipa_cnoc_clk.c, "fd4c0000.qcom,ipa", OFF),
		CLK_DUMMY("inactivity_clk", gcc_ipa_sleep_clk.c, "fd4c0000.qcom,ipa", OFF),

		/* HSUSB-OTG Clocks */
		CLK_LOOKUP("xo", cxo_otg_clk.c, "f9a55000.usb"),
		CLK_LOOKUP("iface_clk", gcc_usb_hs_ahb_clk.c, "f9a55000.usb"),
		CLK_LOOKUP("core_clk", gcc_usb_hs_system_clk.c, "f9a55000.usb"),
		CLK_LOOKUP("sleep_clk", gcc_usb2a_phy_sleep_clk.c, "f9a55000.usb"),

		CLK_LOOKUP("core_clk", gcc_blsp1_qup1_i2c_apps_clk.c, ""),
		CLK_LOOKUP("core_clk", gcc_blsp1_qup1_spi_apps_clk.c, ""),
		@@ -2002,8 +2008,6 @@ static struct clk_lookup msm_clocks_krypton[] = {
		CLK_LOOKUP("core_clk", gcc_sdcc3_apps_clk.c, "msm_sdcc.3"),
		CLK_LOOKUP("bus_clk", pnoc_sdcc3_clk.c, "msm_sdcc.3"),

		CLK_LOOKUP("iface_clk", gcc_usb_hs_ahb_clk.c, "f9a55000.usb"),
		CLK_LOOKUP("core_clk", gcc_usb_hs_system_clk.c, "f9a55000.usb"),
		CLK_LOOKUP("iface_clk", gcc_usb_hsic_ahb_clk.c, "msm_hsic_host"),
		CLK_LOOKUP("phy_clk", gcc_usb_hsic_clk.c, "msm_hsic_host"),
		CLK_LOOKUP("cal_clk", gcc_usb_hsic_io_cal_clk.c, "msm_hsic_host"),