diff options
author | Haojian Zhuang <haojian.zhuang@gmail.com> | 2013-12-10 21:30:29 -0500 |
---|---|---|
committer | Haojian Zhuang <haojian.zhuang@gmail.com> | 2013-12-11 03:42:11 -0500 |
commit | 5e39edd48543c2cc80a28e265b83003737088929 (patch) | |
tree | 88bdafacc8a3c6fd9dd027ab81ba473a30140a0a /drivers/clk/hisilicon | |
parent | 0aa0c95f743a06893dbc494b2a75fbf7093330d4 (diff) |
clk: hi3620: fix wrong flags on divider
The flags on dividers should be CLK_DIVIDER_HIWORD_MASK, not
CLK_MUX_HIWORD_MASK.
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'drivers/clk/hisilicon')
-rw-r--r-- | drivers/clk/hisilicon/clk-hi3620.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/clk/hisilicon/clk-hi3620.c b/drivers/clk/hisilicon/clk-hi3620.c index b66b074fbda5..f0e779f11f3e 100644 --- a/drivers/clk/hisilicon/clk-hi3620.c +++ b/drivers/clk/hisilicon/clk-hi3620.c | |||
@@ -60,8 +60,8 @@ static const char *spi2_mux_p[] __initdata = { "osc26m", "rclk_cfgaxi", }; | |||
60 | static const char *saxi_mux_p[] __initdata = { "armpll3", "armpll2", }; | 60 | static const char *saxi_mux_p[] __initdata = { "armpll3", "armpll2", }; |
61 | static const char *pwm0_mux_p[] __initdata = { "osc32k", "osc26m", }; | 61 | static const char *pwm0_mux_p[] __initdata = { "osc32k", "osc26m", }; |
62 | static const char *pwm1_mux_p[] __initdata = { "osc32k", "osc26m", }; | 62 | static const char *pwm1_mux_p[] __initdata = { "osc32k", "osc26m", }; |
63 | static const char *sd_mux_p[] __initdata = { "armpll3", "armpll2", }; | 63 | static const char *sd_mux_p[] __initdata = { "armpll2", "armpll3", }; |
64 | static const char *mmc1_mux_p[] __initdata = { "armpll3", "armpll2", }; | 64 | static const char *mmc1_mux_p[] __initdata = { "armpll2", "armpll3", }; |
65 | static const char *mmc1_mux2_p[] __initdata = { "osc26m", "mmc1_div", }; | 65 | static const char *mmc1_mux2_p[] __initdata = { "osc26m", "mmc1_div", }; |
66 | static const char *g2d_mux_p[] __initdata = { "armpll2", "armpll3", }; | 66 | static const char *g2d_mux_p[] __initdata = { "armpll2", "armpll3", }; |
67 | static const char *venc_mux_p[] __initdata = { "armpll2", "armpll3", }; | 67 | static const char *venc_mux_p[] __initdata = { "armpll2", "armpll3", }; |
@@ -74,8 +74,8 @@ static const char *edc1_mux_p[] __initdata = { "armpll2", "armpll3", }; | |||
74 | static const char *ldi1_mux_p[] __initdata = { "armpll2", "armpll4", | 74 | static const char *ldi1_mux_p[] __initdata = { "armpll2", "armpll4", |
75 | "armpll3", "armpll5", }; | 75 | "armpll3", "armpll5", }; |
76 | static const char *rclk_hsic_p[] __initdata = { "armpll3", "armpll2", }; | 76 | static const char *rclk_hsic_p[] __initdata = { "armpll3", "armpll2", }; |
77 | static const char *mmc2_mux_p[] __initdata = { "armpll3", "armpll2", }; | 77 | static const char *mmc2_mux_p[] __initdata = { "armpll2", "armpll3", }; |
78 | static const char *mmc3_mux_p[] __initdata = { "armpll3", "armpll2", }; | 78 | static const char *mmc3_mux_p[] __initdata = { "armpll2", "armpll3", }; |
79 | 79 | ||
80 | 80 | ||
81 | /* fixed rate clocks */ | 81 | /* fixed rate clocks */ |
@@ -137,13 +137,13 @@ static struct hisi_mux_clock hi3620_mux_clks[] __initdata = { | |||
137 | }; | 137 | }; |
138 | 138 | ||
139 | static struct hisi_divider_clock hi3620_div_clks[] __initdata = { | 139 | static struct hisi_divider_clock hi3620_div_clks[] __initdata = { |
140 | { HI3620_SHAREAXI_DIV, "saxi_div", "saxi_mux", 0, 0x100, 0, 5, CLK_MUX_HIWORD_MASK, NULL, }, | 140 | { HI3620_SHAREAXI_DIV, "saxi_div", "saxi_mux", 0, 0x100, 0, 5, CLK_DIVIDER_HIWORD_MASK, NULL, }, |
141 | { HI3620_CFGAXI_DIV, "cfgaxi_div", "saxi_div", 0, 0x100, 5, 2, CLK_MUX_HIWORD_MASK, NULL, }, | 141 | { HI3620_CFGAXI_DIV, "cfgaxi_div", "saxi_div", 0, 0x100, 5, 2, CLK_DIVIDER_HIWORD_MASK, NULL, }, |
142 | { HI3620_SD_DIV, "sd_div", "sd_mux", 0, 0x108, 0, 4, CLK_MUX_HIWORD_MASK, NULL, }, | 142 | { HI3620_SD_DIV, "sd_div", "sd_mux", 0, 0x108, 0, 4, CLK_DIVIDER_HIWORD_MASK, NULL, }, |
143 | { HI3620_MMC1_DIV, "mmc1_div", "mmc1_mux", 0, 0x108, 5, 4, CLK_MUX_HIWORD_MASK, NULL, }, | 143 | { HI3620_MMC1_DIV, "mmc1_div", "mmc1_mux", 0, 0x108, 5, 4, CLK_DIVIDER_HIWORD_MASK, NULL, }, |
144 | { HI3620_HSIC_DIV, "hsic_div", "rclk_hsic", 0, 0x130, 0, 2, CLK_MUX_HIWORD_MASK, NULL, }, | 144 | { HI3620_HSIC_DIV, "hsic_div", "rclk_hsic", 0, 0x130, 0, 2, CLK_DIVIDER_HIWORD_MASK, NULL, }, |
145 | { HI3620_MMC2_DIV, "mmc2_div", "mmc2_mux", 0, 0x140, 0, 4, CLK_MUX_HIWORD_MASK, NULL, }, | 145 | { HI3620_MMC2_DIV, "mmc2_div", "mmc2_mux", 0, 0x140, 0, 4, CLK_DIVIDER_HIWORD_MASK, NULL, }, |
146 | { HI3620_MMC3_DIV, "mmc3_div", "mmc3_mux", 0, 0x140, 5, 4, CLK_MUX_HIWORD_MASK, NULL, }, | 146 | { HI3620_MMC3_DIV, "mmc3_div", "mmc3_mux", 0, 0x140, 5, 4, CLK_DIVIDER_HIWORD_MASK, NULL, }, |
147 | }; | 147 | }; |
148 | 148 | ||
149 | static struct hisi_gate_clock hi3620_seperated_gate_clks[] __initdata = { | 149 | static struct hisi_gate_clock hi3620_seperated_gate_clks[] __initdata = { |