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

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

Merge "usb: xhci-msm-hsic: Create alias for platform device id"

parents 6398fc4f 677bc436

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,xhci-msm-hsic", 0xf9c00000, "msm_hsic_host", NULL),

	{}

};

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

+6 −11
Original line number Diff line number Diff line
@@ -6023,18 +6023,13 @@ static struct clk_lookup apq_clocks_8084[] = { 
	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_usb_hsic_ahb_clk.c,

			"f9c00000.qcom,xhci-msm-hsic"),

	CLK_LOOKUP("hsic_clk", gcc_usb_hsic_clk.c,

			"f9c00000.qcom,xhci-msm-hsic"),

	CLK_LOOKUP("cal_clk", gcc_usb_hsic_io_cal_clk.c,

			"f9c00000.qcom,xhci-msm-hsic"),

	CLK_LOOKUP("core_clk", gcc_usb_hsic_ahb_clk.c, "msm_hsic_host"),

	CLK_LOOKUP("hsic_clk", gcc_usb_hsic_clk.c, "msm_hsic_host"),

	CLK_LOOKUP("cal_clk", gcc_usb_hsic_io_cal_clk.c, "msm_hsic_host"),

	CLK_LOOKUP("phy_sleep_clk", gcc_usb_hsic_io_cal_sleep_clk.c,

			"f9c00000.qcom,xhci-msm-hsic"),

	CLK_LOOKUP("utmi_clk", gcc_usb_hsic_mock_utmi_clk.c,

			"f9c00000.qcom,xhci-msm-hsic"),

	CLK_LOOKUP("system_clk", gcc_usb_hsic_system_clk.c,

			"f9c00000.qcom,xhci-msm-hsic"),

			"msm_hsic_host"),

	CLK_LOOKUP("utmi_clk", gcc_usb_hsic_mock_utmi_clk.c, "msm_hsic_host"),

	CLK_LOOKUP("system_clk", gcc_usb_hsic_system_clk.c, "msm_hsic_host"),



	CLK_LOOKUP("",	gcc_usb30_phy_com_clk.c,	""),

	CLK_LOOKUP("",	gcc_usb3_phy_clk.c,	""),