Skip to contentSkip to conversation

Patch "clk: at91: fix clk_programmable_set_parent()" has been added to the 4.6-stable tree

PATCH [email protected] 1 participant 1 message Aug 3, 2016

Subsystems (3)
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: at91: fix clk_programmable_set_parent()

to the 4.6-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-at91-fix-clk_programmable_set_parent.patch
and it can be found in the queue-4.6 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 f96423f483b1a7854270335b319e8d1cdd6f3585 Mon Sep 17 00:00:00 2001

From: Boris Brezillon <[email protected]>
Date: Mon, 18 Jul 2016 09:49:12 +0200
Subject: clk: at91: fix clk_programmable_set_parent()

From: Boris Brezillon <[email protected]>

commit f96423f483b1a7854270335b319e8d1cdd6f3585 upstream.

Since commit 1bdf02326b71e ("clk: at91: make use of syscon/regmap internally"), clk_programmable_set_parent() is always selecting the first parent (AKA slow_clk), no matter what's passed in the 'index' parameter.

Fix that by initializing the pckr variable to the index value.

Fixes 1bdf02326b71e ("clk: at91: make use of syscon/regmap internally")
Link lkml.kernel.org/r/1468828152-18389-1-git-send-email-boris.brezillon@free-electrons.com
---
 drivers/clk/at91/clk-programmable.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/at91/clk-programmable.c +1 -1
@@ -99,7 +99,7 @@ static int clk_programmable_set_parent(s
 	struct clk_programmable *prog = to_clk_programmable(hw);
 	const struct clk_programmable_layout *layout = prog->layout;
 	unsigned int mask = layout->css_mask;
-	unsigned int pckr = 0;
+	unsigned int pckr = index;
 
 	if (layout->have_slck_mck)
 		mask |= AT91_PMC_CSSMCK_MCK;

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

queue-4.6/clk-at91-fix-clk_programmable_set_parent.patch