Merge "msm: clock-8084: Add usb reset support" (ab0396ca) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

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

+24 −0

Original line number	Diff line number	Diff line
		@@ -3169,6 +3169,7 @@ static struct branch_clk gcc_ufs_tx_symbol_1_clk = {

		static struct branch_clk gcc_usb2a_phy_sleep_clk = {
		.cbcr_reg = USB2A_PHY_SLEEP_CBCR,
		.bcr_reg = USB2A_PHY_BCR,
		.has_sibling = 1,
		.base = &virt_bases[GCC_BASE],
		.c = {
		@@ -3363,6 +3364,26 @@ static struct branch_clk gcc_usb_hsic_system_clk = {
		},
		};

		static struct reset_clk gcc_usb30_phy_com_clk = {
		.reset_reg = USB30_PHY_COM_BCR,
		.base = &virt_bases[GCC_BASE],
		.c = {
		.dbg_name = "gcc_usb30_phy_com_clk",
		.ops = &clk_ops_rst,
		CLK_INIT(gcc_usb30_phy_com_clk.c),
		},
		};

		static struct reset_clk gcc_usb3_phy_clk = {
		.reset_reg = USB3_PHY_BCR,
		.base = &virt_bases[GCC_BASE],
		.c = {
		.dbg_name = "gcc_usb3_phy_clk",
		.ops = &clk_ops_rst,
		CLK_INIT(gcc_usb3_phy_clk.c),
		},
		};

		static struct pll_vote_clk mmpll0_clk_src = {
		.en_reg = (void __iomem *)MMSS_PLL_VOTE_APCS,
		.en_mask = BIT(0),
		@@ -5908,6 +5929,9 @@ static struct clk_lookup apq_clocks_8084[] = {
		CLK_LOOKUP("system_clk", gcc_usb_hsic_system_clk.c,
		"f9c00000.qcom,xhci-msm-hsic"),

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

		/* PCIE clocks */
		CLK_LOOKUP("", gcc_pcie_0_aux_clk.c, ""),
		CLK_LOOKUP("", gcc_pcie_0_cfg_ahb_clk.c, ""),