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

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

Merge "clock: msm: Add usb2_phy_sleep_clk to USB HS PHY device"

parents 57670f22 ca5b2385

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

+4 −1
Original line number Diff line number Diff line
@@ -6120,7 +6120,8 @@ static struct clk_lookup apq_clocks_8084[] = { 
	CLK_LOOKUP("sleep_clk", gcc_usb30_sleep_clk.c, "f9200000.ssusb"),

	CLK_LOOKUP("sleep_a_clk", gcc_usb2a_phy_sleep_clk.c, "f9200000.ssusb"),

	CLK_LOOKUP("utmi_clk",   gcc_usb30_mock_utmi_clk.c, "f9200000.ssusb"),



	CLK_LOOKUP("phy_sleep_clk", gcc_usb2a_phy_sleep_clk.c,

			"f92f8800.hsphy"),

	CLK_LOOKUP("com_reset_clk", gcc_usb30_phy_com_clk.c, "f92f8800.ssphy"),

	CLK_LOOKUP("reset_clk",	gcc_usb3_phy_clk.c, "f92f8800.ssphy"),
@@ -6135,6 +6136,8 @@ static struct clk_lookup apq_clocks_8084[] = { 
	CLK_LOOKUP("sleep_a_clk", gcc_usb2a_phy_sleep_clk.c, "f9400000.ssusb"),

	CLK_LOOKUP("utmi_clk",  gcc_usb30_sec_mock_utmi_clk.c,

			"f9400000.ssusb"),

	CLK_LOOKUP("phy_sleep_clk", gcc_usb2a_phy_sleep_clk.c,

			"f94f8800.hsphy"),



	CLK_LOOKUP("",	gcc_usb2b_phy_sleep_clk.c,	""),

	CLK_LOOKUP("mem_clk",	gcc_usb30_master_clk.c,	"f9304000.qcom,usbbam"),

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

+2 −0
Original line number Diff line number Diff line
@@ -2193,6 +2193,8 @@ static struct clk_lookup msm_clocks_9630[] = { 
		   "f9200000.ssusb"),

	CLK_LOOKUP("phy_com_reset",  gcc_usb3_phy_com_reset.c,

		"f9200000.ssusb"),

	CLK_LOOKUP("phy_sleep_clk", gcc_usb2b_phy_sleep_clk.c,

		   "f92f8800.hsphy"),

	CLK_LOOKUP("core_clk", qpic_clk.c, "f9ac0000.qcom,nand"),

	CLK_LOOKUP("", qpic_a_clk.c, ""),

};

arch/arm/mach-msm/clock-gcc-8974.c

+2 −0
Original line number Diff line number Diff line
@@ -2512,6 +2512,8 @@ static struct clk_lookup msm_clocks_gcc_8974[] = { 
	CLK_LOOKUP_OF("sleep_clk", gcc_usb30_sleep_clk, "msm_dwc3"),

	CLK_LOOKUP_OF("sleep_a_clk", gcc_usb2a_phy_sleep_clk, "msm_dwc3"),

	CLK_LOOKUP_OF("sleep_b_clk", gcc_usb2b_phy_sleep_clk, "msm_dwc3"),

	CLK_LOOKUP_OF("phy_sleep_clk", gcc_usb2a_phy_sleep_clk,

			"f92f8800.hsphy"),

	CLK_LOOKUP_OF("iface_clk", gcc_usb_hs_ahb_clk,     "msm_otg"),

	CLK_LOOKUP_OF("core_clk", gcc_usb_hs_system_clk,   "msm_otg"),

	CLK_LOOKUP_OF("sleep_clk", gcc_usb2b_phy_sleep_clk, "msm_otg"),