Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
clk
/
hisilicon
/
clk-hix5hd2.c
diff --git
a/kernel/drivers/clk/hisilicon/clk-hix5hd2.c
b/kernel/drivers/clk/hisilicon/clk-hix5hd2.c
index
f1d2394
..
0aaf29d
100644
(file)
--- a/
kernel/drivers/clk/hisilicon/clk-hix5hd2.c
+++ b/
kernel/drivers/clk/hisilicon/clk-hix5hd2.c
@@
-46,15
+46,15
@@
static struct hisi_fixed_rate_clock hix5hd2_fixed_rate_clks[] __initdata = {
{ HIX5HD2_FIXED_83M, "83m", NULL, CLK_IS_ROOT, 83333333, },
};
{ HIX5HD2_FIXED_83M, "83m", NULL, CLK_IS_ROOT, 83333333, },
};
-static const char *
sfc_mux_p[] __initdata
= {
+static const char *
const sfc_mux_p[] __initconst
= {
"24m", "150m", "200m", "100m", "75m", };
static u32 sfc_mux_table[] = {0, 4, 5, 6, 7};
"24m", "150m", "200m", "100m", "75m", };
static u32 sfc_mux_table[] = {0, 4, 5, 6, 7};
-static const char *
sdio_mux_p[] __initdata
= {
+static const char *
const sdio_mux_p[] __initconst
= {
"75m", "100m", "50m", "15m", };
static u32 sdio_mux_table[] = {0, 1, 2, 3};
"75m", "100m", "50m", "15m", };
static u32 sdio_mux_table[] = {0, 1, 2, 3};
-static const char *
fephy_mux_p[] __initdata
= { "25m", "125m"};
+static const char *
const fephy_mux_p[] __initconst
= { "25m", "125m"};
static u32 fephy_mux_table[] = {0, 1};
static u32 fephy_mux_table[] = {0, 1};
@@
-252,8
+252,9
@@
static struct clk_ops clk_complex_ops = {
.disable = clk_complex_disable,
};
.disable = clk_complex_disable,
};
-void __init hix5hd2_clk_register_complex(struct hix5hd2_complex_clock *clks,
- int nums, struct hisi_clock_data *data)
+static void __init
+hix5hd2_clk_register_complex(struct hix5hd2_complex_clock *clks, int nums,
+ struct hisi_clock_data *data)
{
void __iomem *base = data->base;
int i;
{
void __iomem *base = data->base;
int i;