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

Commit 9f441930 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 gcc_usb30_master_clk to USB HS/SS PHY devices"

parents 5ce8cf11 e6572b0a

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

+4 −0
Original line number Diff line number Diff line
@@ -6111,6 +6111,8 @@ static struct clk_lookup apq_clocks_8084[] = { 
	/* USB clocks */

	CLK_LOOKUP("ref_clk", diff_clk1.c, "f9200000.ssusb"),

	CLK_LOOKUP("xo", cxo_dwc3_clk.c, "f9200000.ssusb"),

	CLK_LOOKUP("core_clk", gcc_usb30_master_clk.c, "f92f8800.hsphy"),

	CLK_LOOKUP("core_clk", gcc_usb30_master_clk.c, "f92f8800.ssphy"),

	CLK_LOOKUP("core_clk", gcc_usb30_master_clk.c, "f9200000.ssusb"),

	CLK_LOOKUP("iface_clk", gcc_sys_noc_usb3_axi_clk.c, "f9200000.ssusb"),

	CLK_LOOKUP("iface_clk", gcc_sys_noc_usb3_axi_clk.c, "msm_usb3"),
@@ -6124,6 +6126,8 @@ static struct clk_lookup apq_clocks_8084[] = { 


	CLK_LOOKUP("ref_clk", diff_clk1.c, "f9400000.ssusb"),

	CLK_LOOKUP("xo", cxo_dwc3_clk.c, "f9400000.ssusb"),

	CLK_LOOKUP("core_clk", gcc_usb30_sec_master_clk.c, "f94f8800.hsphy"),

	CLK_LOOKUP("core_clk", gcc_usb30_sec_master_clk.c, "f94f8800.ssphy"),

	CLK_LOOKUP("core_clk", gcc_usb30_sec_master_clk.c, "f9400000.ssusb"),

	CLK_LOOKUP("iface_clk", gcc_sys_noc_usb3_sec_axi_clk.c,

			"f9400000.ssusb"),

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

+2 −0
Original line number Diff line number Diff line
@@ -2502,6 +2502,8 @@ static struct clk_lookup msm_clocks_gcc_8974[] = { 


	CLK_LOOKUP_OF("mem_clk", gcc_usb30_master_clk,           "usb_bam"),

	CLK_LOOKUP_OF("mem_iface_clk", gcc_sys_noc_usb3_axi_clk, "usb_bam"),

	CLK_LOOKUP_OF("core_clk", gcc_usb30_master_clk,    "f92f8800.hsphy"),

	CLK_LOOKUP_OF("core_clk", gcc_usb30_master_clk,    "f92f8800.ssphy"),

	CLK_LOOKUP_OF("core_clk", gcc_usb30_master_clk,    "msm_dwc3"),

	CLK_LOOKUP_OF("utmi_clk_src", usb30_mock_utmi_clk_src, "msm_dwc3"),

	CLK_LOOKUP_OF("utmi_clk", gcc_usb30_mock_utmi_clk, "msm_dwc3"),