Skip to contentSkip to conversation

Patch "clk: ti: clk-7xx: Remove hardwired ABE clock configuration" has been added to the 4.2-stable tree

PATCH [email protected] 1 participant 1 message Oct 18, 2015

Subsystems (3)
Stable branch Common clk TI clock driver
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

clk: ti: clk-7xx: Remove hardwired ABE clock configuration

to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
clk-ti-clk-7xx-remove-hardwired-abe-clock-configuration.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 4b3061b39132cba0c31b0eb767a9faeedf9437fc Mon Sep 17 00:00:00 2001

From: Peter Ujfalusi <[email protected]>
Date: Mon, 24 Aug 2015 10:35:02 +0300
Subject: clk: ti: clk-7xx: Remove hardwired ABE clock configuration

From: Peter Ujfalusi <[email protected]>

commit 4b3061b39132cba0c31b0eb767a9faeedf9437fc upstream.

The ABE related clocks should be configured via DT and not have it wired inside of the kernel.

Fixes a74c52def9ab ("clk: ti: clk-7xx: Correct ABE DPLL configuration")
Signed-off-by Peter Ujfalusi <[email protected]>
Signed-off-by Tero Kristo <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/clk/ti/clk-7xx.c |   18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)
drivers/clk/ti/clk-7xx.c +1 -17
@@ -16,7 +16,6 @@
 #include <linux/clkdev.h>
 #include <linux/clk/ti.h>
 
-#define DRA7_DPLL_ABE_DEFFREQ				180633600
 #define DRA7_DPLL_GMAC_DEFFREQ				1000000000
 #define DRA7_DPLL_USB_DEFFREQ				960000000
 

@@ -312,27 +311,12 @@ static struct ti_dt_clk dra7xx_clks[] =
 int __init dra7xx_dt_clk_init(void)
 {
 	int rc;
-	struct clk *abe_dpll_mux, *sys_clkin2, *dpll_ck, *hdcp_ck;
+	struct clk *dpll_ck, *hdcp_ck;
 
 	ti_dt_clocks_register(dra7xx_clks);
 
 	omap2_clk_disable_autoidle_all();
 
-	abe_dpll_mux = clk_get_sys(NULL, "abe_dpll_sys_clk_mux");
-	sys_clkin2 = clk_get_sys(NULL, "sys_clkin2");
-	dpll_ck = clk_get_sys(NULL, "dpll_abe_ck");
-
-	rc = clk_set_parent(abe_dpll_mux, sys_clkin2);
-	if (!rc)
-		rc = clk_set_rate(dpll_ck, DRA7_DPLL_ABE_DEFFREQ);
-	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)

Patches currently in stable-queue which might be from [email protected] are

queue-4.2/clk-ti-clk-7xx-remove-hardwired-abe-clock-configuration.patch