From:   Charles Keepax <ckeepax@opensource.cirrus.com>
To:     <sboyd@kernel.org>
CC:     <mturquette@baylibre.com>, <linux-clk@vger.kernel.org>,
        <patches@opensource.cirrus.com>
Subject: [PATCH 1/2] clk: Ensure new parent is looked up when changing parents
Date:   Tue, 30 Apr 2019 15:44:11 +0100
Message-ID: <20190430144412.20950-1-ckeepax@opensource.cirrus.com>
MIME-Version: 1.0
Content-Type: text/plain
Sender: linux-clk-owner@vger.kernel.org
Precedence: bulk

clk_core_fill_parent_index is called from clk_mux_determine_rate_flags
and for the initial parent of the clock but seems to not get called on
the path changing a clocks parent. This can cause a clock parent change
to fail, fix this by adding a call in clk_fetch_parent_index.

Fixes: fc0c209c147f ("clk: Allow parents to be specified without string names")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
 drivers/clk/clk.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index ffd33b63c37eb..5aa180180ee95 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -1601,6 +1601,9 @@ static int clk_fetch_parent_index(struct clk_core *core,
 		return -EINVAL;
 
 	for (i = 0; i < core->num_parents; i++) {
+		if (!core->parents[i].core)
+			clk_core_fill_parent_index(core, i);
+
 		if (core->parents[i].core == parent)
 			return i;
 
-- 
2.11.0