clk: qcom: Introduce parent_map tables

In the current parent mapping code, we can get duplicate or inconsistent
indexes, which leads to discrepancy between the number of elements in the
array and the number of parents. Until now, this was solved with some
reordering but this is not always possible.

This patch introduces index tables that are used to define the relations
between the PLL source and the hardware mux configuration value.
To accomplish this, here we do the following:
 - Define a parent_map struct to map the relations between PLL source index
 and register configuration value.
 - Add a qcom_find_src_index() function for finding the index of a clock
 matching the specific PLL configuration.
 - Update the {set,get}_parent RCG functions use the newly introduced
 parent_map struct.
 - Convert all existing drivers to the new parent_map tables.

Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

1 files changed, 16 insertions, 14 deletions

diff --git a/drivers/clk/qcom/gcc-msm8974.c b/drivers/clk/qcom/gcc-msm8974.c
index a6937fe78d8a..c39d09874e74 100644
--- a/drivers/clk/qcom/gcc-msm8974.c
+++ b/drivers/clk/qcom/gcc-msm8974.c
@@ -32,14 +32,16 @@
 #include "clk-branch.h"
 #include "reset.h"
 
-#define P_XO    0
-#define P_GPLL0 1
-#define P_GPLL1 1
-#define P_GPLL4 2
+enum {
+        P_XO,
+        P_GPLL0,
+        P_GPLL1,
+        P_GPLL4,
+};
 
-static const u8 gcc_xo_gpll0_map[] = {
-        [P_XO]          = 0,
-        [P_GPLL0]       = 1,
+static const struct parent_map gcc_xo_gpll0_map[] = {
+        { P_XO, 0 },
+        { P_GPLL0, 1 }
 };
 
 static const char *gcc_xo_gpll0[] = {
@@ -47,10 +49,10 @@ static const char *gcc_xo_gpll0[] = {
         "gpll0_vote",
 };
 
-static const u8 gcc_xo_gpll0_gpll4_map[] = {
-        [P_XO]          = 0,
-        [P_GPLL0]       = 1,
-        [P_GPLL4]       = 5,
+static const struct parent_map gcc_xo_gpll0_gpll4_map[] = {
+        { P_XO, 0 },
+        { P_GPLL0, 1 },
+        { P_GPLL4, 5 }
 };
 
 static const char *gcc_xo_gpll0_gpll4[] = {
@@ -984,9 +986,9 @@ static const struct freq_tbl ftbl_gcc_usb_hsic_clk[] = {
         { }
 };
 
-static u8 usb_hsic_clk_src_map[] = {
-        [P_XO]          = 0,
-        [P_GPLL1]       = 4,
+static const struct parent_map usb_hsic_clk_src_map[] = {
+        { P_XO, 0 },
+        { P_GPLL1, 4 }
 };
 
 static struct clk_rcg2 usb_hsic_clk_src = {