clk: clock: compatible clk count for different platform [1/1]

PD#165090: clock: fix clk count error

Change-Id: I3b7c181e159b2a028ddc53e7c72066ec3633fd75
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
This commit is contained in:
Shunzhou Jiang
2018-06-11 12:08:22 +08:00
committed by Yixun Lan
parent f56f5378a4
commit 8aa209c7cf
10 changed files with 14 additions and 3 deletions

View File

@@ -871,6 +871,7 @@ static void __init axg_clkc_init(struct device_node *np)
/* return -ENOMEM; */
return;
}
clk_numbers = NR_CLKS;
}
if (NULL == clks) {

View File

@@ -125,6 +125,7 @@ static void __init axg_aoclkc_init(struct device_node *np)
/* return -ENOMEM; */
return;
}
clk_numbers = NR_CLKS;
}
for (clkid = CLKID_AO_BASE; clkid < NR_CLKS; clkid++) {

View File

@@ -29,7 +29,8 @@
#include "clkc.h"
static struct dentry *debugfs_root;
#define NR_CLKS 221
//#define NR_CLKS 221
void usage(void)
{
pr_info("\nclk_test:\n");
@@ -44,7 +45,7 @@ struct clk *aml_get_clk_by_name(char *name)
int idx;
struct clk *cur_clk;
for (idx = 0; idx < NR_CLKS; idx++) {
for (idx = 0; idx < clk_numbers; idx++) {
if (!clks[idx]) {
pr_debug("no such clk clks[%d]\n", idx);
continue;

View File

@@ -286,4 +286,5 @@ void meson_g12a_media_init(void);
void meson_g12a_gpu_init(void);
void meson_g12a_misc_init(void);
extern int clk_numbers;
#endif /* __CLKC_H */

View File

@@ -871,6 +871,7 @@ static void __init g12a_clkc_init(struct device_node *np)
/* return -ENOMEM; */
return;
}
clk_numbers = NR_CLKS;
}
clk_data.clks = clks;

View File

@@ -125,6 +125,7 @@ static void __init g12a_aoclkc_init(struct device_node *np)
/* return -ENOMEM; */
return;
}
clk_numbers = NR_CLKS;
}
for (clkid = CLKID_AO_BASE; clkid < NR_CLKS; clkid++) {

View File

@@ -552,6 +552,7 @@ static void __init g12b_clkc_init(struct device_node *np)
pr_err("%s: alloc clks fail!", __func__);
return;
}
clk_numbers = NR_CLKS;
}
/*

View File

@@ -28,6 +28,7 @@
DEFINE_SPINLOCK(clk_lock);
struct clk **clks;
int clk_numbers;
static struct clk_onecell_data clk_data;
void __iomem *clk_base;
/* #undef pr_debug */
@@ -1071,6 +1072,7 @@ static void __init gxl_clkc_init(struct device_node *np)
/* return -ENOMEM; */
return;
}
clk_numbers = NR_CLKS;
/* pr_debug("%s: kzalloc clks ok!", __func__); */
clk_data.clks = clks;
clk_data.clk_num = NR_CLKS;

View File

@@ -30,6 +30,7 @@ DEFINE_SPINLOCK(clk_lock);
struct clk **clks;
void __iomem *clk_base;
static struct clk_onecell_data clk_data;
int clk_numbers;
static const struct pll_rate_table sys_pll_rate_table[] = {
PLL_RATE(312000000, 52, 1, 2),
@@ -732,6 +733,7 @@ static void __init meson8b_clkc_init(struct device_node *np)
/* return -ENOMEM; */
return;
}
clk_numbers = NR_CLKS;
clk_data.clks = clks;
clk_data.clk_num = NR_CLKS;
/*

View File

@@ -975,7 +975,7 @@ static void __init txlx_clkc_init(struct device_node *np)
pr_err("%s: error: not kzalloc clks in eeclk!", __func__);
return;
}
clk_numbers = NR_CLKS;
clk_data.clks = clks;
clk_data.clk_num = NR_CLKS;