Merge branch 'for-v3.17/ti-clk-driver' of github.com:t-kristo/linux-pm into clk-next-ti (07761baf) · Commits · e / devices / android_kernel_oneplus_sm8150

MAINTAINERS

+7 −0

Original line number	Diff line number	Diff line
		@@ -8997,6 +8997,13 @@ L: linux-pm@vger.kernel.org
		S: Supported
		F: drivers/thermal/ti-soc-thermal/

		TI CLOCK DRIVER
		M: Tero Kristo <t-kristo@ti.com>
		L: linux-omap@vger.kernel.org
		S: Maintained
		F: drivers/clk/ti/
		F: include/linux/clk/ti.h

		TI FLASH MEDIA INTERFACE DRIVER
		M: Alex Dubov <oakad@yahoo.com>
		S: Maintained

+11 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@

		#define DRA7_DPLL_ABE_DEFFREQ 361267200
		#define DRA7_DPLL_GMAC_DEFFREQ 1000000000
		#define DRA7_DPLL_USB_DEFFREQ 960000000


		static struct ti_dt_clk dra7xx_clks[] = {
		@@ -327,5 +328,15 @@ int __init dra7xx_dt_clk_init(void)
		if (rc)
		pr_err("%s: failed to configure GMAC DPLL!\n", __func__);

		dpll_ck = clk_get_sys(NULL, "dpll_usb_ck");
		rc = clk_set_rate(dpll_ck, DRA7_DPLL_USB_DEFFREQ);
		if (rc)
		pr_err("%s: failed to configure USB DPLL!\n", __func__);

		dpll_ck = clk_get_sys(NULL, "dpll_usb_m2_ck");
		rc = clk_set_rate(dpll_ck, DRA7_DPLL_USB_DEFFREQ/2);
		if (rc)
		pr_err("%s: failed to set USB_DPLL M2 OUT\n", __func__);

		return rc;
		}