Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mike.turquette/linux (7c909b09) · Commits · 戴 / test

Pull clock driver fix from Mike Turquette: "A single patch to re-enable audio which is broken on all DRA7 SoC-based platforms. Missed this one from the last set of fixes" * tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mike.turquette/linux: clk: ti: clk-7xx: Correct ABE DPLL configuration

drivers/clk/ti/clk-7xx.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		#include <linux/clkdev.h>
		#include <linux/clk/ti.h>

		#define DRA7_DPLL_ABE_DEFFREQ 361267200
		#define DRA7_DPLL_ABE_DEFFREQ 180633600
		#define DRA7_DPLL_GMAC_DEFFREQ 1000000000


		@@ -322,6 +322,11 @@ int __init dra7xx_dt_clk_init(void)
		if (rc)
		pr_err("%s: failed to configure ABE DPLL!\n", __func__);

		dpll_ck = clk_get_sys(NULL, "dpll_abe_m2x2_ck");
		rc = clk_set_rate(dpll_ck, DRA7_DPLL_ABE_DEFFREQ * 2);
		if (rc)
		pr_err("%s: failed to configure ABE DPLL m2x2!\n", __func__);

		dpll_ck = clk_get_sys(NULL, "dpll_gmac_ck");
		rc = clk_set_rate(dpll_ck, DRA7_DPLL_GMAC_DEFFREQ);
		if (rc)

Admin message